diff options
546 files changed, 0 insertions, 49453 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common/.classpath deleted file mode 100644 index 304e86186..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore deleted file mode 100644 index 2a89e4b88..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -@dot -build.xml -javaCompiler...args diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.options b/jsf/plugins/org.eclipse.jst.jsf.common/.options deleted file mode 100644 index 41f99dd4f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.options +++ /dev/null @@ -1,2 +0,0 @@ -org.eclipse.jst.jsf.common/debug=false -org.eclipse.jst.jsf.common/debug/metadataload=false diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.project b/jsf/plugins/org.eclipse.jst.jsf.common/.project deleted file mode 100644 index 8bd8da5ed..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.jsf.common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ae7ce733c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sun May 27 16:00:59 EDT 2007 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b1a758451..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,81 +0,0 @@ -#Thu Apr 03 15:56:45 PDT 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=warning -org.eclipse.jdt.core.compiler.problem.deprecation=error -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 82eb6c152..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Apr 06 18:25:15 PDT 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs deleted file mode 100644 index ae4a0848c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,22 +0,0 @@ -#Fri May 30 11:41:40 PDT 2008 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=1 -compilers.p.build=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=0 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=0 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF deleted file mode 100644 index 9eb6ccb09..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF +++ /dev/null @@ -1,63 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %plugin.name -Bundle-SymbolicName: org.eclipse.jst.jsf.common;singleton:=true -Bundle-Version: 1.1.5.qualifier -Bundle-Activator: org.eclipse.jst.jsf.common.JSFCommonPlugin$Implementation -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.jsf.common;x-internal:=true, - org.eclipse.jst.jsf.common.dom, - org.eclipse.jst.jsf.common.internal;x-friends:="org.eclipse.jst.jsf.core", - org.eclipse.jst.jsf.common.internal.managedobject;x-internal:=true, - org.eclipse.jst.jsf.common.internal.policy;x-internal:=true, - org.eclipse.jst.jsf.common.internal.resource;x-friends:="org.eclipse.jst.jsf.core.tests", - org.eclipse.jst.jsf.common.internal.strategy;x-internal:=true, - org.eclipse.jst.jsf.common.internal.types; - x-friends:="org.eclipse.jst.jsf.core, - org.eclipse.jst.jsf.core.tests, - org.eclipse.jst.jsf.validation.el.tests, - org.eclipse.jst.jsf.designtime.tests, - org.eclipse.jst.jsf.context.symbol.tests", - org.eclipse.jst.jsf.common.metadata, - org.eclipse.jst.jsf.common.metadata.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests", - org.eclipse.jst.jsf.common.metadata.internal.impl;x-internal:=true, - org.eclipse.jst.jsf.common.metadata.internal.util;x-internal:=true, - org.eclipse.jst.jsf.common.metadata.query, - org.eclipse.jst.jsf.common.metadata.query.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests", - org.eclipse.jst.jsf.common.metadata.traittypes.traittypes, - org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl;x-internal:=true, - org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;x-internal:=true, - org.eclipse.jst.jsf.common.sets, - org.eclipse.jst.jsf.common.sets.constraint, - org.eclipse.jst.jsf.common.sets.mapping, - org.eclipse.jst.jsf.common.util, - org.eclipse.jst.jsf.contentmodel.annotation, - org.eclipse.jst.jsf.contentmodel.annotation.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests", - org.eclipse.jst.jsf.context, - org.eclipse.jst.jsf.context.resolver, - org.eclipse.jst.jsf.context.resolver.structureddocument, - org.eclipse.jst.jsf.context.resolver.structureddocument.internal;x-friends:="org.eclipse.jst.jsf.core,org.eclipse.jst.jsf.contentassist.tests", - org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;x-internal:=true, - org.eclipse.jst.jsf.context.structureddocument, - org.eclipse.jst.jsf.context.structureddocument.internal.impl;x-internal:=true, - org.eclipse.jst.jsf.context.symbol, - org.eclipse.jst.jsf.context.symbol.internal.impl;x-internal:=true, - org.eclipse.jst.jsf.context.symbol.internal.provider;x-internal:=true, - org.eclipse.jst.jsf.context.symbol.internal.source;x-internal:=true, - org.eclipse.jst.jsf.context.symbol.internal.util;x-internal:=true, - org.eclipse.jst.jsf.context.symbol.provider, - org.eclipse.jst.jsf.context.symbol.source -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)", - org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.2.0)", - org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", - org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)" -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %plugin.provider -Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/about.html b/jsf/plugins/org.eclipse.jst.jsf.common/about.html deleted file mode 100644 index 8e5605900..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 2008</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common/build.properties deleted file mode 100644 index 1d865d48d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/build.properties +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2007 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - bin/,\ - build.properties,\ - plugin.properties,\ - about.html,\ - plugin.xml,\ - icons/,\ - model/,\ - schema/ -javacSource=1.5 -javacTarget=1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif Binary files differdeleted file mode 100644 index 6c05b4627..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif Binary files differdeleted file mode 100644 index 7d24707ee..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif Binary files differdeleted file mode 100644 index 53500daf9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif Binary files differdeleted file mode 100644 index 48d014d68..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif Binary files differdeleted file mode 100644 index acc8b31a7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif Binary files differdeleted file mode 100644 index 9f7abd5fc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif Binary files differdeleted file mode 100644 index 7daac8599..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif Binary files differdeleted file mode 100644 index 9783d843f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif Binary files differdeleted file mode 100644 index 158758edf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif Binary files differdeleted file mode 100644 index cdd3b76e3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif Binary files differdeleted file mode 100644 index 83afb9b3c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif Binary files differdeleted file mode 100644 index badaab066..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif Binary files differdeleted file mode 100644 index 185f84e0a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif Binary files differdeleted file mode 100644 index 790f06a2f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif Binary files differdeleted file mode 100644 index 120891722..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif Binary files differdeleted file mode 100644 index ed15fea4d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif Binary files differdeleted file mode 100644 index 347a8ff64..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif Binary files differdeleted file mode 100644 index f8294d0c2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif Binary files differdeleted file mode 100644 index d3dc5a9ad..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif Binary files differdeleted file mode 100644 index 9250fecbf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif Binary files differdeleted file mode 100644 index d92f34c8a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif Binary files differdeleted file mode 100644 index 1e5345fb3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif Binary files differdeleted file mode 100644 index 7bb14f567..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif Binary files differdeleted file mode 100644 index c3b09415b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif Binary files differdeleted file mode 100644 index b3f0dc9fa..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif Binary files differdeleted file mode 100644 index 1eee8aaa2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif Binary files differdeleted file mode 100644 index cdd3b76e3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif Binary files differdeleted file mode 100644 index e135a7b75..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif Binary files differdeleted file mode 100644 index 71c252baf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif Binary files differdeleted file mode 100644 index 7d0f811cb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif Binary files differdeleted file mode 100644 index db7414e93..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif Binary files differdeleted file mode 100644 index c4a8af418..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif Binary files differdeleted file mode 100644 index c8d381f0b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif Binary files differdeleted file mode 100644 index badaab066..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif Binary files differdeleted file mode 100644 index 33854e98c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif Binary files differdeleted file mode 100644 index a26660ec2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore deleted file mode 100644 index 9b202c71f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="metadata" - nsURI="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" nsPrefix="md"> - <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Entity"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="metadatamodel"/> - </eAnnotations> - <eOperations name="findIncludeGroup" eType="#//EntityGroup"> - <eParameters name="groupId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="accept"> - <eParameters name="visitor" eType="#//IEntityVisitor"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="entityGroups" upperBound="-1" - eType="#//EntityGroup" eKeys="#//Entity/id #//Entity/type"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="entityGroup"/> - </eAnnotations> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceModelProvider" unique="false" - eType="#//IMetaDataSourceModelProvider" volatile="true" transient="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentModelContext" eType="#//ModelContext" - volatile="true" transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EntityGroup" eSuperTypes="#//Entity"/> - <eClassifiers xsi:type="ecore:EClass" name="Entity"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="entity"/> - </eAnnotations> - <eOperations name="accept"> - <eParameters name="visitor" eType="#//IEntityVisitor"/> - </eOperations> - <eOperations name="getModel" eType="#//Model"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="childEntities" upperBound="-1" - eType="#//Entity" containment="true" eKeys="#//Entity/id #//Entity/type"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="entity"/> - </eAnnotations> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="traits" upperBound="-1" - eType="#//Trait" containment="true" eKeys="#//Trait/id"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="trait"/> - </eAnnotations> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - iD="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="includeGroups" upperBound="-1" - eType="#//IncludeEntityGroup"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="include-entity-group"/> - </eAnnotations> - </eStructuralFeatures> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IncludeEntityGroup"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelUri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="name" value="uri"/> - </eAnnotations> - </eStructuralFeatures> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Trait"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="trait"/> - </eAnnotations> - <eOperations name="accept"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="body" value="visitor.visit(this);"/> - </eAnnotations> - <eParameters name="visitor" eType="#//ITraitVisitor"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - iD="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" - containment="true"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="namespace" value="##targetNamespace"/> - </eAnnotations> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceModelProvider" eType="#//IMetaDataSourceModelProvider"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="ITraitVisitor" instanceClassName="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor" - serializable="false"/> - <eClassifiers xsi:type="ecore:EDataType" name="IEntityVisitor" instanceClassName="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor" - serializable="false"/> - <eClassifiers xsi:type="ecore:EDataType" name="IMetaDataSourceModelProvider" instanceClassName="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider"/> - <eClassifiers xsi:type="ecore:EDataType" name="ModelContext" instanceClassName="org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor"/> -</ecore:EPackage> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel deleted file mode 100644 index 4707b0bbf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007 Oracle Corporation" - modelDirectory="/org.eclipse.jst.jsf.common/src" editDirectory="/org.eclipse.jst.jsf.common/src" - editorDirectory="/org.eclipse.jst.jsf.common/src" modelPluginID="org.eclipse.jst.jsf.common" - modelName="Metadata" editPluginClass="org.eclipse.jst.jsf.common.metadata.MetadataPlugin" - editorPluginClass="org.eclipse.jst.jsf.common.metadata.MetadataPlugin" generateSchema="true" - testsDirectory="/org.eclipse.jst.jsf.common/src" testSuiteClass="/org.eclipse.jst.jsf.common.metadata.MetadataAllTests" - importerID="org.eclipse.emf.importer.ecore"> - <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter"> - <genAnnotations source="selectedPackages"> - <details key="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" value="metadata.xsd"/> - </genAnnotations> - <details key="directoryURI" value="schema/"/> - </genAnnotations> - <foreignModel>metadata.ecore</foreignModel> - <genPackages prefix="Metadata" basePackage="org.eclipse.jst.jsf.common" resource="XML" - disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" - providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation" - testsPackageSuffix="internal.tests" generateExampleClass="false" ecorePackage="metadata.ecore#/"> - <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter"> - <genAnnotations source="schema/metadata.xsd"/> - </genAnnotations> - <genDataTypes ecoreDataType="metadata.ecore#//ITraitVisitor"/> - <genDataTypes ecoreDataType="metadata.ecore#//IEntityVisitor"/> - <genDataTypes ecoreDataType="metadata.ecore#//IMetaDataSourceModelProvider"/> - <genDataTypes ecoreDataType="metadata.ecore#//ModelContext"/> - <genClasses ecoreClass="metadata.ecore#//Model"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//Model/entityGroups"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Model/sourceModelProvider"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Model/currentModelContext"/> - <genOperations ecoreOperation="metadata.ecore#//Model/findIncludeGroup"> - <genParameters ecoreParameter="metadata.ecore#//Model/findIncludeGroup/groupId"/> - </genOperations> - <genOperations ecoreOperation="metadata.ecore#//Model/accept"> - <genParameters ecoreParameter="metadata.ecore#//Model/accept/visitor"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="metadata.ecore#//EntityGroup"/> - <genClasses ecoreClass="metadata.ecore#//Entity"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/childEntities"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/traits"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Entity/id"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Entity/type"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/includeGroups"/> - <genOperations ecoreOperation="metadata.ecore#//Entity/accept"> - <genParameters ecoreParameter="metadata.ecore#//Entity/accept/visitor"/> - </genOperations> - <genOperations ecoreOperation="metadata.ecore#//Entity/getModel"/> - </genClasses> - <genClasses ecoreClass="metadata.ecore#//Trait"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/id"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Trait/value"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/sourceModelProvider"/> - <genOperations ecoreOperation="metadata.ecore#//Trait/accept"> - <genParameters ecoreParameter="metadata.ecore#//Trait/accept/visitor"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="metadata.ecore#//IncludeEntityGroup"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//IncludeEntityGroup/id"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//IncludeEntityGroup/modelUri"/> - </genClasses> - </genPackages> -</genmodel:GenModel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore deleted file mode 100644 index dd850dc4f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="traittypes" - nsURI="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" nsPrefix="mdt"> - <eClassifiers xsi:type="ecore:EClass" name="ListOfValues"> - <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1" - eType="ecore:EClass http://www.eclipse.org/emf/2003/XMLType#//SimpleAnyType" - containment="true"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - <details key="name" value="item"/> - </eAnnotations> - </eStructuralFeatures> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SetGenerator"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="algorithm" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - </eAnnotations> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="expression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> - <details key="kind" value="element"/> - </eAnnotations> - </eStructuralFeatures> - </eClassifiers> -</ecore:EPackage> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel deleted file mode 100644 index 9633b3c9d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007 Oracle Corporation" - modelDirectory="/org.eclipse.jst.jsf.common/src" modelPluginID="org.eclipse.jst.jsf.common" - modelName="TraitTypes" importerID="org.eclipse.emf.importer.ecore"> - <foreignModel>metadataTraitTypes.ecore</foreignModel> - <genPackages prefix="TraitTypes" basePackage="org.eclipse.jst.jsf.common.metadata.traittypes" - resource="XML" disposableProviderFactory="true" classPackageSuffix="internal.impl" - utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" - presentationPackageSuffix="internal.presentation" ecorePackage="metadataTraitTypes.ecore#/"> - <genClasses ecoreClass="metadataTraitTypes.ecore#//ListOfValues"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadataTraitTypes.ecore#//ListOfValues/entries"/> - </genClasses> - <genClasses ecoreClass="metadataTraitTypes.ecore#//SetGenerator"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/algorithm"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/expression"/> - </genClasses> - </genPackages> -</genmodel:GenModel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore deleted file mode 100644 index 521e76e03..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore +++ /dev/null @@ -1,263 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="symbol" - nsURI="http:///org/eclipse/jst/jsf/context/symbol.ecore" nsPrefix="org.eclipse.jst.jsf.context.symbol"> - <eClassifiers xsi:type="ecore:EClass" name="IBeanInstanceSymbol" eSuperTypes="#//IInstanceSymbol #//IDescribedInDetail"> - <eOperations name="getJavaTypeDescriptor" eType="#//IJavaTypeDescriptor2"/> - <eOperations name="setJavaTypeDescriptor"> - <eParameters name="newTypeDescriptor" eType="#//IJavaTypeDescriptor2"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1" - eType="#//IBeanPropertySymbol" changeable="false" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1" - eType="#//IBeanMethodSymbol" changeable="false" volatile="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBeanPropertySymbol" eSuperTypes="#//IPropertySymbol #//IDescribedInDetail"> - <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//IJavaTypeDescriptor2"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IInstanceSymbol" eSuperTypes="#//IObjectSymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeResolved" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - changeable="false" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="runtimeSource" eType="#//ERuntimeSource" - defaultValueLiteral="TAG_INSTANTIATED_SYMBOL"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IJavaSymbol" eSuperTypes="#//ISymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaElement" eType="#//IJavaElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ISymbol" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ITypeDescriptor" abstract="true"> - <eOperations name="instanceOf" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eOperations name="getArrayElement" eType="#//IObjectSymbol"/> - <eOperations name="resolveType" eType="#//IType"> - <eParameters name="resolvedTypeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="calculateSyntheticCall" eType="#//ISymbol"> - <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="methodArgs" upperBound="-1" eType="#//ValueType"/> - <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1" - eType="#//IPropertySymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - changeable="false" volatile="true" defaultValueLiteral=""/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="superTypeSignatures" upperBound="-1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="interfaceTypeSignatures" - upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignatureDelegate" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1" - eType="#//IMethodSymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeParameterSignatures" - unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - transient="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdtContext" eType="#//IJavaElement"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="IType" instanceClassName="org.eclipse.jdt.core.IType"/> - <eClassifiers xsi:type="ecore:EDataType" name="IJavaElement" instanceClassName="org.eclipse.jdt.core.IJavaElement"/> - <eClassifiers xsi:type="ecore:EClass" name="IDescribedInDetail" abstract="true" - interface="true"/> - <eClassifiers xsi:type="ecore:EClass" name="IJavaTypeDescriptor2" eSuperTypes="#//ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//IType"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="beanProperties" upperBound="-1" - eType="#//IBeanPropertySymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="beanMethods" upperBound="-1" - eType="#//IBeanPropertySymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBeanMethodSymbol" eSuperTypes="#//IDescribedInDetail #//IMethodSymbol"> - <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//IJavaTypeDescriptor2"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IComponentSymbol" eSuperTypes="#//IInstanceSymbol #//IDescribedInDetail"/> - <eClassifiers xsi:type="ecore:EClass" name="IPropertySymbol" eSuperTypes="#//IObjectSymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="intermediate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IMapTypeDescriptor" eSuperTypes="#//ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap" - transient="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="immutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EEnum" name="ERuntimeSource"> - <eLiterals name="BUILT_IN_SYMBOL" literal="BUILT_IN_SYMBOL"/> - <eLiterals name="MANAGED_BEAN_SYMBOL" value="1"/> - <eLiterals name="TAG_INSTANTIATED_SYMBOL" value="2"/> - <eLiterals name="OTHER" value="3"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IMethodSymbol" eSuperTypes="#//ISymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="signature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IObjectSymbol" abstract="true" interface="true" - eSuperTypes="#//ISymbol"> - <eOperations name="supportsCoercion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="coerce" eType="#//ITypeDescriptor"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="call" eType="#//ISymbol"> - <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="methodArguments" upperBound="-1" eType="#//ValueType"/> - <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="typeDescriptor" eType="#//ITypeDescriptor"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="readable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="writable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedTypeDescriptor" abstract="true" - interface="true" eSuperTypes="#//ITypeDescriptor"> - <eOperations name="isUnboundedForType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="getUnboundedProperty" eType="#//ISymbol"> - <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedMapTypeDescriptor" eSuperTypes="#//IMapTypeDescriptor #//IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedJavaTypeDescriptor" eSuperTypes="#//IJavaTypeDescriptor2 #//IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EClass" name="IListTypeDescriptor" eSuperTypes="#//ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="listSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedListTypeDescriptor" eSuperTypes="#//IListTypeDescriptor #//IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EDataType" name="ValueType" instanceClassName="org.eclipse.jst.jsf.common.internal.types.ValueType"/> - <eSubpackages name="symbol" nsURI="http:///org/eclipse/jst/jsf/context/symbol.ecore" - nsPrefix="org.eclipse.jst.jsf.context.symbol"> - <eClassifiers xsi:type="ecore:EDataType" name="ValueType" instanceClassName="org.eclipse.jst.jsf.common.internal.types.ValueType"/> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedListTypeDescriptor" eSuperTypes="#//symbol/IListTypeDescriptor #//symbol/IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EClass" name="IListTypeDescriptor" eSuperTypes="#//symbol/ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="listSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedJavaTypeDescriptor" eSuperTypes="#//symbol/IJavaTypeDescriptor2 #//symbol/IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedMapTypeDescriptor" eSuperTypes="#//symbol/IMapTypeDescriptor #//symbol/IBoundedTypeDescriptor"/> - <eClassifiers xsi:type="ecore:EClass" name="IBoundedTypeDescriptor" abstract="true" - interface="true" eSuperTypes="#//symbol/ITypeDescriptor"> - <eOperations name="getUnboundedProperty" eType="#//symbol/ISymbol"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> - </eOperations> - <eOperations name="isUnboundedForType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IObjectSymbol" abstract="true" interface="true" - eSuperTypes="#//symbol/ISymbol"> - <eOperations name="call" eType="#//symbol/ISymbol"> - <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="methodArguments" upperBound="-1" eType="#//symbol/ValueType"/> - <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="coerce" eType="#//symbol/ITypeDescriptor"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="supportsCoercion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="writable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="readable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="typeDescriptor" eType="#//symbol/ITypeDescriptor"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IMethodSymbol" eSuperTypes="#//symbol/ISymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="signature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EEnum" name="ERuntimeSource"> - <eLiterals name="OTHER" value="3"/> - <eLiterals name="TAG_INSTANTIATED_SYMBOL" value="2"/> - <eLiterals name="MANAGED_BEAN_SYMBOL" value="1"/> - <eLiterals name="BUILT_IN_SYMBOL" literal="BUILT_IN_SYMBOL"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IMapTypeDescriptor" eSuperTypes="#//symbol/ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="immutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IPropertySymbol" eSuperTypes="#//symbol/IObjectSymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="intermediate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IComponentSymbol" eSuperTypes="#//symbol/IInstanceSymbol #//symbol/IDescribedInDetail"/> - <eClassifiers xsi:type="ecore:EClass" name="IBeanMethodSymbol" eSuperTypes="#//symbol/IDescribedInDetail #//symbol/IMethodSymbol"> - <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//symbol/IJavaTypeDescriptor2"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IJavaTypeDescriptor2" eSuperTypes="#//symbol/ITypeDescriptor"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="beanMethods" upperBound="-1" - eType="#//symbol/IBeanPropertySymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="beanProperties" upperBound="-1" - eType="#//symbol/IBeanPropertySymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//symbol/IType"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IDescribedInDetail" abstract="true" - interface="true"/> - <eClassifiers xsi:type="ecore:EDataType" name="IJavaElement" instanceClassName="org.eclipse.jdt.core.IJavaElement"/> - <eClassifiers xsi:type="ecore:EDataType" name="IType" instanceClassName="org.eclipse.jdt.core.IType"/> - <eClassifiers xsi:type="ecore:EClass" name="ITypeDescriptor" abstract="true"> - <eOperations name="calculateSyntheticCall" eType="#//symbol/ISymbol"> - <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="methodArgs" upperBound="-1" eType="#//symbol/ValueType"/> - <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="resolveType" eType="#//symbol/IType"> - <eParameters name="resolvedTypeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="getArrayElement" eType="#//symbol/IObjectSymbol"/> - <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eOperations name="instanceOf" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdtContext" eType="#//symbol/IJavaElement"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeParameterSignatures" - unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - transient="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1" - eType="#//symbol/IMethodSymbol" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignatureDelegate" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="interfaceTypeSignatures" - upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="superTypeSignatures" - upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - changeable="false" volatile="true" defaultValueLiteral=""/> - <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1" - eType="#//symbol/IPropertySymbol" volatile="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ISymbol" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IJavaSymbol" eSuperTypes="#//symbol/ISymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaElement" eType="#//symbol/IJavaElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IInstanceSymbol" eSuperTypes="#//symbol/IObjectSymbol"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="runtimeSource" eType="#//symbol/ERuntimeSource" - defaultValueLiteral="TAG_INSTANTIATED_SYMBOL"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeResolved" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - changeable="false" volatile="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBeanPropertySymbol" eSuperTypes="#//symbol/IPropertySymbol #//symbol/IDescribedInDetail"> - <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//symbol/IJavaTypeDescriptor2"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IBeanInstanceSymbol" eSuperTypes="#//symbol/IInstanceSymbol #//symbol/IDescribedInDetail"> - <eOperations name="setJavaTypeDescriptor"> - <eParameters name="newTypeDescriptor" eType="#//symbol/IJavaTypeDescriptor2"/> - </eOperations> - <eOperations name="getJavaTypeDescriptor" eType="#//symbol/IJavaTypeDescriptor2"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1" - eType="#//symbol/IBeanMethodSymbol" changeable="false" volatile="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1" - eType="#//symbol/IBeanPropertySymbol" changeable="false" volatile="true"/> - </eClassifiers> - </eSubpackages> -</ecore:EPackage> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel deleted file mode 100644 index a068a791d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright 2006 Oracle" - modelDirectory="/org.eclipse.jst.jsf.common/src" editDirectory="/org.eclipse.jst.jsf.common/src" - editorDirectory="/org.eclipse.jst.jsf.context.symbol.editor/src" modelPluginID="org.eclipse.jst.jsf.common" - modelName="My" modelPluginClass="" editPluginClass="org.eclipse.jst.jsf.common.JSFCommonPlugin" - editorPluginClass="org.eclipse.jst.jsf.context.symbol.presentation.MyEditorPlugin" - testSuiteClass="org.eclipse.jst.jsf.context.symbol.tests.MyAllTests" importerID="org.eclipse.emf.importer.java"> - <foreignModel>@model</foreignModel> - <genPackages prefix="Symbol" basePackage="org.eclipse.jst.jsf.context" disposableProviderFactory="true" - classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" - ecorePackage="symbol.ecore#/"> - <genEnums ecoreEnum="symbol.ecore#//ERuntimeSource"> - <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/BUILT_IN_SYMBOL"/> - <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/MANAGED_BEAN_SYMBOL"/> - <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/TAG_INSTANTIATED_SYMBOL"/> - <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/OTHER"/> - </genEnums> - <genDataTypes ecoreDataType="symbol.ecore#//IType"/> - <genDataTypes ecoreDataType="symbol.ecore#//IJavaElement"/> - <genDataTypes ecoreDataType="symbol.ecore#//ValueType"/> - <genClasses ecoreClass="symbol.ecore#//IBeanInstanceSymbol"> - <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanInstanceSymbol/properties"/> - <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanInstanceSymbol/methods"/> - <genOperations ecoreOperation="symbol.ecore#//IBeanInstanceSymbol/getJavaTypeDescriptor"/> - <genOperations ecoreOperation="symbol.ecore#//IBeanInstanceSymbol/setJavaTypeDescriptor"> - <genParameters ecoreParameter="symbol.ecore#//IBeanInstanceSymbol/setJavaTypeDescriptor/newTypeDescriptor"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IBeanPropertySymbol"> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanPropertySymbol/owner"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IInstanceSymbol"> - <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IInstanceSymbol/typeResolved"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IInstanceSymbol/runtimeSource"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IJavaSymbol"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaSymbol/javaElement"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//ISymbol"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ISymbol/name"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//ITypeDescriptor"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//ITypeDescriptor/properties"/> - <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeSignature"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/superTypeSignatures"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/interfaceTypeSignatures"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeSignatureDelegate"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//ITypeDescriptor/methods"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeParameterSignatures"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/jdtContext"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/enumType"/> - <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/instanceOf"> - <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/instanceOf/typeSignature"/> - </genOperations> - <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/isArray"/> - <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/getArrayElement"/> - <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/resolveType"> - <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/resolveType/resolvedTypeSignature"/> - </genOperations> - <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall"> - <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/methodName"/> - <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/methodArgs"/> - <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/symbolName"/> - </genOperations> - </genClasses> - <genClasses image="false" ecoreClass="symbol.ecore#//IDescribedInDetail"/> - <genClasses ecoreClass="symbol.ecore#//IJavaTypeDescriptor2"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/type"/> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanProperties"/> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanMethods"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/arrayCount"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IBeanMethodSymbol"> - <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanMethodSymbol/owner"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IComponentSymbol"/> - <genClasses ecoreClass="symbol.ecore#//IPropertySymbol"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IPropertySymbol/intermediate"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IMapTypeDescriptor"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMapTypeDescriptor/mapSource"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMapTypeDescriptor/immutable"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IMethodSymbol"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMethodSymbol/signature"/> - </genClasses> - <genClasses image="false" ecoreClass="symbol.ecore#//IObjectSymbol"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//IObjectSymbol/typeDescriptor"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IObjectSymbol/readable"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IObjectSymbol/writable"/> - <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/supportsCoercion"> - <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/supportsCoercion/typeSignature"/> - </genOperations> - <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/coerce"> - <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/coerce/typeSignature"/> - </genOperations> - <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/call"> - <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/methodName"/> - <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/methodArguments"/> - <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/symbolName"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IBoundedTypeDescriptor"> - <genOperations ecoreOperation="symbol.ecore#//IBoundedTypeDescriptor/isUnboundedForType"> - <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/isUnboundedForType/typeSignature"/> - </genOperations> - <genOperations ecoreOperation="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty"> - <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty/name"/> - <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty/typeSignature"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IBoundedMapTypeDescriptor"/> - <genClasses ecoreClass="symbol.ecore#//IBoundedJavaTypeDescriptor"/> - <genClasses ecoreClass="symbol.ecore#//IListTypeDescriptor"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IListTypeDescriptor/listSource"/> - </genClasses> - <genClasses ecoreClass="symbol.ecore#//IBoundedListTypeDescriptor"/> - </genPackages> -</genmodel:GenModel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties deleted file mode 100644 index c56f41339..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2005 Oracle Corporation. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -############################################################################### -plugin.name=JavaServer Faces Tools - Common -plugin.provider=Eclipse.org - -############################################################################### -extension-point.name.0 = annotationFiles -extension-point.name.1 = JSF EL Symbol Source Provider -extension-point.name.2 = Contextual Symbol Factory -extension-point.name.3 = Metadata Domain Loading Strategies (internal) -extension-point.name.4 = Metadata Domain Source Model Types (internal) -extension-point.name.5 = Metadata Domain Source Model Type Translators (internal) -extension-point.name.6 = Standard Metadata Files
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml deleted file mode 100644 index d34cf4090..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension-point id="annotationFiles" name="%extension-point.name.0" schema="schema/annotationFiles.exsd"/> - <extension-point id="symbolSourceProvider" name="%extension-point.name.1" schema="schema/symbols.exsd"/> - <extension-point id="contextSymbolFactory" name="%extension-point.name.2" schema="schema/contextSymbolFactory.exsd"/> - <extension-point id="domainLoadingStrategies" name="%extension-point.name.3" schema="schema/DomainLoadingStrategies.exsd"/> - <extension-point id="domainSourceModelTypes" name="%extension-point.name.4" schema="schema/DomainSourceModelTypes.exsd"/> - <extension-point id="domainSourceModelTypeTranslators" name="%extension-point.name.5" schema="schema/DomainSourceModelTypeTranslators.exsd"/> - <extension-point id="standardMetaDataFiles" name="%extension-point.name.6" schema="schema/StandardMetaDataFiles.exsd"/> - <extension - point="org.eclipse.jst.jsf.common.domainLoadingStrategies"> - <domainLoader - domainId="TagLibraryDomain" - domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/> - </extension> - <extension - point="org.eclipse.jst.jsf.common.domainSourceModelTypes"> - <domainSourceModelTypes - domainId="TagLibraryDomain" - domainSourceModelTypeId="DefaultMetaDataTagLibraryHandler" - locator="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataLocator" - ordinal="10"> - </domainSourceModelTypes> - </extension> - <extension - point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators"> - <domainSourceModelTypeTranslator - domainSourceModelTypeId="DefaultMetaDataTagLibraryHandler" - translatorClass="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFilesTranslator"> - </domainSourceModelTypeTranslator> - </extension> - <extension point="org.eclipse.emf.ecore.generated_package"> - <package - uri = "http:///org/eclipse/jst/jsf/context/symbol.ecore" - class = "org.eclipse.jst.jsf.context.symbol.SymbolPackage" - genModel = "model/symbol.genmodel" /> - <package - uri = "http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - class = "org.eclipse.jst.jsf.common.metadata.MetadataPackage" - genModel = "model/metadata.genmodel" /> - <package - uri = "http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - class = "org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage" - genModel = "model/metadataTraitTypes.genmodel" /> - </extension> - <extension - point="org.eclipse.emf.edit.itemProviderAdapterFactories"> - <factory - uri = "http:///org/eclipse/jst/jsf/context/symbol.ecore" - class = "org.eclipse.jst.jsf.context.symbol.internal.provider.SymbolItemProviderAdapterFactory" - supportedTypes = - "org.eclipse.emf.edit.provider.IEditingDomainItemProvider - org.eclipse.emf.edit.provider.IStructuredItemContentProvider - org.eclipse.emf.edit.provider.ITreeItemContentProvider - org.eclipse.emf.edit.provider.IItemLabelProvider - org.eclipse.emf.edit.provider.IItemPropertySource - org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider" /> - </extension> - <extension - point="org.eclipse.jst.jsf.common.contextSymbolFactory"> - <contextSymbolFactory - factory="org.eclipse.jst.jsf.context.symbol.internal.source.UnknownTypeContextSymbolFactory" - factoryId="org.eclipse.jst.jsf.common.unknownTypeSymbolFactory"> - </contextSymbolFactory> - </extension> - -</plugin> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd deleted file mode 100644 index a2b609d7d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="DomainLoadingStrategies" name="DomainLoadingStrategies"/> - </appInfo> - <documentation> - ** Should be considered internal at this time. Subject to change ** -Allows for naming domains of metadata and binding to classes that can load sources of metadata into that domain. A domain is a set of entities using jsf.common.metadata model. In initial release, Tag Library domain will be supplied. Tag files, Tags, attributes are the known entities on this domain, as an example. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <element ref="domainLoader"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="domainLoader"> - <complexType> - <attribute name="domainId" type="string" use="required"> - <annotation> - <documentation> - Key used to name this domain. - </documentation> - </annotation> - </attribute> - <attribute name="domainLoadingStrategy" type="string" use="required"> - <annotation> - <documentation> - Fully qualified java class implementing <code>org.eclipse.jst.jsf.common.metadata.IDomainLoadingStrategy</code> that will be used to load an instance of a metadata model. - -Implementing class requires a constructor taking the domainID String. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 2.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - <extension - point="org.eclipse.jst.jsf.common.domainLoadingStrategies"> - <domainLoader - domainId="TagLibraryDomain" - domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/> - </extension> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2007 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd deleted file mode 100644 index 1d9c020ea..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="DomainSourceModelTypeTranslators" name="DomainSourceModelTypeTranslators"/> - </appInfo> - <documentation> - ** Should be considered internal at this time. Subject to change ** -Allows for metadata domain translators to be applied to a metadata domain source type. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <element ref="domainSourceModelTypeTranslator"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="domainSourceModelTypeTranslator"> - <complexType> - <attribute name="domainSourceModelTypeId" type="string" use="required"> - <annotation> - <documentation> - The unique id from the domainSourceModelTypes ext-pt that will bind the translator class to that domain source. - </documentation> - </annotation> - </attribute> - <attribute name="translatorClass" type="string" use="required"> - <annotation> - <documentation> - Fully qualified class implementing <code>org.eclipse.jst.jsf.common.metadata.IMetaDataTranslator</code> that will translate from the source domain to the "standard" domain of entities and traits. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataTranslator"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 2.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - <extension - point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators"> - <domainSourceModelTypeTranslator - class="org.eclipse.jst.jsf.common.metadata.internal.TaglibMetaDataTLDTranslator" - domainSourceModelTypeId="TagLibMetaDataTagLibraryHandler"> - </domainSourceModelTypeTranslator> - </extension> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2007 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd deleted file mode 100644 index 4bb747e34..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="domainSourceModelTypes" name="Metadata Domain Source Model Types"/> - </appInfo> - <documentation> - ** Should be considered internal at this time. Subject to change ** -Binds metadata source types to a particular domain of metadata. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence minOccurs="0" maxOccurs="unbounded"> - <element ref="domainSourceModelTypes"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="domainSourceModelTypes"> - <complexType> - <attribute name="domainSourceModelTypeId" type="string" use="required"> - <annotation> - <documentation> - Uniquely identifies this combination of domain and source metadata locator. This id should be used by the domainSourceModelTypeTranslator ext-pt. - </documentation> - </annotation> - </attribute> - <attribute name="domainId" type="string" use="required"> - <annotation> - <documentation> - The DomainLoadingStrategy domainId that this source is being bound to. - </documentation> - </annotation> - </attribute> - <attribute name="locator" type="string" use="required"> - <annotation> - <documentation> - A class implementing <code>IMetaDataLocator</code> that is responsible for finding instances of metadata. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator"/> - </appInfo> - </annotation> - </attribute> - <attribute name="ordinal" type="string"> - <annotation> - <documentation> - An optional integer ordinal that is used to prioritize a source if the domain loading strategy does not supply it's own sorting. The higher the number, the higher the priority. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 2.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2007 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd deleted file mode 100644 index 1ab7d632f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd +++ /dev/null @@ -1,134 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="StandardMetaDataFiles" name="StandardMetaDataFiles"/> - </appInfo> - <documentation> - Defines a file of metadata for a given URI in "standard" form loadable by <code>org.eclipse.jst.jsf.common.metadata model</code> - -<p><b>This extension point is provisional and subject to change</b></p> - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="standardMetaDataFile" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="standardMetaDataFile"> - <annotation> - <documentation> - Mapping of a namespace URI to an XML file loadable by a standard metadata EMF model defined by <code>http://org.eclipse.jst.jsf.common.metadata/metadata.ecore</code>. See <code>org.eclipse.jst.jsf.standard.tagsupport</code> plugin and the /metadata/jsf_core.xml file. - </documentation> - </annotation> - <complexType> - <attribute name="uri" type="string" use="required"> - <annotation> - <documentation> - Content model URI being annotated. eg. "http://java.sun.com/jsf/core". This can, of course, be any string that the consumer wishes to use as a key. - </documentation> - </annotation> - </attribute> - <attribute name="location" type="string" use="required"> - <annotation> - <documentation> - Location of the annotation file. If no locator is provided, it will use the default <code>PluginRelativeStandardMetaDataSourceFileLocator</code> which will find the file in a location relative to the plugin. -eg. /metadata/jsf_core.xml - </documentation> - </annotation> - </attribute> - <attribute name="locator" type="string"> - <annotation> - <documentation> - Class extending <code>org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator</code> that will be used to locate the standard metadata file. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 2.0 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - <extension - point="org.eclipse.jst.jsf.common.standardMetaDataFiles"> - <standardMetaDataFile - location="/metadata/JSF_HTML.xml" - uri="http://java.sun.com/jsf/html"> - </standardMetaDataFile> - </extension> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2007 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/annotationFiles.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/annotationFiles.exsd deleted file mode 100644 index 4db4fe75f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/annotationFiles.exsd +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="annotationFiles" name="Annotation Files"/> - </appInfo> - <documentation> - Adds annotation meta-data to a content model. An extending plugin may only create one annotation file for a given URI. - -<p><b>This extension point is provisional and subject to change</b></p> - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="annotationFile" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="annotationFile"> - <annotation> - <documentation> - File used to map annotations to a tag library content model. The file assigns properties to a tag element or attribute. - </documentation> - </annotation> - <complexType> - <attribute name="uri" type="string" use="required"> - <annotation> - <documentation> - Content model URI being annotated. eg. "http://java.sun.com/jsf/core". This can, of course, be any string that the consumer wishes to use as a key. - </documentation> - </annotation> - </attribute> - <attribute name="location" type="string" use="required"> - <annotation> - <documentation> - Location of the annotation file. If no locator is provided, it will use the default <code>CMPluginRelativeSourceFileLocator</code> which will find the file in a location relative to the plugin. -eg. /metadata/jsf_core.xml - </documentation> - </annotation> - </attribute> - <attribute name="locator" type="string"> - <annotation> - <documentation> - Class implementing the abstract <code>CMAnnotationSourceFileLocator</code> class. Responsible for locating the annotation file and returning an InputStream to the parser and returning a <code>ResourceBundle</code> if there is one. If a locator is not supplied, the default implementation for a plugin relative file, <code>CMPluginRelativeSourceFileLocator</code> will be used. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator:org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser"/> - </appInfo> - </annotation> - </attribute> - <attribute name="parser" type="string"> - <annotation> - <documentation> - The name of the parser class used to fill the internal model. If not specified the default, <code>CMAnnotationFileParser</code>, will be used which conforms to the default schema <code>http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema</code>. If parser is provided, it must implement <code>ICMAnnotationFileParser</code>. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator:org.eclipse.jst.jsf.contentmodel.annotations.ICMAnnotationFileParser"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 1.5 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - The parser, if specified, must implement <code>ICMAnnotationFileParser</code> to create <code>CMElementAnnotation</code> and <code>CMAttributeAnnotations</code> in the <code>CMAnnotationMap</code>. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2006 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd deleted file mode 100644 index b44040c00..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="contextSymbolFactory" name="Contextual Symbol Factory"/> - </appInfo> - <documentation> - The context symbol factory allows a symbol factory with a specific id to be registered to create symbols in a particular context. Clients wishing to delegate symbol construction in a particular context may then request the symbol factory based on its id. - -To get a map of registered symbol factories keyed by id, call SymbolsPlugin.getSymbolFactories(). - -The most common use of this extension point is by the JSPModelProcessor. By decorating a tag attribute with meta-data pointing to a context symbol factory with a particular id, the JSP model processor will call that symbol factory to create a symbol for that tag. - -See developer docs on decorating variable contributing tags for more information. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <choice> - <element ref="contextSymbolFactory"/> - </choice> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="contextSymbolFactory"> - <annotation> - <documentation> - The context symbol factory description. - </documentation> - </annotation> - <complexType> - <attribute name="factory" type="string" use="required"> - <annotation> - <documentation> - An instance of AbstractContextSymbolFactory that implements the context symbol factory. - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory"/> - </appInfo> - </annotation> - </attribute> - <attribute name="factoryId" type="string" use="required"> - <annotation> - <documentation> - The id that will be used to uniquely identify this factory in meta-data or elsewhere. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 1.5 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - <p>The following example creates a symbol factory for creating symbols.</p> - -<p> -<pre> -<extension - point="org.eclipse.jst.jsf.context.symbol.contextSymbolFactory"> - <contextSymbolFactory - factory="org.eclipse.jst.jsf.designtime.internal.jsp.JSPDefaultSymbolFactory" - factoryId="org.eclipse.jst.jsf.designtime.core.loadBundle"/> -</extension> -</pre> -</p> - -<p>When the symbol factory <i>org.eclipse.jst.jsf.designtime.core.loadBundle</i> is requested, an instance of JSPDefaultSymbolFactory will be constructed.</p> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - Copyright 2006 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd deleted file mode 100644 index 2319744b7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema - targetNamespace="http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema" - version="1.0" - attributeFormDefault="unqualified" - elementFormDefault="unqualified" - xmlns="http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:element name="grammar-annotations" - type="grammar-annotationType" /> - - <xsd:complexType name="grammar-annotationType"> - <xsd:sequence> - <xsd:element name="cm-element" - type="cm-elementType" minOccurs="1" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="caseSensitive" type="xsd:boolean" use="optional" default="true"/> - </xsd:complexType> - <xsd:complexType name="cm-elementType"> - <xsd:sequence> - <xsd:element name="cm-attribute" type="cm-attributeType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - <xsd:complexType name="cm-attributeType"> - <xsd:sequence> - <xsd:element name="property" - type="propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - <xsd:complexType name="propertyType"> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> -</xsd:schema>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd deleted file mode 100644 index 8f265a01f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.jst.jsf.common" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appinfo> - <meta.schema plugin="org.eclipse.jst.jsf.common" id="symbols" name="Symbol Source Provider"/> - </appinfo> - <documentation> - A symbol source provider is called to discover EL namespace variable symbols. For example, managed bean variable symbols, are contributed through a symbol source provider. A symbol source provider may or may not wish to use a context symbol factory depending on the situation. - -When an EL variable is resolved, each symbol provider will be considered equally. All of the information that determines a symbol's characteristics must be encoded in the returned ISymbol object. - -A list of registered symbol providers may be found by calling JSFCommonPlugin.getSymbolSourceProvider(). - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <choice> - <element ref="symbolSourceId"/> - </choice> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appinfo> - <meta.attribute translatable="true"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="symbolSourceId"> - <complexType> - <attribute name="factory" type="string" use="required"> - <annotation> - <documentation> - An instance of the factory interface that will be invoked to create an instance of this symbol source provider. Factory must have a zero-arg default constructor. - </documentation> - <appinfo> - <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory"/> - </appinfo> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appinfo> - <meta.section type="since"/> - </appinfo> - <documentation> - 1.5 - </documentation> - </annotation> - - <annotation> - <appinfo> - <meta.section type="examples"/> - </appinfo> - <documentation> - The following xml is used to contribute a set of default providers to contribute managed bean, built-in and tag contributed variables: - -<p> -<pre> - <extension - point="org.eclipse.jst.jsf.context.symbol.symbolSourceProvider"> - <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.DefaultBeanSymbolSourceProvider"/> - <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.JSPTagVariableSymbolSourceProvider"/> - <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.DefaultBuiltInSymbolProvider"/> - </extension> -</pre> -</p> - </documentation> - </annotation> - - - - - <annotation> - <appinfo> - <meta.section type="copyright"/> - </appinfo> - <documentation> - Copyright 2006 Oracle -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - </documentation> - </annotation> - -</schema> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java deleted file mode 100644 index 83e040791..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java +++ /dev/null @@ -1,332 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.ILog; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.EMFPlugin; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory; -import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider; -import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory; -import org.osgi.framework.Bundle; - -/** - * This is the central singleton for the My edit plugin. - * <!-- begin-user-doc --> - * This class is not API. - * <!-- end-user-doc --> - * @generated - */ -public final class JSFCommonPlugin extends EMFPlugin { - - /** - * Plugin id - */ - public static final String PLUGIN_ID = "org.eclipse.jst.jsf.common"; //$NON-NLS-1$ - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - private static List<ISymbolSourceProviderFactory> registeredSymbolSourceProviders; - private static Map<String,AbstractContextSymbolFactory> registeredSymbolFactories; - - private final static String FACTORY_ATTRIBUTE_NAME = "factory"; //$NON-NLS-1$ - private final static String FACTORY_ATTRIBUTE_ID_NAME = "factoryId"; //$NON-NLS-1$ - private final static String SYMBOL_SOURCE_ID = "symbolSourceId"; //$NON-NLS-1$ - private final static String CONTEXT_SYMBOL_FACTORY = "contextSymbolFactory"; //$NON-NLS-1$ - /** - * Keep track of the singleton. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final JSFCommonPlugin INSTANCE = new JSFCommonPlugin(); - - /** - * Keep track of the singleton. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static Implementation plugin; - - /** - * Create the instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public JSFCommonPlugin() { - super - (new ResourceLocator [] { - }); - } - - /** - * Returns the singleton instance of the Eclipse plugin. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the singleton instance. - * @generated - */ - public ResourceLocator getPluginResourceLocator() { - return plugin; - } - - /** - * Returns the singleton instance of the Eclipse plugin. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the singleton instance. - * @generated - */ - public static Implementation getPlugin() { - return plugin; - } - - /** - * @param e - * @param msg - */ - public static void log(final Exception e, final String msg) { - final ILog log = getPlugin().getLog(); - - log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e)); - } - - /** - * Logs using the default ILog implementation provided by getLog(). - * - * @param severity Severity (IStatus constant) of log entry - * @param message Human-readable message describing log entry - * @param ex Throwable instance (can be null) - */ - public static void log(int severity, String message, Throwable ex) { - getPlugin().getLog().log(new Status(severity, PLUGIN_ID, IStatus.OK, message, ex)); - } - - /** - * Logs using the default ILog implementation provided by getLog(). - * - * @param severity Severity (IStatus constant) of log entry - * @param message Human-readable message describing log entry - */ - public static void log(int severity, String message) { - log(severity, message, null); - } - /** - * @return all registered symbol source providers - */ - public static ISymbolSourceProvider[] getSymbolSourceProvider() - { - return registeredSymbolSourceProviders.toArray(new ISymbolSourceProvider[0]); - } - - /** - * @return all registered symbol source providers - */ - public synchronized static List<ISymbolSourceProviderFactory> getSymbolSourceProviders() - { - if (registeredSymbolSourceProviders == null) - { - registerProviders(); - if (registeredSymbolSourceProviders == null) - { - throw new AssertionError("registerProviders failed"); //$NON-NLS-1$ - } - } - return Collections.unmodifiableList(registeredSymbolSourceProviders); - } - - private static void registerProviders() - { - final IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(plugin.getBundle().getSymbolicName(), Implementation.SYMBOL_SOURCE_EXT_ID); - final IExtension[] extensions = point.getExtensions(); - registeredSymbolSourceProviders = new ArrayList<ISymbolSourceProviderFactory>(extensions.length); - - for (int i = 0; i < extensions.length; i++) - { - final IExtension extension = extensions[i]; - final IConfigurationElement[] elements = - extension.getConfigurationElements(); - final String bundleId = extension.getContributor().getName(); - - for (int j = 0; j < elements.length; j++) - { - final IConfigurationElement element = elements[j]; - if (SYMBOL_SOURCE_ID.equals(element.getName()) - && element.getAttribute(FACTORY_ATTRIBUTE_NAME) != null) - { - String factoryClassName = element.getAttribute(FACTORY_ATTRIBUTE_NAME); - final Bundle bundle = Platform.getBundle(bundleId); - - if (bundle != null) - { - try - { - Class factoryClass = bundle.loadClass(factoryClassName); - - ISymbolSourceProviderFactory factory = - (ISymbolSourceProviderFactory) factoryClass.newInstance(); - - registeredSymbolSourceProviders.add(factory); - } - catch (Exception e) - { - plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol provider extension point",e)); //$NON-NLS-1$ - } - } - } - } - } - } - - /** - * @return the list of registed symbol factories - */ - public synchronized static Map<String, AbstractContextSymbolFactory> getSymbolFactories() - { - if (registeredSymbolFactories == null) - { - registerSymbolFactories(); - if (registeredSymbolFactories == null) - { - throw new AssertionError("registerProviders failed"); //$NON-NLS-1$ - } - } - return Collections.unmodifiableMap(registeredSymbolFactories); - } - - private static void registerSymbolFactories() - { - final IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(plugin.getBundle().getSymbolicName(), Implementation.SYMBOL_FACTORY_EXT_ID); - final IExtension[] extensions = point.getExtensions(); - registeredSymbolFactories = new HashMap<String, AbstractContextSymbolFactory>(extensions.length); - - for (int i = 0; i < extensions.length; i++) - { - final IExtension extension = extensions[i]; - final IConfigurationElement[] elements = - extension.getConfigurationElements(); - final String bundleId = extension.getContributor().getName(); - - for (int j = 0; j < elements.length; j++) - { - final IConfigurationElement element = elements[j]; - if (CONTEXT_SYMBOL_FACTORY.equals(element.getName()) - && element.getAttribute(FACTORY_ATTRIBUTE_NAME) != null) - { - final String factoryClassName = element.getAttribute(FACTORY_ATTRIBUTE_NAME); - final String factoryId = element.getAttribute(FACTORY_ATTRIBUTE_ID_NAME); - final Bundle bundle = Platform.getBundle(bundleId); - - if (bundle != null) - { - try { - Class factoryClass = bundle.loadClass(factoryClassName); - - AbstractContextSymbolFactory factory = - (AbstractContextSymbolFactory) factoryClass.newInstance(); - registeredSymbolFactories.put(factoryId, factory); - } catch (InstantiationException e) { - plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$ - } catch (ClassNotFoundException e) { - plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$ - } - } - } - } - } - } - - /** - * Logs an exception in this plugin to the error log - * - * @param t - */ - public static void log(Throwable t) - { - ILog log = getPlugin().getLog(); - IStatus status = new Status(IStatus.ERROR, getPlugin().getSymbolicName(), 0, "Caught exception", t); //$NON-NLS-1$ - log.log(status); - } - - /** - * The actual implementation of the Eclipse <b>Plugin</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static class Implementation extends EclipsePlugin - { - /** - * Name of the symbolSourceProvider ext point - */ - public static final String SYMBOL_SOURCE_EXT_ID = "symbolSourceProvider"; //$NON-NLS-1$ - /** - * Local identifier for the symbol factory extension point - */ - public static final String SYMBOL_FACTORY_EXT_ID = "contextSymbolFactory"; //$NON-NLS-1$ - /** - * Creates an instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Implementation() { - super(); - - // Remember the static instance. - // - plugin = this; - } - } - - - /** - * Utility method returning class from class name using classloader from specified bundle - * @param className - * @param bundleId - * @return Class - */ - public static Class<?> loadClass(String className, String bundleId) { - Class<?> aClass = null; - try { - if (bundleId != null){ - Bundle bundle = Platform.getBundle(bundleId); - if (bundle != null){ - aClass = bundle.loadClass(className); - } - } - } catch (ClassNotFoundException e) { - log(e); - } - return aClass; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java deleted file mode 100644 index ec51032f6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.dom; - -import org.w3c.dom.Node; - -/** - * Generic adapter for DOM attribute structures. - * - * @author cbateman - * - * <p> - * <b>Provisional API - subject to change</b> - * </p> - */ -public abstract class AttrDOMAdapter extends DOMAdapter -{ - - private AttributeIdentifier _attributeId; // lazily instantiated. - private final ElementDOMAdapter _owner; - - /** - * @param owner - */ - protected AttrDOMAdapter(final ElementDOMAdapter owner) - { - _owner = owner; - } - - /** - * The default implementation always returns the owner specified in the - * constructor. - * - * @return the element that owns this attribute - */ - public ElementDOMAdapter getOwningElement() - { - return _owner; - } - - /** - * @return the value of the attribute. May return null if the attribute has - * no value. - */ - public abstract String getValue(); - - @Override - public final short getNodeType() - { - return Node.ATTRIBUTE_NODE; - } - - /** - * @return the attribute identifier - */ - public final AttributeIdentifier getAttributeIdentifier() - { - synchronized (this) - { - if (_attributeId == null) - { - _attributeId = new MyAttributeIdentifier(); - } - } - return _attributeId; - } - - private class MyAttributeIdentifier extends AttributeIdentifier - { - - @Override - public String getName() - { - return AttrDOMAdapter.this.getLocalName(); - } - - @Override - public TagIdentifier getTagIdentifier() - { - return getOwningElement().getTagId(); - } - - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java deleted file mode 100644 index 2bf163efc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.dom; - -/** - * Uniquely identifies a named attribute on a tag usint TagIdentifier as a way - * to uniquely identify the host tag. All instances should be considered - * immutable and idempotent. Factories may cache copies as transparent - * singletons for unique TagIdentifier/attribute. - * - * THIS CLASS IS NOT API AND SHOULD NOT BE USED - * - * @author cbateman - * - */ -public abstract class AttributeIdentifier -{ - /** - * @return the attribute name (local name, namespace prefix is currently ignored) - */ - public abstract String getName(); - - /** - * @return the tag identifier - */ - public abstract TagIdentifier getTagIdentifier(); - - public final boolean equals(Object compareTo) - { - if (compareTo instanceof AttributeIdentifier) - { - return isSameAttributeType((AttributeIdentifier) compareTo); - } - return false; - } - - public final int hashCode() - { - // use toLowerCase to ensure equals matches - int hashCode = getName().toLowerCase().hashCode(); - - int tagCode = getTagIdentifier().hashCode(); - - hashCode = hashCode ^ tagCode; - - return hashCode; - } - - /** - * @param attributeId - * @return true if attributeId represents the same attribute as this. - */ - public final boolean isSameAttributeType(AttributeIdentifier attributeId) - { - // if same object, always true - if (attributeId == this) - { - return true; - } - - - // if tag identifiers not same, then always false. - if (!getTagIdentifier().isSameTagType(attributeId.getTagIdentifier())) - { - return false; - } - - // if tag id is the same, the tag name must be too. - return getName().toLowerCase().equals(attributeId.getName().toLowerCase()); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java deleted file mode 100644 index fb3c43b75..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.dom; - -/** - * A generic adapter that can adapt some non-DOM - * things to a dom-like structure like an IRegion to a DOM-like structure. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class DOMAdapter -{ - /** - * @return the node type. Conforms to Node.getNodeType. - */ - public abstract short getNodeType(); - - /** - * @return the name prefix. Conforms to W3C Node.getPrefix() - */ - public abstract String getPrefix(); - - /** - * @return the local part of the name. Conforms to W3C Node.getLocalName() - */ - public abstract String getLocalName(); - - /** - * @return the name of the node. Conforms the W3C Node.getNodeName interface - */ - public abstract String getNodeName(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java deleted file mode 100644 index b30f3cc17..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.dom; - -import java.util.Map; - -import org.w3c.dom.Node; - -/** - * T - * @author cbateman - * - * <p><b>Provisional API - subject to change</b></p> - * - */ -public abstract class ElementDOMAdapter extends DOMAdapter -{ - private TagIdentifier _tagIdentifier; // lazily initialized - - /** - * Map should be considered immutable and may throw exceptions if - * mutations are attempted. - * - * @return a nodeName keyed map of attributes belonging to this element - */ - public abstract Map<String, ? extends AttrDOMAdapter> getAttributes(); - - @Override - public final short getNodeType() - { - return Node.ELEMENT_NODE; - } - - /** - * @return the namespace uri for element or null if not applicable (i.e. HTML). - */ - public abstract String getNamespace(); - - /** - * @return the tag identifier for this attribute - */ - public final TagIdentifier getTagId() - { - synchronized(this) - { - if (_tagIdentifier == null) - { - _tagIdentifier = new MyTagIdentifier(); - } - } - return _tagIdentifier; - } - - private final class MyTagIdentifier extends TagIdentifier - { - @Override - public String getTagName() - { - return getLocalName(); - } - - @Override - public String getUri() - { - return getNamespace(); - } - - @Override - public boolean isJSPTag() - { - // shouldn't be called - throw new UnsupportedOperationException("jsp flag not supported on this identifier"); - } - - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java deleted file mode 100644 index 3d675a69d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.dom; - -import javax.xml.namespace.QName; - - -/** - * Creates an abstraction for a tag. A tag is defined as a DOM Element whose - * namespace uri may be defined outside of the DOM, such as in a JSP tag library - * declaration. This allows tags to be abstracted from actual DOM elements, which - * is useful in situations like palette creation drops where the construction information - * is known, but we are not ready to create and add a node to the document yet. - * - * All tag TagIdentifier<i>s</i> should be considered immutable and idempotent. - * TagIdentifier instances may be cached by the factory. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class TagIdentifier -{ - /** - * @return the uri that uniquely identifies the tag. - * - * i.e. - * - * If the tag is defined by an XML namespace, then that uri string will be returned. - * If the tag is defined by a JSP tag library, then the tag library uri should - * be returned. - */ - public abstract String getUri(); - - /** - * @return the local name of the tag (without namespace prefix) - */ - public abstract String getTagName(); - - /** - * @return true if this tag is a JSP tag - */ - public abstract boolean isJSPTag(); - - public final boolean equals(Object compareTo) - { - if (compareTo instanceof TagIdentifier) - { - return isSameTagType((TagIdentifier) compareTo); - } - return false; - } - - public final int hashCode() - { - // use toLowerCase to ensure equals matches - int hashCode = getTagName().toLowerCase().hashCode(); - - String uri = getUri(); - if (uri != null) - { - hashCode ^= uri.hashCode(); - } - return hashCode; - } - - /** - * @param tagWrapper - * @return true if tagWrapper represents the same tag as this. - */ - public final boolean isSameTagType(TagIdentifier tagWrapper) - { - if (tagWrapper == this) - { - return true; - } - - final String uri = tagWrapper.getUri(); - - if (uri == null) - { - if (getUri() != null) - { - return false; - } - } - else if (uri.equals(getUri())) - { - final String tagName = tagWrapper.getTagName(); - - if (tagName == null) - { - if(getTagName() != null) - { - return false; - } - } - else - { - // uri and tag name must both the same for it to be the same type - // TODO: the ignore case thing is dependent on the type of container document - // Use toLower instead of equalsIgnoreCase to ensure that hashCode generates - // a hashCode that guarantees x.equals(y) => x.hashCode == y.hashCode - if (tagName.toLowerCase().equals((getTagName().toLowerCase()))) - { - return true; - } - } - } - - // fall-through, not same - return false; - } - - /** - * @return the QName equivalent. Returns a new object on every invocation. - */ - public final QName asQName() - { - return new QName(getUri(), getTagName()); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java deleted file mode 100644 index af4d45aef..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * API for manipulating DOM-based objects. - * - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.dom; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java deleted file mode 100644 index 259d90921..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal; - -/** - * An injection interface that allows classes to selectively report test progress. - * - * @author cbateman - * - */ -public interface ITestTracker -{ - /** - * Event types - * - */ - public enum Event - { - /** - * Signals that tracking should begin on the eventLabel - * The seqId must be repeated on the STOP_TRACKING event - * for the same event. - */ - START_TRACKING, - /** - * Signals that tracking should stop on the named event - * for the seqId that was passed first in the START_TRACKING. - * - */ - STOP_TRACKING - } - - /** - * Fires the event of type event, a unique instance tracking seqId - * and a label called eventLabel. - * - * @param event - * @param seqId - * @param eventLabel - */ - void fireEvent(Event event, long seqId, String eventLabel); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java deleted file mode 100644 index 37e7a9999..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.core.runtime.content.IContentTypeManager; - -/** - * Utility JSP methods - * @author cbateman - * - */ -public final class JSPUtil -{ - private final static String CTYPE_JSPSOURCE = - "org.eclipse.jst.jsp.core.jspsource"; //$NON-NLS-1$ - private final static String CTYPE_JSPFRAGMENTSOURCE = - "org.eclipse.jst.jsp.core.jspfragmentsource"; //$NON-NLS-1$ - /** - * @param contentType - * @return true if contentType is one of the content types registered - * for JSP files - */ - public static boolean isJSPContentType(final String contentType) - { - return CTYPE_JSPSOURCE.equals(contentType) - || CTYPE_JSPFRAGMENTSOURCE.equals(contentType); - } - - /** - * @param file - * @return true if file is associated with a JSP or JSP fragment content type - */ - public static boolean isJSPContentType(final IFile file) - { - final boolean isJSPSource = isJSPSource(file); - if (isJSPSource) - { - return true; - } - - final boolean isJSPFragment = isJSPFragment(file); - - if (isJSPFragment) - { - return true; - } - - return false; - } - - private JSPUtil() - { - // no instantiation - } - - /** - * @param file - * @return true if file is associated with the JSP source content type - * (returns if JSP fragment) - */ - public static boolean isJSPSource(IFile file) { - return isAssociatedWithContentType(file, CTYPE_JSPSOURCE); - } - - /** - * @param file - * @return true if the file is associated with the JSP fragment content type - */ - public static boolean isJSPFragment(IFile file) { - return isAssociatedWithContentType(file, CTYPE_JSPFRAGMENTSOURCE); - } - - private static boolean isAssociatedWithContentType(final IFile file, final String contentType) - { - final IContentTypeManager typeManager = Platform.getContentTypeManager(); - IContentType jspContentType = - typeManager.getContentType(contentType); - if (jspContentType != null - && jspContentType.isAssociatedWith(file.getName())) - { - return true; - } - - return false; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java deleted file mode 100644 index ab216e321..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * A pattern that runs a Job and either joins on the job's completion - * or runs some completion behaviour. - * - * @author cbateman - * - */ -public class RunOnCompletionPattern implements Runnable -{ - private final Job _job; - private final Runnable _runAfter; - - /** - * @param job - * @param runAfter - */ - public RunOnCompletionPattern(Job job, Runnable runAfter) - { - _job = job; - _runAfter = runAfter; - } - - public void run() - { - if (_runAfter != null) - { - _job.addJobChangeListener(new JobChangeAdapter() - { - - @Override - public void done(IJobChangeEvent event) - { - if (event.getResult().getSeverity() != IStatus.ERROR) - { - _runAfter.run(); - } - } - - }); - } - - _job.schedule(); - - if (_runAfter == null) - { - try - { - _job.join(); - } - catch (InterruptedException e) - { - JSFCommonPlugin.log(e, "Joining on job"); - } - } - } - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java deleted file mode 100644 index faa337a4b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.managedobject; - -/** - * Sub-class for managed objects. - * - */ -public abstract class AbstractManagedObject implements IManagedObject -{ - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#dispose() - */ - public abstract void dispose(); - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#checkpoint() - */ - public abstract void checkpoint(); - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#destroy() - */ - public abstract void destroy(); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java deleted file mode 100644 index b4e7e7542..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.managedobject; - -/** - * Represents an object that wishes to be managed by the framework. - * - * Clients should not implement: sub-class AbstractManagedObject instead. - * - */ -public interface IManagedObject -{ - /** - * Called by the object client to indicate is finished with the object. - * The object should save any data it may want between sessions, perhaps - * by calling its checkpoint, before cleaning held resources and clearing - * memory references. - */ - void dispose(); - - /** - * Called to indicate that the object should remove all its data from both - * memory and persistent storage. This differentiates it from dispose in - * that it signals that this object and its associated state will never - * again be loaded for associated objects. - */ - void destroy(); - - /** - * Indicates that an object should flush cached data and make durable - * any data it might want between sessions. It does not indicate a - * disposal of the object. - */ - void checkpoint(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java deleted file mode 100644 index f98fe9dda..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.managedobject; - -/** - * An abstraction for a manager that manages managed objects based on a KEYTYPE - * - * @author cbateman - * - * @param <T> - * @param <KEYTYPE> - */ -public abstract class ObjectManager<T extends IManagedObject, KEYTYPE> -{ - /** - * A valid instance of T for the key. The instance of T may be unique on - * a per-key basis or may not. - * - * @param key - * @return an instance of the managed object associated with key - * @throws ManagedObjectException if an error occurs during construction - */ - public abstract T getInstance(KEYTYPE key) throws ManagedObjectException; - - /** - * Indicates a problem that occurred during a managed object operation - * @author cbateman - * - */ - public static class ManagedObjectException extends Exception - { - /** - * - */ - private static final long serialVersionUID = -8723548990029368844L; - - /** - * - */ - public ManagedObjectException() - { - super(); - } - - /** - * @param message - * @param cause - */ - public ManagedObjectException(String message, Throwable cause) - { - super(message, cause); - } - - /** - * @param message - */ - public ManagedObjectException(String message) - { - super(message); - } - - /** - * @param cause - */ - public ManagedObjectException(Throwable cause) - { - super(cause); - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java deleted file mode 100644 index 24ba27d82..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.policy; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** - * An iterator policy that sorts a comparable iterator type canonically. This - * policy takes a private copy of the collectin passed in getIterator. The - * cost of the sort is incurred when getIterator() is called under the - * assumption that the iterator will normally be used immediately after - * construction, so there is little value in deferring. - * - * @author cbateman - * - * @param <ITERATORTYPE> - */ -public class CanonicallyOrderedIteratorPolicy<ITERATORTYPE extends Comparable<ITERATORTYPE>> - implements IIteratorPolicy<ITERATORTYPE> -{ - - public Iterator<ITERATORTYPE> getIterator( - Collection<ITERATORTYPE> forCollection) - { - return new CanonicalIterator<ITERATORTYPE>(forCollection); - } - - private final static class CanonicalIterator<ITERATORTYPE extends Comparable> implements Iterator<ITERATORTYPE> - { - private final Iterator<ITERATORTYPE> _sortedIterator; - private CanonicalIterator(final Collection<ITERATORTYPE> source) - { - List<ITERATORTYPE> sortable = new ArrayList<ITERATORTYPE>(source); - Collections.sort(sortable); - _sortedIterator = sortable.iterator(); - } - - public boolean hasNext() - { - return _sortedIterator.hasNext(); - } - - public ITERATORTYPE next() - { - return _sortedIterator.next(); - } - public void remove() - { - throw new UnsupportedOperationException(); - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java deleted file mode 100644 index 6e6368def..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.policy; - -/** - * An object with an unique identity - * @author cbateman - * @param <IDTYPE> - * - */ -public interface IIdentifiable<IDTYPE> -{ - /** - * @return the unique identifier - */ - IDTYPE getId(); - - /** - * @return a human-readable name for this identifier. - */ - String getDisplayName(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java deleted file mode 100644 index 6b567f368..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.policy; - -import java.util.Collection; -import java.util.Iterator; - -/** - * A policy that allows a strategy composite to change the order in which - * it queries it's list of strategies. - * - * @author cbateman - * @param <ITERATORTYPE> - * - */ -public interface IIteratorPolicy<ITERATORTYPE> -{ - /** - * @param forCollection - * @return an iterator that controls the ordering through forCollection - * in a policy directed way. The policy may take a copy of the collection - * or may choose to iterate in place. - */ - Iterator<ITERATORTYPE> getIterator(Collection<ITERATORTYPE> forCollection); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java deleted file mode 100644 index d5de57472..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java +++ /dev/null @@ -1,130 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.policy; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; - -/** - * - * @author cbateman - * - * @param <ITERATORTYPE> - */ -public class IdentifierOrderedIteratorPolicy<ITERATORTYPE> implements - IIteratorPolicy<ITERATORTYPE> -{ - private final Iterable<ITERATORTYPE> _policyOrder; - // controls whether the policy iterator will return items that are - // not explicitly listed in policyOrder. - private boolean _excludeNonExplicitValues = false; - - /** - * @param policyOrder - */ - public IdentifierOrderedIteratorPolicy(final Iterable<ITERATORTYPE> policyOrder) - { - _policyOrder = policyOrder; - } - - /** - * Default value is <b>false</b>. - * - * @return if true, the iterator will not return values in the forCollection - * passed to getIterator whose identifier are not explicitly listed in - * the policyOrder, If false, these values will be return after all - * the policyOrder values have been returned. - */ - public boolean isExcludeNonExplicitValues() - { - return _excludeNonExplicitValues; - } - - /** - * @param excludeNonExplicitValues - */ - public void setExcludeNonExplicitValues(boolean excludeNonExplicitValues) - { - _excludeNonExplicitValues = excludeNonExplicitValues; - } - - public Iterator<ITERATORTYPE> getIterator( - final Collection<ITERATORTYPE> forCollection) - { - return new MyIterator<ITERATORTYPE>(forCollection, _excludeNonExplicitValues, _policyOrder); - } - - private static class MyIterator<ITERATORTYPE> implements Iterator<ITERATORTYPE> - { - private final List<ITERATORTYPE> _items; - private final Iterator<ITERATORTYPE> _policyIterator; - private ITERATORTYPE _next; - - MyIterator(final Collection<ITERATORTYPE> collection, - final boolean excludeNonExplicitValues, - final Iterable<ITERATORTYPE> policyOrder) - { - _items = new ArrayList(); - _items.addAll(collection); - - _policyIterator = policyOrder.iterator(); - _next = findNext(); - } - - public boolean hasNext() - { - return _next != null; - } - - public ITERATORTYPE next() - { - if (_next != null) - { - ITERATORTYPE next = _next; - //calculate next one before returning - _next = findNext(); - return next; - } - - throw new NoSuchElementException("No more elements"); - } - - public void remove() - { - throw new UnsupportedOperationException(); - } - - private ITERATORTYPE findNext() - { - while (_policyIterator.hasNext()) - { - ITERATORTYPE next = _policyIterator.next(); - if (_items.contains(next)) - { - _items.remove(next); - return next; - } - } - - // we have exhausted the _items that are in the policy iterator - // now return any further _items in the order they are in the list - if (_items.size() > 0) - { - return _items.remove(0); - } - - return null; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java deleted file mode 100644 index 75407553e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java +++ /dev/null @@ -1,178 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.policy; - -import java.util.List; - -/** - * Provides a list of order, enablement-modifiable objects. - * - * @author cbateman - * - */ -public abstract class OrderedListProvider -{ - private List<OrderableObject> _orderableObjects; - - /** - * - * @return the list of ordered objects - */ - public final List<OrderableObject> getOrderedObjects() - { - if (_orderableObjects == null) - { - _orderableObjects = createAndPopulateOrderedObjects(); - } - return _orderableObjects; - } - - /** - * <p>Clears the orderableObjects collection so that the next call - * of getOrderedObjects() </p> - */ - public final void resetOrderedObjects() - { - _orderableObjects = null; - } - - /** - * Move the object one toward the front of the list - * - * @param object - */ - public final void moveUp(final OrderableObject object) - { - final List<OrderableObject> list = getOrderedObjects(); - final int index = list.indexOf(object); - if (index > 0) - { - OrderableObject item = list.remove(index); - list.add(index - 1, item); - } - } - - /** - * Move the object one toward the end - * @param object - */ - public final void moveDown(final OrderableObject object) - { - final List<OrderableObject> list = getOrderedObjects(); - int index = list.indexOf(object); - if (index < list.size() - 1) - { - OrderableObject item = list.remove(index); - list.add(index + 1, item); - } - } - - /** - * @return a new list orderable objects populate in their initial order - * The list must be modifiable. - */ - protected abstract List<OrderableObject> createAndPopulateOrderedObjects(); - - /** - * Proxy object for ordering in list - * - * @author cbateman - * - */ - public static class OrderableObject implements Cloneable - { - private boolean _enabled; - private Object _object; - - /** - * @param object - * @param enabled - */ - public OrderableObject(final Object object, final boolean enabled) - { - _object = object; - _enabled = enabled; - } - - private OrderableObject(final OrderableObject copyMe) - { - _object = copyMe._object; - _enabled = copyMe._enabled; - } - - /** - * @return true if this object is enabled - */ - public boolean isEnabled() - { - return _enabled; - } - - /** - * @param enabled - */ - public void setEnabled(boolean enabled) - { - _enabled = enabled; - } - - /** - * @return the object in the ordered list - */ - public Object getObject() - { - return _object; - } - - /** - * @param object - */ - public void setObject(Object object) - { - _object = object; - } - - @Override - public OrderableObject clone() - { - return new OrderableObject(this); - } - - @Override - public boolean equals(Object obj) - { - if (obj instanceof OrderableObject) - { - if (_enabled == ((OrderableObject)obj)._enabled) - { - Object other = ((OrderableObject)obj)._object; - if (other != null) - { - return other.equals(_object); - } - return _object == null; - } - } - return false; - } - - @Override - public int hashCode() - { - int enabledCode = _enabled ? 0xcccccccc : 0x33333333; - if (_object == null) - { - return enabledCode; - } - return _object.hashCode() ^ enabledCode; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java deleted file mode 100644 index 70e0e9591..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.resource; - -/** - * Listener can register for events ona particular LifecycleListener - * - * @author cbateman - * - */ -public interface IResourceLifecycleListener -{ - /** - * Listener accepts the resource lifecycle event - * - * @param event - * @return the result of accepting the event - */ - EventResult acceptEvent(ResourceLifecycleEvent event); - - /** - * @author cbateman - * - */ - public static class EventResult - { - private static EventResult DEFAULT; - - /** - * @return an event result with defaults initialized - */ - public synchronized static EventResult getDefaultEventResult() - { - if (DEFAULT == null) - { - DEFAULT = new EventResult() - { - @Override - protected void setDisposeAfterEvent(final boolean disposeAfterEvent) - { - throw new UnsupportedOperationException(); - } - }; - } - return DEFAULT; - } - - private static EventResult DISPOSE_AFTER_EVENT; - - /** - * @return an event result with default except dispose after - * is set - */ - public synchronized static EventResult getDisposeAfterEventResult() - { - if (DISPOSE_AFTER_EVENT == null) - { - DISPOSE_AFTER_EVENT = new EventResult() - { - /** - * @return the remove listener flag - */ - @Override - public boolean getDisposeAfterEvent() - { - return true; - } - - /** - * @param disposeAfterEvent - */ - @Override - protected void setDisposeAfterEvent(final boolean disposeAfterEvent) { - _disposeAfterEvent = disposeAfterEvent; - } - - }; - } - return DISPOSE_AFTER_EVENT; - } - - /** - * set to true if after the current event is finished firing, the source - * should be disposed. If self-disposal is not applicable, the flag is ignored - */ - protected boolean _disposeAfterEvent; - - /** - * @return the remove listener flag - */ - public boolean getDisposeAfterEvent() - { - return _disposeAfterEvent; - } - - /** - * @param disposeAfterEvent - */ - protected void setDisposeAfterEvent(final boolean disposeAfterEvent) { - _disposeAfterEvent = disposeAfterEvent; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java deleted file mode 100644 index 86140832a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.resource; - - -/** - * A lifecycle listener abstraction that cannot have its resources modified. - * Clients may only register and deregister for events. - * - * @author cbateman - * - */ -public abstract class ImmutableLifecycleListener -{ - - /** - * Adds listener to the list of objects registered to receive - * lifecycle events for this resource. Only adds the listener - * if it is not already in the list. - * - * Method is thread-safe and may block the caller - * - * Throws {@link IllegalStateException} if isDisposed() == true - * - * @param listener - */ - public abstract void addListener(final IResourceLifecycleListener listener); - - /** - * Removes listener from the list of registered listeners - * - * Method is thread-safe and may block the caller - * - * Throws {@link IllegalStateException} if isDisposed() == true - * - * @param listener - */ - public abstract void removeListener(final IResourceLifecycleListener listener); -}
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java deleted file mode 100644 index 4be8cb848..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java +++ /dev/null @@ -1,388 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.resource; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jst.jsf.common.internal.ITestTracker; -import org.eclipse.jst.jsf.common.internal.ITestTracker.Event; -import org.eclipse.jst.jsf.common.internal.resource.IResourceLifecycleListener.EventResult; -import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType; -import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType; - -/** - * Listens to resource changes and fires lifecycle events - * - * @author cbateman - * - */ -public class LifecycleListener extends ImmutableLifecycleListener implements - IResourceChangeListener -{ - private final static boolean ENABLE_TEST_TRACKING = false; - private static long _seqId; - - private final CopyOnWriteArrayList<IResource> _resources; - final CopyOnWriteArrayList<IResourceLifecycleListener> _listeners; - private AtomicBoolean _isDisposed = new AtomicBoolean( - false); - private ITestTracker _testTracker; // == - // null; - // initialized - // by - // setter - // injection - - /** - * Initialize an inactive lifecycle listener. A workspace listener will not - * be installed by this constructor. The object created using this - * constructor will not fire any events until addResource is called at least - * once to add a target resource - */ - public LifecycleListener() - { - _resources = new CopyOnWriteArrayList<IResource>(); - _listeners = new CopyOnWriteArrayList<IResourceLifecycleListener>(); - } - - /** - * Create a new lifecycle listener for the res - * - * @param res - */ - public LifecycleListener(final IResource res) - { - this(); - _resources.add(res); - ResourcesPlugin.getWorkspace().addResourceChangeListener(this); - } - - /** - * @param resources - */ - public LifecycleListener(final List<IResource> resources) - { - this(); - _resources.addAll(resources); - ResourcesPlugin.getWorkspace().addResourceChangeListener(this); - } - - /** - * @param testTracker - */ - public final void setTestTracker(final ITestTracker testTracker) - { - _testTracker = testTracker; - } - - /** - * Adds listener to the list of objects registered to receive lifecycle - * events for this resource. Only adds the listener if it is not already in - * the list. - * - * Method is thread-safe and may block the caller - * - * Throws {@link IllegalStateException} if isDisposed() == true - * - * @param listener - */ - public void addListener(final IResourceLifecycleListener listener) - { - if (isDisposed()) - { - throw new IllegalStateException(); - } - _listeners.addIfAbsent(listener); - } - - /** - * Removes listener from the list of registered listeners - * - * Method is thread-safe and may block the caller - * - * Throws {@link IllegalStateException} if isDisposed() == true - * - * @param listener - */ - public void removeListener(final IResourceLifecycleListener listener) - { - if (isDisposed()) - { - throw new IllegalStateException(); - } - _listeners.remove(listener); - } - - /** - * @param res - */ - public void addResource(final IResource res) - { - synchronized (_resources) - { - // don't add any resources if we've disposed before acquiring the - // lock - if (isDisposed()) - { - return; - } - - final int preSize = _resources.size(); - if (!_resources.contains(res)) - { - _resources.add(res); - } - - // if the size of the array was 0 - // and is now greater, make sure the listener is added - if (preSize == 0 && _resources.size() > 0) - { - ResourcesPlugin.getWorkspace().addResourceChangeListener(this); - } - } - } - - /** - * If there are no longer resources being targeted, the resource change - * listener will be removed. - * - * @param res - */ - public void removeResource(final IResource res) - { - synchronized (_resources) - { - // don't bother with this stuff if we're disposed. - if (isDisposed()) - { - return; - } - _resources.remove(res); - - // if there are no longer target resources, - // remove the workspace listener - if (_resources.size() == 0) - { - ResourcesPlugin.getWorkspace().removeResourceChangeListener( - this); - } - } - } - - /** - * Release the resource change listener - */ - public void dispose() - { - if (_isDisposed.compareAndSet(false, true)) - { - // ensure that add/removeResource don't cause races to add or - // remove the resource listener - synchronized (_resources) - { - // remove first to minimize the chance that the listener will - // be triggered during the remainder of dispose - ResourcesPlugin.getWorkspace().removeResourceChangeListener( - this); - _resources.clear(); - } - } - } - - /** - * @return true if the listener has been disposed - */ - public boolean isDisposed() - { - return _isDisposed.get(); - } - - public void resourceChanged(final IResourceChangeEvent event) - { - final long seqId = _seqId++; - - if (ENABLE_TEST_TRACKING && _testTracker != null) - { - _testTracker.fireEvent(Event.START_TRACKING, seqId, - "trackMethod_resourceChanged"); - } - - assert (!isDisposed()); - - switch (event.getType()) - { - case IResourceChangeEvent.PRE_CLOSE: - { - final IProject proj = (IProject) event.getResource(); - - // must use iterator to ensure copy on write behaviour - for (final IResource res : _resources) - { - if (proj == res || proj == res.getProject()) - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_INACCESSIBLE, - ReasonType.RESOURCE_PROJECT_CLOSED)); - } - } - } - break; - - case IResourceChangeEvent.PRE_DELETE: - { - final IProject proj = (IProject) event.getResource(); - - // must use iterator to ensure copy on write behaviour - for (final IResource res : _resources) - { - // if the resource being tracked is the resource being - // deleted, - // then fire a resource delete event - if (proj == res) - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_INACCESSIBLE, - ReasonType.RESOURCE_DELETED)); - } - // if the resource being tracked is a resource in the - // project being - // deleted, then fire a project deleted event - else if (proj == res.getProject()) - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_INACCESSIBLE, - ReasonType.RESOURCE_PROJECT_DELETED)); - } - } - } - break; - - case IResourceChangeEvent.POST_CHANGE: - { - for (final IResource res : _resources) - { - IResourceDelta delta = event.getDelta(); - - // long seqId2 = _seqId++; - // if (ENABLE_TEST_TRACKING && _testTracker != null) - // { - // _testTracker.fireEvent(Event.START_TRACKING, seqId2, - // "testFindMember"); - // } - // only care about post change events to resources - // that we are tracking - delta = delta.findMember(res.getFullPath()); - - if (delta != null) - { - visit(delta); - } - - // if (ENABLE_TEST_TRACKING && _testTracker != null) - // { - // _testTracker.fireEvent(Event.STOP_TRACKING, seqId2, - // "testFindMember"); - // } - } - } - break; - - default: - // do nothing - // we only handle these three - } - - if (ENABLE_TEST_TRACKING && _testTracker != null) - { - _testTracker.fireEvent(Event.STOP_TRACKING, seqId, - "trackMethod_resourceChanged"); - } - } - - private void fireLifecycleEvent(final ResourceLifecycleEvent event) - { - boolean disposeAfter = false; - - // NOTE: must use iterator through _listeners so that - // CopyOnWriteArrayList protects us from concurrent modification - for (final IResourceLifecycleListener listener : _listeners) - { - final EventResult result = listener.acceptEvent(event); - disposeAfter |= result.getDisposeAfterEvent(); - } - - if (disposeAfter) - { - dispose(); - } - } - - private void visit(final IResourceDelta delta) - { - assert (!isDisposed()); - - final IResource res = delta.getResource(); - - // the wkspace root is a special case since even though - // it is registered as the target resource, we are interested - // in new projects created in the root - if (res.getType() == IResource.ROOT) - { - handleWorkspaceRoot(delta); - } - - switch (delta.getKind()) - { - case IResourceDelta.CHANGED: - { - // the contents of the file have changed - if ((delta.getFlags() & IResourceDelta.CONTENT) != 0) - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_CHANGED, - ReasonType.RESOURCE_CHANGED_CONTENTS)); - } - } - break; - case IResourceDelta.REMOVED: - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_INACCESSIBLE, - ReasonType.RESOURCE_DELETED)); - } - break; - } - } - - private void handleWorkspaceRoot(final IResourceDelta delta) - { - for (final IResourceDelta childDelta : delta - .getAffectedChildren(IResourceDelta.ADDED)) - { - final IResource res = childDelta.getResource(); - if ((childDelta.getFlags() & IResourceDelta.OPEN) != 0 && - // project was just opened - res.getType() == IResource.PROJECT) - { - fireLifecycleEvent(new ResourceLifecycleEvent(res, - EventType.RESOURCE_ADDED, ReasonType.PROJECT_OPENED)); - } - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java deleted file mode 100644 index 1484382a7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.resource; - -import org.eclipse.core.resources.IResource; - -/** - * @author cbateman - * - */ -public class ResourceLifecycleEvent -{ - /** - * the type of lifecycle event - * this enum is not closed and may add new fields in the future - */ - public enum EventType - { - /** - * Indicates that the resource is no longer accessible (as testable with - * IResource.isAccessible). The reasonType will indicate why. - */ - RESOURCE_INACCESSIBLE, - - /** - * Indicates that the resource being tracked has changed in some - * way, use ReasonType to determine specifics - */ - RESOURCE_CHANGED, - - /** - * Indicates that the resource being tracked hass been added. Use - * ReasonType to determine specifics. - */ - RESOURCE_ADDED; - } - - /** - * encodes the cause of the event if the event type provides one - * this enum is not closed and may add new fields in the future - */ - public enum ReasonType - { - /** - * The resource was deleted from the workspace, - * this event is pre change if the event is project - * and post change otherwise - */ - RESOURCE_DELETED, - /** - * The resource's project was deleted. This event is - * pre-change. Note that if the tracked resource is - * a project, RESOURCE_DELETED will be fired, not this - * event. - */ - RESOURCE_PROJECT_DELETED, - /** - * The resource's project was closed. This event is pre-change - */ - RESOURCE_PROJECT_CLOSED, - /** - * Occurs when the contents of a non-project resource has changed - */ - RESOURCE_CHANGED_CONTENTS, - - /** - * Occurs when a project resource is added - */ - PROJECT_OPENED, - /** - * Occurs when a non-project resource is added. - */ - RESOURCE_ADDED - } - - private final IResource _affectedResource; - private final EventType _eventType; - private final ReasonType _reasonType; - - /** - * @param affectedResource - * @param eventType - * @param reasonType - */ - public ResourceLifecycleEvent(IResource affectedResource, EventType eventType, ReasonType reasonType) - { - _affectedResource = affectedResource; - _eventType = eventType; - _reasonType = reasonType; - } - - /** - * @return the affected resource - */ - public IResource getAffectedResource() { - return _affectedResource; - } - - /** - * @return the event that has occurred - */ - public EventType getEventType() { - return _eventType; - } - - /** - * @return the cause of the event - */ - public ReasonType getReasonType() { - return _reasonType; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java deleted file mode 100644 index bad92e256..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java +++ /dev/null @@ -1,268 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.resource; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject; -import org.eclipse.jst.jsf.common.internal.managedobject.ObjectManager; -import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType; -import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType; - -/** - * An object manager that manages a single instanceof an IManagedObject per - * resource. The manager takes care of ensuring that a managed object is - * properly disposed when a resource lifecycle event renders it inaccessible - * (i.e file is deleted, project is closed or delete). - * - * @author cbateman - * - * @param <RESOURCE> - * @param <MANAGEDOBJECT> - */ -public abstract class ResourceSingletonObjectManager<MANAGEDOBJECT extends IManagedObject, RESOURCE extends IResource> - extends ObjectManager<MANAGEDOBJECT, RESOURCE> -{ - // lazily initialized - private LifecycleListener _lifecycleListener; - private final Map<RESOURCE, ManagedResourceObject> _perResourceObjects; - - /** - * Default constructor - */ - protected ResourceSingletonObjectManager() - { - _perResourceObjects = new HashMap<RESOURCE, ManagedResourceObject>(); - } - - @Override - public final MANAGEDOBJECT getInstance(final RESOURCE key) - throws ManagedObjectException - { - synchronized(this) - { - runBeforeGetInstance(key); - ManagedResourceObject managedResObject = _perResourceObjects.get(key); - - if (managedResObject == null) - { - final MANAGEDOBJECT managedObject = createNewInstance(key); - - if (managedObject == null) - { - throw new ManagedObjectException( - "No object available for resource"); - } - managedResObject = manageResource(key, managedObject); - } - - runAfterGetInstance(key); - return managedResObject.getManagedObject(); - } - } - - /** - * @param resource - * @return a new instance of T associated with S. This operation must not - * cache T: a brand new instance is always required. getInstance - * will perform caching and resource listening. - */ - protected abstract MANAGEDOBJECT createNewInstance(RESOURCE resource); - - /** - * @param resource - */ - protected void runBeforeGetInstance(final RESOURCE resource) - { - // do nothing by default - } - - /** - * @param resource - */ - protected void runAfterGetInstance(final RESOURCE resource) - { - // do nothing by default - } - - /** - * @param resource - * @return true if there already exists a managed object associated with - * the resource - */ - public synchronized boolean isInstance(RESOURCE resource) - { - return _perResourceObjects.containsKey(resource); - } - - /** - * @return a copy of the current set of RESOURCE object keys that we - * are managing singletons for. Collection is mutable, but as a copy, - * changes to it do not effect thie object manager. - */ - public synchronized Collection<RESOURCE> getManagedResources() - { - final Set resources = new HashSet(_perResourceObjects.keySet()); - return resources; - } - /** - * Should be called by concrete classes to indicate they have created a new - * managed object for resource, for which they want to track lifecycle - * changes. - * - * @param resource - * @param managedObject - */ - private synchronized ManagedResourceObject manageResource(final RESOURCE resource, - final MANAGEDOBJECT managedObject) - { - final LifecycleListener listener = lazilyGetLifecycleListener(); - listener.addResource(resource); - final MyLifecycleEventListener eventListener = new MyLifecycleEventListener( - managedObject, resource); - listener.addListener(eventListener); - - final ManagedResourceObject managedResourceObject = new ManagedResourceObject( - managedObject, eventListener); - _perResourceObjects.put(resource, managedResourceObject); - return managedResourceObject; - } - - /** - * Stop managing the resource. If resource is the last one, the resource - * change listener will be removed (it will be added again when next - * manageResource is called). - * - * @param resource - */ - protected final synchronized void unmanageResource(final RESOURCE resource) - { - final ManagedResourceObject managedResourceObject = - _perResourceObjects.remove(resource); - final LifecycleListener listener = lazilyGetLifecycleListener(); - - if (managedResourceObject != null) - { - listener.removeListener(managedResourceObject.getEventListener()); - } - - listener.removeResource(resource); - } - - /** - * Call to register a listener - * - * @param listener - */ - protected final void addLifecycleEventListener( - final IResourceLifecycleListener listener) - { - final LifecycleListener lifecycleListener = lazilyGetLifecycleListener(); - lifecycleListener.addListener(listener); - } - - /** - * Call to remove a listener - * - * @param listener - */ - protected final void removeLifecycleEventListener( - final IResourceLifecycleListener listener) - { - final LifecycleListener lifecycleListener = lazilyGetLifecycleListener(); - lifecycleListener.removeListener(listener); - } - - private synchronized LifecycleListener lazilyGetLifecycleListener() - { - if (_lifecycleListener == null) - { - _lifecycleListener = new LifecycleListener(); - } - return _lifecycleListener; - } - - private class ManagedResourceObject - { - private final MANAGEDOBJECT _managedObject; - private final MyLifecycleEventListener _eventListener; - - private ManagedResourceObject(final MANAGEDOBJECT managedObject, - final MyLifecycleEventListener eventListener) - { - _managedObject = managedObject; - _eventListener = eventListener; - } - - public MANAGEDOBJECT getManagedObject() - { - return _managedObject; - } - - public MyLifecycleEventListener getEventListener() - { - return _eventListener; - } - } - - private class MyLifecycleEventListener implements - IResourceLifecycleListener - { - private final RESOURCE _resource; - private final MANAGEDOBJECT _managedObject; - - private MyLifecycleEventListener(final MANAGEDOBJECT managedObject, - final RESOURCE resource) - { - _resource = resource; - _managedObject = managedObject; - } - - public EventResult acceptEvent(final ResourceLifecycleEvent event) - { - final EventResult result = EventResult.getDefaultEventResult(); - - // not interested - if (!_resource.equals(event.getAffectedResource())) - { - return EventResult.getDefaultEventResult(); - } - - if (event.getEventType() == EventType.RESOURCE_INACCESSIBLE) - { - try - { - if (event.getReasonType() == ReasonType.RESOURCE_DELETED - || event.getReasonType() == ReasonType.RESOURCE_PROJECT_DELETED) - { - _managedObject.destroy(); - } - else - { - _managedObject.dispose(); - } - } - // dispose is external code out our control, so make sure - // unmanage gets called if it blows up. - finally - { - unmanageResource(_resource); - } - } - return result; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java deleted file mode 100644 index 94cf53d92..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.strategy; - -import org.eclipse.jst.jsf.common.internal.policy.IIdentifiable; - - -/** - * A simple strategy that is identifiable - * - * @author cbateman - * - * @param <INPUT> - * @param <OUTPUT> - * @param <IDTYPE> - */ -public interface IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE> - extends ISimpleStrategy<INPUT, OUTPUT>, IIdentifiable<IDTYPE> -{ - // nothing added. -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java deleted file mode 100644 index 787a31090..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.strategy; - -/** - * A strategy that takes an INPUT, performs a calculation on it, and returns - * an OUTPUT - * @author cbateman - * - * @param <INPUT> - * @param <OUTPUT> - */ -public interface ISimpleStrategy<INPUT, OUTPUT> -{ - /** - * Perform the algorithm on input and return OUTPUT. This type of - * operation should avoid side-effects, but may throw exceptions. - * - * @param input - * @return the result of the strategy algorithm - * @throws Exception implementers should narrow what exceptions are thrown. - */ - public OUTPUT perform(INPUT input) throws Exception; - - /** - * @return the single value that perform will return if it cannot calculate - * a meaningful result for an input. The value must be unique, the same - * for all inputs and must be testable using the '==' operator. - */ - public OUTPUT getNoResult(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java deleted file mode 100644 index b64a75c84..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.strategy; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.jst.jsf.common.internal.policy.IIteratorPolicy; - -/** - * A strategy composite that uses an iterator policy to provide the iterator - * used to decide what order to execute the strategy in. - * - * This composite represents a grouping of strategies which represent N ways - * to perform a particular calculation and which any number for those N ways - * may be applicable to any particular situation given the policy in place. - * - * @author cbateman - * - * @param <INPUT> - * @param <OUTPUT> - * @param <IDTYPE> - * @param <STRATEGYTYPE> - */ -public abstract class IteratorPolicyBasedStrategyComposite<INPUT, OUTPUT, IDTYPE, STRATEGYTYPE extends IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>> - extends StrategyComposite<INPUT, OUTPUT, IDTYPE, STRATEGYTYPE> -{ - private final Map<IDTYPE, STRATEGYTYPE> _strategies; - private IIteratorPolicy<IDTYPE> _policy; - - /** - * @param policy - */ - protected IteratorPolicyBasedStrategyComposite(final IIteratorPolicy<IDTYPE> policy) - { - _policy = policy; - _strategies = new HashMap<IDTYPE, STRATEGYTYPE>(); - } - - /** - * Add strategy if not already present. - * - * @param strategy - */ - public final void addStrategy(final STRATEGYTYPE strategy) - { - _strategies.put(strategy.getId(), strategy); - } - - /** - * @param strategy - */ - public final void removeStrategy(final STRATEGYTYPE strategy) - { - _strategies.remove(strategy.getId()); - } - - /** - * Change the active policy used to select the order in which the composite - * calls it's child strategies. - * - * If the policy is not set, then strategies are called in - * - * @param policy - */ - public final void setPolicy(final IIteratorPolicy<IDTYPE> policy) - { - _policy = policy; - } - - @Override - public final Iterator<STRATEGYTYPE> getIterator() - { - final Iterator<IDTYPE> idType = _policy.getIterator(_strategies - .keySet()); - return new StrategyIterator<IDTYPE, STRATEGYTYPE>(_strategies, idType); - } - - @Override - public abstract OUTPUT getNoResult(); - - private static class StrategyIterator<IDTYPE, STRATEGYTYPE> implements - Iterator<STRATEGYTYPE> - { - private final Map<IDTYPE, STRATEGYTYPE> _map; - private final Iterator<IDTYPE> _policyIterator; - - private StrategyIterator(final Map<IDTYPE, STRATEGYTYPE> map, - final Iterator<IDTYPE> policyIterator) - { - _map = map; - _policyIterator = policyIterator; - } - - public boolean hasNext() - { - return _policyIterator.hasNext(); - } - - public STRATEGYTYPE next() - { - IDTYPE id = _policyIterator.next(); - return _map.get(id); - } - - public void remove() - { - throw new UnsupportedOperationException(); - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java deleted file mode 100644 index c51dbbe9c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.strategy; - -import java.util.Iterator; - -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * A composite strategy whos role is to iterate through a number of child - * stategies until one returns a valid value for an input. - * - * @author cbateman - * - * @param <INPUT> - * @param <OUTPUT> - * @param <IDTYPE> - * @param <STRATEGYTYPE> - */ -public abstract class StrategyComposite<INPUT, OUTPUT, IDTYPE, STRATEGYTYPE extends IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>> - implements ISimpleStrategy<INPUT, OUTPUT> -{ - public final OUTPUT perform(final INPUT input) - { - final Iterator<STRATEGYTYPE> sIt = getIterator(); - - OUTPUT result = getNoResult(); - boolean resultFound = false; - - EXECUTE_LOOP: while (sIt.hasNext()) - { - final STRATEGYTYPE strategy = sIt.next(); - try - { - result = strategy.perform(input); - - if (result != strategy.getNoResult()) - { - resultFound = true; - break EXECUTE_LOOP; - } - } - catch (Exception e) - { - JSFCommonPlugin.log(e); - } - } - - if (resultFound) - { - return result; - } - return getNoResult(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.jsf.common.internal.strategy.ISimpleStrategy#getNoResult() - */ - public abstract OUTPUT getNoResult(); - - /** - * @return an iterator that will return the next strategy to be executed - */ - public abstract Iterator<STRATEGYTYPE> getIterator(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java deleted file mode 100644 index 6055e5f50..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.Signature; - -/** - * Represents a BooleanLiteral as defined by JSP.2.9 - * - * @author cbateman - * - */ -public class BooleanLiteralType extends LiteralType -{ - /** - * The literal FALSE singleton - */ - public final static BooleanLiteralType FALSE = new BooleanLiteralType(false); - /** - * The literal TRUE singleton - */ - public final static BooleanLiteralType TRUE = new BooleanLiteralType(true); - - private final boolean _literalValue; - - - /** - * @param value - * @return a constant boolean literal type corresponding to value - */ - public static BooleanLiteralType valueOf(boolean value) - { - return value ? TRUE : FALSE; - } - - /** - * @param literalValue - */ - /*package*/BooleanLiteralType(boolean literalValue) - { - super(Signature.SIG_BOOLEAN); - _literalValue = literalValue; - } - - public Number coerceToNumber(Class T) throws TypeCoercionException - { - // illegal to coerce boolean to number per JSP.2.8.3 step 3 - throw new TypeCoercionException("Cannot coerce boolean to number"); //$NON-NLS-1$ - } - - public String getLiteralValue() - { - return Boolean.toString(_literalValue); - } - - public Object getLiteralValueRaw() - { - return Boolean.valueOf(_literalValue); - } - - public Boolean coerceToBoolean() throws TypeCoercionException - { - return Boolean.valueOf(_literalValue); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java deleted file mode 100644 index 9069f056d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java +++ /dev/null @@ -1,172 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.Signature; - - -/** - * Encapsulates the runtime type or types of a JSF entity in a - * way that can be compared to other entities - * - * @author cbateman - * - */ -public class CompositeType -{ - private final String[] _signatures; - private final int _assignmentType; - - private boolean[] _isTypeSignature; // = null lazily derived from signatures - // on first access - /** - * @param signatureStrings - * @param assignmentType - */ - public CompositeType(String[] signatureStrings, int assignmentType) - { - if (signatureStrings == null - || signatureStrings.length < 1) - { - throw new AssertionError("Must specify at least one signature string"); //$NON-NLS-1$ - } - - _signatures = new String[signatureStrings.length]; - System.arraycopy(signatureStrings, 0, _signatures, 0, _signatures.length); - _assignmentType = assignmentType; - } - - /** - * Convenience constructor for most common case where composite only - * consistes of a single type signature - * - * @param signatureString - * @param assignmentType - */ - public CompositeType(String signatureString, int assignmentType) - { - this(new String[]{signatureString}, assignmentType); - } - /** - * @return the assignment type mask - */ - public int getAssignmentTypeMask() - { - return _assignmentType; - } - - /** - * @return true if the composite type supports being on the LHS of an - * assignment - */ - public boolean isLHS() - { - return TypeUtil.matchesLHS(_assignmentType); - } - - /** - * @return true if the composite type supports being on the RHS of an - * assignment - */ - public boolean isRHS() - { - return TypeUtil.matchesRHS(_assignmentType); - } - - /** - * @return an array of booleans. The value in each index of the array - * is true if the corresponding position _signatures corresponds to a type - * signature and false if it's a method signature - */ - public boolean[] getIsTypeSignature() - { - return getTypeSignatureFlags(); - } - - /** - * @return the type signatures. Changes to the returned form do not - * affect the internal values - */ - public String[] getSignatures() - { - final String[] copy = new String[_signatures.length]; - System.arraycopy(_signatures, 0, copy, 0, _signatures.length); - return copy; - } - - public String toString() - { - final StringBuffer stringBuffer = new StringBuffer(); - - for (int i = 0; i < _signatures.length; i++) - { - stringBuffer.append(_signatures[i]); - stringBuffer.append(" | "); //$NON-NLS-1$ - } - - return stringBuffer.toString(); - } - - /** - * @return a version of to string with of the type signatures replaced - * with their more Javaeseque names - */ - public String toUserReadableString() - { - final StringBuffer stringBuffer = new StringBuffer(); - - for (int i = 0; i < _signatures.length; i++) - { - final String signature = _signatures[i]; - - if (getTypeSignatureFlags()[i]) - { - stringBuffer.append(Signature.getSignatureSimpleName(signature)); - } - - if (i < _signatures.length -1) - { - stringBuffer.append(", "); //$NON-NLS-1$ - } - } - return stringBuffer.toString(); - } - - private boolean[] getTypeSignatureFlags() - { - if (_isTypeSignature == null) - { - _isTypeSignature = new boolean[_signatures.length]; - - for (int i = 0; i < _signatures.length; i++) - { - try - { - Signature.getTypeSignatureKind(_signatures[i]); - - // if an exception wasn't thrown above, then it - // is some sort of type signature - _isTypeSignature[i] = true; - } - catch (IllegalArgumentException ae) - { - // getTypeSignatureKind threw an exception, so - // this signature is a method - _isTypeSignature[i] = false; - } - } - } - - return _isTypeSignature; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java deleted file mode 100644 index 5f2aff492..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - - -/** - * Follows type coercion rules codified in section JSP.2.8 of the - * JSP 2.0 Specification. - * - * This class operates on CompositeType's and returns raw - * Java signatures for the single resulting type coercion. - * - * The rules are stretched a little bit since JSP.2.8 defines how to - * coerce an *instance* A to a type T. But since we have no runtime instances, - * only their types, we approximate by taking what we know about the type of A - * and coercing it T as best we can. - * - * Also, whereas the spec says to throw errors when coercion is not possible, - * we have two cases: - * - * 1) We can determine definitively that there is no coercion - * 2) We cannot determine whether there is or isn't a coercion - * - * In case 1, we always throw an exception. In case 2, we return null to indicate - * "indeterminate" result, rather than error. - * - * @author cbateman - * - */ -public class CompositeTypeCoercer -{ - /** - * This method follows JSP.2.8.3 except that rather than returning a specific - * type that has been coerced to, it determines the most exact possible type - * that typeOfA can be coerced to, to be number compatible. The caller must - * decide what do with the return value compared to the type (N in the spec) - * that they want to coerce to. - * - * @param typeOfA - * @return a new signature for the type of A after being coerced to a Number - * @throws TypeCoercionException if A can definitively not be coerced to - * a number - */ - public static String coerceToNumber(final CompositeType typeOfA) - throws TypeCoercionException - { - String coercedType = null; - boolean errorDetected = true; // assume error: only false if we - // find a member of typeOfA that - // coerces to number - - // JSP.2.8.1 -- auto-box primitives - final CompositeType boxedTypeOfA = - TypeTransformer.transformBoxPrimitives(typeOfA); - final boolean[] typesigs = boxedTypeOfA.getIsTypeSignature(); - - // iterate through all of the signatures that represent types - // and find at least one that can be coerced to a number - for (int i = 0; i < typesigs.length; i++) - { - if (typesigs[i]) - { - try - { - final String testType = - TypeCoercer.coerceToNumber(boxedTypeOfA.getSignatures()[i]); - - if (testType != null) - { - // if we have already found a coercible type, then - // we need to return null, since we have a conflict that - // we don't know how to resolve to a type?????? - if (coercedType != null) - { - return null; - } - - coercedType = testType; - } - errorDetected = false; // we have found a number coercion or indeterminate - } - catch (TypeCoercionException tce) - { - // do nothing: so far error still detected - } - } - } - - // we have three choices: - // 1: if errorDetected was never cleared, we definitely never found - // a coerceable type, so throw exception - if (errorDetected) - { - throw new TypeCoercionException(); - } - - // otherwise the flag was cleared return what we found - if (coercedType != null) - { - // need to unbox per JSP.2.8.1 - coercedType = - TypeTransformer.transformUnboxPrimitives(coercedType); - } - - return coercedType; - } - - -// public static String coerceToBoolean(CompositeType compositeType) -// { -// -// } - -}
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java deleted file mode 100644 index 5631b8700..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.math.BigDecimal; -import java.math.BigInteger; - -import org.eclipse.jdt.core.Signature; - -/** - * Represents an FloatLiteral as defined by JSP.2.9 - * @author cbateman - * - */ -public class FloatLiteralType extends NumericTypeLiteral -{ - private final double _literalValue; - - /** - * @param literalValue - */ - public FloatLiteralType(double literalValue) - { - // according to the notes to JSP.2.9, bullet 5, float literals are doubles - super(Signature.SIG_DOUBLE); - _literalValue = literalValue; - } - - protected Number getBoxedValue() - { - return new Double(_literalValue); - } - - public Number coerceToNumber(Class T) throws TypeCoercionException - { - if (T == BigInteger.class) - { - return new BigDecimal(_literalValue).toBigInteger(); - } - else if (T == BigDecimal.class) - { - return new BigDecimal(_literalValue); - } - - Number commonCoercion = super.coerceToNumber(T); - - if (commonCoercion == null) - { - throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$ - } - - return commonCoercion; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java deleted file mode 100644 index 8b74dfd85..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -/** - * Defines the lhs/rhs rules for a type - * @author cbateman - * - */ -public interface IAssignable -{ - /** - * Type is none: it cannot be assigned to. method binding. - */ - public static int ASSIGNMENT_TYPE_NONE = 0x0; - /** - * Type is lhs: it can be assigned to - */ - public static int ASSIGNMENT_TYPE_LHS = 0x1; - - /** - * Type is rhs: it can be assigned from - */ - public static int ASSIGNMENT_TYPE_RHS = 0x2; - - /** - * @return the assigment mask - */ - public int getAssignability(); - - /** - * @return true if ASSIGNMENT_TYPE_LHS is set in getAssignability - */ - public boolean isLHS(); - /** - * @return true if ASSIGNMENT_TYPE_RHS is set in getAssignability - */ - public boolean isRHS(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java deleted file mode 100644 index d7a3be803..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.math.BigDecimal; -import java.math.BigInteger; - -import org.eclipse.jdt.core.Signature; - -/** - * Represents a IntegerLiteral as defined by JSP.2.9 - * @author cbateman - * - */ -public class IntegerLiteralType extends NumericTypeLiteral -{ - /** - * A singleton for zero literals - */ - public final static IntegerLiteralType ZERO = new IntegerLiteralType(0); - - private final long _literalValue; - - /** - * @param literalValue - */ - public IntegerLiteralType(long literalValue) - { - // according to the notes to JSP.2.9, bullet 4, integer literals are longs - super(Signature.SIG_LONG); - _literalValue = literalValue; - } - - protected Number getBoxedValue() - { - return Long.valueOf(_literalValue); - } - - /** - * Per JSP.2.8.3, step 5 - * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToNumber(java.lang.Class) - */ - public Number coerceToNumber(Class T) throws TypeCoercionException - { - if (T == BigInteger.class) - { - return BigInteger.valueOf(_literalValue); - } - else if (T == BigDecimal.class) - { - return BigDecimal.valueOf(_literalValue); - } - - Number commonCoercion = super.coerceToNumber(T); - - if (commonCoercion == null) - { - throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$ - } - - return commonCoercion; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java deleted file mode 100644 index 3ea6de53c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - - -/** - * Encodes a type signature and a string that has some literal value based on - * the type signature. The class represents only a value object -- no attempt - * is made to assert that the literalValue is really of the type specified. - * - * @author cbateman - * - */ -public abstract class LiteralType extends ValueType -{ - - /** - * Consider a new literal type - * - * @param signature - */ - protected LiteralType(final String signature) - { - super(signature, IAssignable.ASSIGNMENT_TYPE_RHS); - } - - /** - * @return the literal value string (unparsed) - */ - public abstract String getLiteralValue(); - - /** - * @return the actual untranslated literal value as an object - */ - public abstract Object getLiteralValueRaw(); - - /** - * @return the type signature - */ - public final String getSignature() { - return super.getSignature(); - } - - /** - * @return a type signature for the kind of number this literal will coerce - * into when asked to become a number or null if this cannot be determined - * @throws TypeCoercionException if this literal has no legal coercion into - * a number - */ - public String getNumberCoercion() throws TypeCoercionException - { - // always box before coercion - return - TypeCoercer.coerceToNumber( - TypeTransformer.transformBoxPrimitives(getSignature())); - } - - /** - * @param T - * @return a Number coercion of the literal's value, null if indeterminate - * @throws TypeCoercionException if the coercion is illegal - */ - public abstract Number coerceToNumber(Class T) throws TypeCoercionException; - - /** - * @return a Boolean coercion of the literal's value, null if indeterminate - * @throws TypeCoercionException if the coercion is illegal - */ - public abstract Boolean coerceToBoolean() throws TypeCoercionException; -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java deleted file mode 100644 index b3db7a5e6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.internal.types; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * Message bundle - * - */ -public class Messages { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.internal.types.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - // no external construction - } - - /** - * @param key - * @return the string for key or !key! if not found - */ - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java deleted file mode 100644 index 38e47b0c6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -/** - * Signature type for method bindings in an EL expression - * - * @author cbateman - * - */ -public class MethodType implements SignatureBasedType -{ - private final String _methodName; - private final String _signature; - - /** - * @param methodName - * @param signature - */ - public MethodType(final String methodName, final String signature) - { - _methodName = methodName; - _signature = signature; - } - - /** - * @see org.eclipse.jst.jsf.common.internal.types.SignatureBasedType#getSignature() - */ - public String getSignature() - { - return _signature; - } - - /** - * @return the method name signature - */ - public String getMethodName() - { - return _methodName; - } - - public CompositeType toCompositeType() - { - return new CompositeType(_signature, IAssignable.ASSIGNMENT_TYPE_NONE); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java deleted file mode 100644 index eeb43e69d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java +++ /dev/null @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.math.BigDecimal; -import java.math.BigInteger; - -/** - * Represents a NullLiteralType per JSP.2.9 - * - * @author cbateman - * - */ -public class NullLiteralType extends LiteralType -{ - /** - * The singleton null literal - */ - public final static NullLiteralType SINGLETON = new NullLiteralType(); - - /** - * Construct a new null - */ - private NullLiteralType() - { - super(TypeConstants.TYPE_NULL); // use void to indicate null in this situation - } - - /** - * Per JSP.2.8.5 null is always false - * - * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToBoolean() - */ - public Boolean coerceToBoolean() throws TypeCoercionException - { - return Boolean.FALSE; - } - - /** - * Per JSP.2.8.3, null is always 0 - * - * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToNumber(java.lang.Class) - */ - public Number coerceToNumber(Class T) throws TypeCoercionException { - if (T == BigInteger.class) - { - return BigInteger.ZERO; - } - else if (T == BigDecimal.class) - { - return new BigDecimal(0.0); - } - else if (T == Double.class || T == Double.TYPE) - { - return new Double(0.0); - } - else if (T == Float.class || T == Float.TYPE) - { - return new Float(0.0); - } - else if (T == Long.class || T == Long.TYPE) - { - return Long.valueOf(0L); - } - else if (T == Integer.class || T == Integer.TYPE) - { - return Integer.valueOf(0); - } - else if (T == Short.class || T == Short.TYPE) - { - return Short.valueOf((short)0); - } - else if (T == Byte.class || T == Byte.TYPE) - { - return Byte.valueOf((byte)0); - } - else - { - throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$ - } - } - - /** - * Per JSP.2.8.2 null is always an empty string - * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#getLiteralValue() - */ - public String getLiteralValue() - { - return ""; //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#getLiteralValueRaw() - */ - public Object getLiteralValueRaw() - { - return null; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java deleted file mode 100644 index 8b6acbe05..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - - -/** - * Common super-type for Float and Integer literals - * @author cbateman - * - */ -public abstract class NumericTypeLiteral extends LiteralType -{ - /** - * @param signature - */ - protected NumericTypeLiteral(String signature) - { - super(signature); - } - - /** - * @return the boxed form of the numeric literal value - */ - protected abstract Number getBoxedValue(); - - public Number coerceToNumber(Class T) throws TypeCoercionException - { - Number boxedLiteralValue = getBoxedValue(); - - if (T == Double.class || T == Double.TYPE) - { - return new Double(boxedLiteralValue.doubleValue()); - } - else if (T == Float.class || T == Float.TYPE) - { - return new Float(boxedLiteralValue.floatValue()); - } - else if (T == Long.class || T == Long.TYPE) - { - return boxedLiteralValue; - } - else if (T == Integer.class || T == Integer.TYPE) - { - return Integer.valueOf(boxedLiteralValue.intValue()); - } - else if (T == Short.class || T == Short.TYPE) - { - return Short.valueOf(boxedLiteralValue.shortValue()); - } - else if (T == Byte.class || T == Byte.TYPE) - { - return Byte.valueOf(boxedLiteralValue.byteValue()); - } - else - { - return null; - } - } - - public String getLiteralValue() - { - return getBoxedValue().toString(); - } - - public Object getLiteralValueRaw() - { - return getBoxedValue(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToBoolean() - */ - public Boolean coerceToBoolean() throws TypeCoercionException { - // JSP.2.8.5 does not provide for number -> boolean coercion - throw new TypeCoercionException("Cannot coerce number to boolean"); //$NON-NLS-1$ - } - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java deleted file mode 100644 index 41e2bb482..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -/** - * Defines a signature-based type. Signatures must conform to the JVM - * type signature format as defined in the JVM specs and in the JDT Signature - * class - * - * @author cbateman - * - */ -public interface SignatureBasedType -{ - /** - * @return the signature string - */ - public String getSignature(); - - /** - * @return a version of the this type in CompositeType form - */ - public CompositeType toCompositeType(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java deleted file mode 100644 index 2e887fde9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.math.BigDecimal; -import java.math.BigInteger; - -/** - * Represents a StringLiteral as defined by JSP.2.9 - * - * @author cbateman - */ -public class StringLiteralType extends LiteralType -{ - private final String _literalValue; - - /** - * @param value - */ - public StringLiteralType(String value) - { - super(TypeConstants.TYPE_STRING); - _literalValue = value; - } - - public Number coerceToNumber(Class T) throws TypeCoercionException - { - try - { - if (T == BigInteger.class) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return BigInteger.ZERO; - } - return new BigInteger(_literalValue); - } - else if (T == BigDecimal.class) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return new BigDecimal(0.0); - } - return new BigDecimal(_literalValue); - } - else if (T == Double.class || T == Double.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return new Double(0.0); - } - - return Double.valueOf(_literalValue); - } - else if (T == Float.class || T == Float.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return new Float(0.0); - } - return Float.valueOf(_literalValue); - } - else if (T == Long.class || T == Long.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return Long.valueOf(0L); - } - return Long.valueOf(_literalValue); - } - else if (T == Integer.class || T == Integer.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return Integer.valueOf(0); - } - return Integer.valueOf(_literalValue); - } - else if (T == Short.class || T == Short.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return Short.valueOf((short)0); - } - return Short.valueOf(_literalValue); - } - else if (T == Byte.class || T == Byte.TYPE) - { - if ("".equals(_literalValue)) //$NON-NLS-1$ - { - return Byte.valueOf((byte)0); - } - return Byte.valueOf(_literalValue); - } - else - { - throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$ - } - } - catch (NumberFormatException nfe) - { - throw new TypeCoercionException(nfe); - } - } - - public String getLiteralValue() - { - return _literalValue; - } - - public Object getLiteralValueRaw() - { - return _literalValue; - } - - public Boolean coerceToBoolean() throws TypeCoercionException - { - // JSP.2.8.5 - return Boolean.valueOf(_literalValue); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java deleted file mode 100644 index fa75a12f9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.Signature; - -/** - * Coercer for simple type signatures - * - * @author cbateman - * - */ -public class TypeCoercer -{ - - /** - * Based on JSP.2.8.3 in JSP 2.0 specification - * - * @param boxedTypeSignature -- an auto-boxed type signature - * @return the coerced type or null if cannot be resolved. No unboxing - * is performed on the return. - * @throws TypeCoercionException if boxedTypeSignature is - */ - public static String coerceToNumber(final String boxedTypeSignature) - throws TypeCoercionException - { - String boxedTypeSignature_ = boxedTypeSignature; - - // can't coerce arrays to numbers - if (Signature.getTypeSignatureKind(boxedTypeSignature_) - == Signature.ARRAY_TYPE_SIGNATURE) - { - throw new TypeCoercionException("Cannot coerce arrays to numbers"); //$NON-NLS-1$ - } - // if it's character, pre-coerce to short per step 2 - if (TypeConstants.SIGNATURE_BOXED_CHARACTER.equals(boxedTypeSignature)) - { - boxedTypeSignature_ = TypeConstants.TYPE_BOXED_SHORT; - } - - if (TypeCoercer.typeIsNumeric(boxedTypeSignature_) - || TypeCoercer.typeIsNull(boxedTypeSignature_)) - { - return boxedTypeSignature_; - } - else if (typeIsString(boxedTypeSignature_)) - { - // undetermined a string may or not resolve to a number - // depending on its runtime value - return null; - } - else - { - throw new TypeCoercionException(); - } - } - - /** - * @param boxedTypeSignature - * @return true if type can be coerced to boolean; null if indeterminate - */ - public static boolean canCoerceToBoolean(String boxedTypeSignature) - { - // JSP.2.8.5 -- boolean is always boolean; string is converted by Boolean.valueOf(String) - if (typeIsBoolean(boxedTypeSignature) - || typeIsString(boxedTypeSignature) - || typeIsNull(boxedTypeSignature)) - { - return true; - } - // nothing else really convertible besides null - return false; - } - - /** - * @param typeSignature -- boxed type signature - * @return true if the typeSignature is numeric - */ - public static boolean typeIsNumeric(final String typeSignature) - { - return (TypeConstants.TYPE_BOXED_BYTE.equals(typeSignature) || - TypeConstants.TYPE_BOXED_SHORT.equals(typeSignature) || - TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature) || - TypeConstants.TYPE_BOXED_LONG.equals(typeSignature) || - TypeConstants.TYPE_BOXED_FLOAT.equals(typeSignature) || - TypeConstants.TYPE_BOXED_DOUBLE.equals(typeSignature) || - TypeConstants.TYPE_BIG_INTEGER.equals(typeSignature) || - TypeConstants.TYPE_BIG_DOUBLE.equals(typeSignature)); - } - - /** - * @param typeSignature - * @return true if the typeSignature represents a String - */ - public static boolean typeIsString(final String typeSignature) - { - return (TypeConstants.TYPE_STRING.equals(typeSignature)); - } - - /** - * @param typeSignature -- boxed type signature - * @return true if the typeSignature represents a boxed boolean - */ - public static boolean typeIsBoolean(final String typeSignature) - { - return (TypeConstants.TYPE_BOXED_BOOLEAN.equals(typeSignature)); - } - - /** - * @param typeSignature - * @return true if type is the EL null type - */ - public static boolean typeIsNull(final String typeSignature) - { - return (TypeConstants.TYPE_NULL.equals(typeSignature)); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java deleted file mode 100644 index aa18bbd12..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -/** - * @author cbateman - * - */ -public class TypeCoercionException extends Exception -{ - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * @see java.lang.Exception - */ - public TypeCoercionException() { - super(); - } - - /** - * @param message - * @param cause - * @see java.lang.Exception - */ - public TypeCoercionException(String message, Throwable cause) { - super(message, cause); - } - - /** - * @param message - * @see java.lang.Exception - */ - public TypeCoercionException(String message) { - super(message); - } - - /** - * @param cause - * @see java.lang.Exception - */ - public TypeCoercionException(Throwable cause) { - super(cause); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java deleted file mode 100644 index a57a94bed..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java +++ /dev/null @@ -1,292 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jdt.core.Signature; - -/** - * Static utility class used to compare two CompositeTypes for compatability - * - * @author cbateman - * - */ -public final class TypeComparator { - private static class SignatureTestResult { - /** - * the diagnostic - */ - private final Diagnostic diagnostic; - /** - * Measure of the probability that the tested signatures were meant to - * match. Larger value means higher probability. - */ - private final int matchQuality; - - /** - * @param diagnostic - * @param matchQuality - - * Measure of the probability that the tested signatures were - * meant to match. Larger value means higher probability. - */ - public SignatureTestResult(final Diagnostic diagnostic, - final int matchQuality) { - super(); - this.diagnostic = diagnostic; - this.matchQuality = matchQuality; - } - } - - private final TypeComparatorDiagnosticFactory _factory; - - /** - * Default Constructor - * @param factory - */ - public TypeComparator(final TypeComparatorDiagnosticFactory factory) - { - _factory = factory; - } - - /** - * @param firstType - * @param secondType - * @return true if firstType is assignable to secondType or vice-versa, - * depending on their assignment and runtime types - */ - public Diagnostic calculateTypeCompatibility( - final CompositeType firstType, final CompositeType secondType) { - // first, box all primitives - final CompositeType boxedFirstType = TypeTransformer - .transformBoxPrimitives(firstType); - final CompositeType boxedSecondType = TypeTransformer - .transformBoxPrimitives(secondType); - - final String[] mustBeSatisfied = boxedFirstType.getSignatures(); - final String[] testSignatures = boxedSecondType.getSignatures(); - List<String> mustbeMethods = Collections.emptyList(); - List<String> mustbeTypes = Collections.emptyList(); - for (final String mustbeSignature : mustBeSatisfied) { - if (TypeUtil.isMethodSignature(mustbeSignature)) { - if (mustbeMethods.isEmpty()) { - mustbeMethods = new ArrayList<String>(mustbeSignature - .length()); - } - mustbeMethods.add(mustbeSignature); - } else { - if (mustbeTypes.isEmpty()) { - mustbeTypes = new ArrayList<String>(mustbeSignature - .length()); - } - mustbeTypes.add(mustbeSignature); - } - } - final boolean mustbeWriteable = firstType.isLHS(); - SignatureTestResult bestResult = null; - for (final String isSignature : testSignatures) { - SignatureTestResult testResult; - if (TypeUtil.isMethodSignature(isSignature)) { - testResult = checkMethodSignature(isSignature, mustbeTypes, - mustbeMethods); - if (testResult.diagnostic.getSeverity() == Diagnostic.OK) { - return testResult.diagnostic; - } - } else { - testResult = checkTypeSignature(isSignature, mustbeTypes, - mustbeMethods, mustbeWriteable); - if (testResult.diagnostic.getSeverity() == Diagnostic.OK) { - return checkAssignability(firstType, secondType); - } - } - if (bestResult == null - || bestResult.matchQuality < testResult.matchQuality) { - bestResult = testResult; - } - } - // TODO: bestResult empty? (should not happen, but who knows... - return bestResult.diagnostic; - } - - private SignatureTestResult checkTypeSignature( - final String isSignature, final List<String> mustbeTypes, - final List<String> mustbeMethods, final boolean mustbeWriteable) { - if (mustbeTypes.isEmpty()) { - final Diagnostic diag = _factory.create_METHOD_EXPRESSION_EXPECTED(); - return new SignatureTestResult(diag, 0); - } - for (final String mustbeSignature : mustbeTypes) { - if (mustbeSignature.equals(isSignature) - || canCoerce(isSignature, mustbeSignature, mustbeWriteable)) { - final Diagnostic diag = Diagnostic.OK_INSTANCE; - return new SignatureTestResult(diag, 5); - } - } - final String[] params = new String[2]; - params[0] = readableSignatures(mustbeTypes); - params[1] = Signature.toString(isSignature); - final Diagnostic diag = _factory.create_INCOMPATIBLE_TYPES(params); - return new SignatureTestResult(diag, 1); - } - - private SignatureTestResult checkMethodSignature( - final String isSignature, final List<String> mustbeTypes, - final List<String> mustbeMethods) { - if (mustbeMethods.isEmpty()) { - final Diagnostic diag = _factory.create_VALUE_EXPRESSION_EXPECTED(); - return new SignatureTestResult(diag, 0); - } - for (final String mustbeSignature : mustbeMethods) { - if (methodSignaturesMatch(mustbeSignature, isSignature)) { - final Diagnostic diag = Diagnostic.OK_INSTANCE; - return new SignatureTestResult(diag, 5); - } - } - final String[] params = new String[2]; - params[0] = readableSignatures(mustbeMethods); - params[1] = Signature - .toString(isSignature, "method", null, false, true); //$NON-NLS-1$ - final Diagnostic diag = _factory.create_INCOMPATIBLE_METHOD_TYPES(params); - return new SignatureTestResult(diag, 1); - } - - private static String readableSignatures(final List<String> signatures) { - StringBuilder res = null; - for (final String sig : signatures) { - String sigText; - if (TypeUtil.isMethodSignature(sig)) { - sigText = Signature.toString(sig, "method", null, false, true); //$NON-NLS-1$ - } else { - sigText = Signature.toString(sig); - } - if (res == null) { - res = new StringBuilder(sigText); - } else { - res.append(", ").append(sigText); //$NON-NLS-1$ - } - } - return res != null ? res.toString() : "[no signature]"; //$NON-NLS-1$ - } - - private static boolean canCoerce(final String testType, - final String checkType, final boolean checkTypeIsWritable) { - boolean canCoerce = canCoerce(testType, checkType); - - // if the check type is writable, we need to be sure that the - // coercion can work in both directions - if (canCoerce && checkTypeIsWritable) { - // reverse roles: can checkType assign back to test type? - canCoerce &= canCoerce(checkType, testType); - } - - return canCoerce; - } - - private static boolean canCoerce(final String testType, - final String checkType) { - // can always to coerce to string or object - if (TypeCoercer.typeIsString(checkType)/* - || TypeConstants.TYPE_JAVAOBJECT.equals(checkType)*/) - { - return true; - } else if (TypeCoercer.typeIsNumeric(checkType)) { - return canCoerceNumeric(testType); - } else if (TypeCoercer.typeIsBoolean(checkType)) { - return TypeCoercer.canCoerceToBoolean(testType); - } - - // otherwise, no type coercion available - return false; - } - - private static boolean canCoerceNumeric(final String testType) { - try { - TypeCoercer.coerceToNumber(testType); - // TODO: there is a case when coerceToNumber returns - // null meaning "not sure", that we may want to handle - // differently, with a warning - return true; - } catch (final TypeCoercionException tce) { - // outright failure -- can't coerce - return false; - } - } - - private static boolean methodSignaturesMatch(final String firstMethodSig, - final String secondMethodSig) { - // TODO: need to account for primitive type coercions - if (firstMethodSig.equals(secondMethodSig)) { - return true; - } - final String[] firstMethodParams = Signature - .getParameterTypes(firstMethodSig); - final String[] secondMethodParams = Signature - .getParameterTypes(secondMethodSig); - - // fail fast if param count doesn't match - if (firstMethodParams.length != secondMethodParams.length) { - return false; - } - - // now check each parameter - for (int i = 0; i < firstMethodParams.length; i++) { - // need to box primitives before comparing - final String firstMethodParam = TypeTransformer - .transformBoxPrimitives(firstMethodParams[i]); - final String secondMethodParam = TypeTransformer - .transformBoxPrimitives(secondMethodParams[i]); - - if (!firstMethodParam.equals(secondMethodParam)) { - return false; - } - } - - // if we get to here then we need only check the return type - final String firstReturn = TypeTransformer - .transformBoxPrimitives(Signature.getReturnType(firstMethodSig)); - final String secondReturn = TypeTransformer - .transformBoxPrimitives(Signature - .getReturnType(secondMethodSig)); - - if (!firstReturn.equals(secondReturn)) { - return false; - } - - // if we get to here, then everything checks out - return true; - } - - /** - * Precond: both firstType and secondType must represent value bindings. - * - * @param firstType - * @param secondType - * @return a diagnostic validating that the two composite have compatible - * assignability - */ - private Diagnostic checkAssignability(final CompositeType firstType, - final CompositeType secondType) { - if (firstType.isRHS() && !secondType.isRHS()) { - return _factory.create_PROPERTY_NOT_READABLE(); - } - - if (firstType.isLHS() && !secondType.isLHS()) { - return _factory.create_PROPERTY_NOT_WRITABLE(); - } - - return Diagnostic.OK_INSTANCE; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java deleted file mode 100644 index 8dfffa0ab..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java +++ /dev/null @@ -1,147 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.emf.common.util.BasicDiagnostic; -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.osgi.util.NLS; - -/** - * Diagnostic Factory for type comparator diagnostics. - * - * @author cbateman - * - */ -public final class TypeComparatorDiagnosticFactory -{ - /** - * The id used in the source field of all Diagnostic's created by this - * factory to uniquely identify TypeComparator validation as their source - * type. - */ - public final static String SOURCE_IDENTIFIER = "org.eclipse.jst.jsf.common.types.TypeComparator"; //$NON-NLS-1$ - - /** - * A method expression was expected, but something else (i.e. a value - * expression) was provided. - */ - public final static int METHOD_EXPRESSION_EXPECTED_ID = 0; - - /** - * Value expression type was incompatible with the expected type. - */ - public static final int INCOMPATIBLE_TYPES_ID = 1; - - /** - * A value expression was expected, but something else (i.e. a method - * expression) was provided. - */ - public static final int VALUE_EXPRESSION_EXPECTED_ID = 2; - - /** - * Method expression signature did not match what was expected. - */ - public static final int INCOMPATIBLE_METHOD_TYPES_ID = 3; - - /** - * A property was expected to be readable but no getter was found. - */ - public static final int PROPERTY_NOT_READABLE_ID = 4; - - /** - * A property was expected to be writable but no setter was found - */ - public static final int PROPERTY_NOT_WRITABLE_ID = 5; - - /** - * the number of diagnostic ids - */ - public static final int NUM_IDS = 6; - - private final TypeComparatorPreferences _prefs; - - /** - * @param prefs - */ - public TypeComparatorDiagnosticFactory(final TypeComparatorPreferences prefs) - { - _prefs = prefs; - } - // A method expression was supplied as expected, but its signature did - // * not match the expected. - /** - * @return a diagnostic - */ - public Diagnostic create_METHOD_EXPRESSION_EXPECTED() - { - return create(METHOD_EXPRESSION_EXPECTED_ID, Messages - .getString("TypeComparator.Expression.No_Method")); //$NON-NLS-1$ - } - - /** - * @param params - * @return a diagnostic - */ - public Diagnostic create_INCOMPATIBLE_TYPES(final Object[] params) - { - return create( - INCOMPATIBLE_TYPES_ID, - NLS - .bind( - Messages - .getString("TypeComparator.Expression.Incompatible_Value"), params)); //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * @return a diagnostic - */ - public Diagnostic create_VALUE_EXPRESSION_EXPECTED() - { - return create(VALUE_EXPRESSION_EXPECTED_ID, Messages - .getString("TypeComparator.Expression.No_Value")); - } - - /** - * @param params - * @return a diagnostic - */ - public Diagnostic create_INCOMPATIBLE_METHOD_TYPES(final Object[] params) - { - return create(INCOMPATIBLE_METHOD_TYPES_ID, NLS.bind(Messages - .getString("TypeComparator.Expression.Incompatible_Method"), - params)); - } - - /** - * @return a diagnostic - */ - public Diagnostic create_PROPERTY_NOT_READABLE() - { - return create(PROPERTY_NOT_READABLE_ID, Messages - .getString("TypeComparator.Expression.Not.Gettable")); //$NON-NLS-1$ - } - - /** - * @return a diagnostic - */ - public Diagnostic create_PROPERTY_NOT_WRITABLE() - { - return create(PROPERTY_NOT_WRITABLE_ID, Messages - .getString("TypeComparator.Expression.Expected.Settable")); //$NON-NLS-1$ - } - - private BasicDiagnostic create(int diagnosticId, String message) - { - final int severity = _prefs.getDefaultSeverity(diagnosticId); - return new BasicDiagnostic(severity, SOURCE_IDENTIFIER, diagnosticId, message, - null); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java deleted file mode 100644 index 412b22aea..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.emf.common.util.Diagnostic; - -/** - * Preference info for type comparator diagnostics - * - * @author cbateman - * - */ -public class TypeComparatorPreferences -{ - - /** - * @param diagnosticId - * @return the default severity of a diagnostic - */ - public int getDefaultSeverity(final int diagnosticId) - { - switch (diagnosticId) - { - case TypeComparatorDiagnosticFactory.METHOD_EXPRESSION_EXPECTED_ID: - return Diagnostic.ERROR; - case TypeComparatorDiagnosticFactory.INCOMPATIBLE_TYPES_ID: - return Diagnostic.WARNING; - case TypeComparatorDiagnosticFactory.VALUE_EXPRESSION_EXPECTED_ID: - return Diagnostic.ERROR; - case TypeComparatorDiagnosticFactory.INCOMPATIBLE_METHOD_TYPES_ID: - return Diagnostic.ERROR; - case TypeComparatorDiagnosticFactory.PROPERTY_NOT_READABLE_ID: - return Diagnostic.WARNING; - case TypeComparatorDiagnosticFactory.PROPERTY_NOT_WRITABLE_ID: - return Diagnostic.WARNING; - default: - throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); - - } - } - -} 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 deleted file mode 100644 index e23782531..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -/** - * @author cbateman - * - */ -public class TypeConstants -{ - /** - * we overload "void" to represent null - */ - public final static String TYPE_NULL = "V"; //$NON-NLS-1$ - /** - * unboxed boolean - */ - public final static String TYPE_BOOLEAN = "Z"; //$NON-NLS-1$ - /** - * string type - */ - public final static String TYPE_STRING = "Ljava.lang.String;"; //$NON-NLS-1$ - /** - * big integer - */ - public final static String TYPE_BIG_INTEGER = "Ljava.math.BigInteger;"; //$NON-NLS-1$ - - /** - * big double - */ - public final static String TYPE_BIG_DOUBLE = "Ljava.math.BigDecimal;"; //$NON-NLS-1$ - - /* boxed types */ - /** - * Boxed byte - */ - public final static String TYPE_BOXED_BYTE = "Ljava.lang.Byte;"; //$NON-NLS-1$ - /** - * Boxed short - */ - public final static String TYPE_BOXED_SHORT = "Ljava.lang.Short;"; //$NON-NLS-1$ - /** - * Boxed int - */ - public final static String TYPE_BOXED_INTEGER = "Ljava.lang.Integer;"; //$NON-NLS-1$ - /** - * Boxed long - */ - public final static String TYPE_BOXED_LONG = "Ljava.lang.Long;"; //$NON-NLS-1$ - /** - * Boxed float - */ - public final static String TYPE_BOXED_FLOAT = "Ljava.lang.Float;"; //$NON-NLS-1$ - /** - * Boxed double - */ - public final static String TYPE_BOXED_DOUBLE = "Ljava.lang.Double;"; //$NON-NLS-1$ - /** - * Boxed boolean - */ - public final static String TYPE_BOXED_BOOLEAN = "Ljava.lang.Boolean;"; //$NON-NLS-1$ - /** - * Boxed char - */ - public final static String SIGNATURE_BOXED_CHARACTER = "Ljava.lang.Character"; //$NON-NLS-1$ - /** - * Map type - */ - public final static String TYPE_MAP = "Ljava.util.Map;"; //$NON-NLS-1$ - /** - * Collection type - */ - public final static String TYPE_COLLECTION = "Ljava.util.Collection;"; //$NON-NLS-1$ - /** - * Comparable type - */ - public final static String TYPE_COMPARABLE = "Ljava.lang.Comparable;"; //$NON-NLS-1$ - - /** - * List type - */ - public final static String TYPE_LIST = "Ljava.util.List;"; //$NON-NLS-1$ - - /** - * java.lang.Object type signature - */ - public static final String TYPE_JAVAOBJECT = "Ljava.lang.Object;"; //$NON-NLS-1$ - /** - * 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 Result Set type - */ - public static final String TYPE_RESULT_SET = "Ljava.sql.ResultSet;"; //$NON-NLS-1$ - /** - * 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 of the base type of all enum types - */ - public static final String TYPE_ENUM_BASE = "Ljava.lang.Enum;"; // $NON-NLS-1$ -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java deleted file mode 100644 index d514f4236..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java +++ /dev/null @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.IType; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; - -/**This class contains all info that is cached for a given IType. - * @see org.eclipse.jst.jsf.common.internal.types.TypeInfoCache - * - * @author Matthias - */ -class TypeInfo { - - /**Empty String array. Used for the (usual) case when a type has no missing supertypes. - */ - public static String[] NO_NAMES = new String[0]; - - private IBeanMethodSymbol[] methods = null; - private IBeanPropertySymbol[] properties = null; - private IType[] supertypes = null; - private IType[] interfaceTypes = null; - private String[] missingSupertypeNames = null; - - /**Creates an empty TypeInfo object - */ - public TypeInfo() { - super(); - } - - /**Returns the method symbols. Returns <code>null</code> if none have been cached. - * @return the method symbols. May be null. - */ - public IBeanMethodSymbol[] getMethodSymbols() { - return methods; - } - - /**Returns the property symbols. Returns <code>null</code> if none have been cached. - * @return the property symbols. May be null. - */ - public IBeanPropertySymbol[] getPropertySymbols() { - return properties; - } - - /**Sets the methods symbols to be cached. - * @param methods - the method symbols - */ - public void setMethodSymbols(IBeanMethodSymbol[] methods) { - this.methods = methods; - } - - /**Sets the property symbols to be cached. - * @param properties - the property symbols - */ - public void setPropertySymbols(IBeanPropertySymbol[] properties) { - this.properties = properties; - } - - /**Returns the supertypes. Returns <code>null</code> if none have been cached. - * @return the supertypes. May be null. - */ - public IType[] getSupertypes() { - return supertypes; - } - - /**Sets the supertypes to be cached. - * @param superTypes - the property symbols - */ - public void setSupertypes(IType[] superTypes) { - this.supertypes = superTypes; - } - - /**Returns the interface types. Returns <code>null</code> if none have been cached. - * @return the interface types. May be null. - */ - public IType[] getInterfaceTypes() { - return interfaceTypes; - } - - /**Sets the interface types to be cached. - * @param interfaceTypes - the property symbols - */ - public void setInterfaceTypes(IType[] interfaceTypes) { - this.interfaceTypes = interfaceTypes; - } - - /**Returns the names of the missing supertypes. Returns <code>null</code> if none have been cached. - * @return the names of the missing supertypes. May be null. - */ - public String[] getMissingSupertypeNames() { - return missingSupertypeNames; - } - - /**Sets the supertypes to be cached. - * @param missingSupertypeNames - the names of the missing supertypes - */ - public void setMissingSupertypeNames(String[] missingSupertypeNames) { - this.missingSupertypeNames = missingSupertypeNames; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java deleted file mode 100644 index c58f31ce1..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java +++ /dev/null @@ -1,603 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.internal.types; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.ElementChangedEvent; -import org.eclipse.jdt.core.IClassFile; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IElementChangedListener; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaElementDelta; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeHierarchy; -import org.eclipse.jdt.core.ITypeRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; - -/**Provides a cache for java IType properties. It can cache bean property symbols, method symbols, - * supertypes and implemented interfaces per IType. The cache listens to changes in the java model - * and invalidates affected properties, but does not update them. - * - * @author Matthias - */ -public class TypeInfoCache implements IElementChangedListener { - - private static TypeInfoCache instance = null; - - /**Returns the TypeInfoCache instance. This instance is considered - * protected and must not be disposded with disposeInstance. - * - * @return the TypeInfoCache instance - */ - public static synchronized TypeInfoCache getInstance() { - if (instance == null) { - instance = createNewInstance(); - } - return instance; - } - - /** - * Create a new instance of the type cache. - * - * @return a new instance of the type info cache. - */ - public static TypeInfoCache createNewInstance() - { - final TypeInfoCache newCache = new TypeInfoCache(); - JavaCore.addElementChangedListener(newCache, ElementChangedEvent.POST_CHANGE); - return newCache; - } - - /** - * If cache is not the singleton instance acquired with {@link #getInstance()} - * then the cache will be disposed and should not be used. If cache is - * protected instance, then nothing will happen (the singleton instance - * cannot be disposed). - * - * @param cache - */ - public static void disposeInstance(final TypeInfoCache cache) - { - if (cache != null - && cache != instance) - { - JavaCore.removeElementChangedListener(cache); - - synchronized(cache) - { - if (cache.cachedInfo != null) - { - cache.cachedInfo.clear(); - } - - if (cache.cachedTypesByAffectingTypeRoot != null) - { - cache.cachedTypesByAffectingTypeRoot.clear(); - } - - if (cache.cachedTypesByMissingSupertypename != null) - { - cache.cachedTypesByMissingSupertypename.clear(); - } - } - } - } - - private final Map<IType, TypeInfo> cachedInfo; - private final Map<ITypeRoot, Set<IType>> cachedTypesByAffectingTypeRoot; - private final Map<String, Set<IType>> cachedTypesByMissingSupertypename; - - private TypeInfoCache() { - cachedInfo = new HashMap<IType, TypeInfo>(); - cachedTypesByAffectingTypeRoot = new HashMap(); - cachedTypesByMissingSupertypename = new HashMap(10); - } - - public void elementChanged(ElementChangedEvent event) { - updateChangedJavaElement(event.getDelta()); - } - - /**Returns the cached info({@link TypeInfo}) for a given type. Will - * return <code>null</code> if no info has been cached or the the type/something it depends on - * has changed since then. - * - * @param type - the type in question - * @return a TypeInfo instance that contains all cached info for the given type. May be null. - */ - protected TypeInfo getTypeInfo(IType type) { - TypeInfo info = null; - if (type != null) - { - info = cachedInfo.get(type); - } - return info; - } - - /**Returns the cached bean property symbols for a given type. Will return null if no - * bean property symbols have been cached or the type/something it depends on has changed since - * then. - * @param beanType - the bean type in question - * @return the bean property symbols for the given type. May be null. - * @see TypeInfoCache#cachePropertySymbols(IType, IBeanPropertySymbol[]) - */ - public synchronized IBeanPropertySymbol[] getCachedPropertySymbols(IType beanType) { - IBeanPropertySymbol[] props = null; - - if (beanType != null) - { - TypeInfo typeInfo = getTypeInfo(beanType); - if (typeInfo != null) - { - props = typeInfo.getPropertySymbols(); - } - } - return props; - } - - /**Returns the cached method symbols for a given type. Will return null if no - * method symbols have been cached or the type/something it depends on has changed since - * then. - * @param beanType - the bean type in question - * @return the method symbols for the given type. May be null. - * @see TypeInfoCache#cacheMethodSymbols(IType, IBeanMethodSymbol[]) - */ - public synchronized IBeanMethodSymbol[] getCachedMethodSymbols(IType beanType) { - IBeanMethodSymbol[] methods = null; - - if (beanType != null) - { - TypeInfo typeInfo = getTypeInfo(beanType); - if (typeInfo != null) - { - methods = typeInfo.getMethodSymbols(); - } - } - - return methods; - } - - /**Returns the cached supertypes for a given type. Will return null if no supertypes - * have been cached for this type or if the type/something it depends on has changed since - * then. - * @param type - the bean type in question - * @return the supertypes for the given type. May be null. - * @see TypeInfoCache#cacheSupertypesFor(IType) - */ - public synchronized IType[] getCachedSupertypes(IType type) { - IType[] types = null; - - if (type != null) - { - TypeInfo typeInfo = getTypeInfo(type); - if (typeInfo != null) - { - types = typeInfo.getSupertypes(); - } - } - - return types; - } - - /**Returns the cached implemented interfaces for a given type. Will return null if no interfaces - * have been cached for this type or if the type/something it depends on has changed since - * then. - * @param type - the bean type in question - * @return the interface types implemented by the given type. May be null. - * @see TypeInfoCache#cacheInterfaceTypesFor(IType) - */ - public synchronized IType[] getCachedInterfaceTypes(IType type) - { - IType[] types = null; - - if (type != null) - { - TypeInfo typeInfo = getTypeInfo(type); - if (typeInfo != null) - { - types = typeInfo.getInterfaceTypes(); - } - } - - return types; - } - - /**Caches the given method symbols for the given type. - * @param beanType - the type - * @param methods - the method symbols to cache - */ - public synchronized void cacheMethodSymbols(IType beanType, IBeanMethodSymbol[] methods) { - if (beanType != null) - { - TypeInfo typeInfo = getOrCreateTypeInfo(beanType); - if (typeInfo != null) { - typeInfo.setMethodSymbols(methods); - } - } - } - - /**Caches the given property symbols for the given type. - * @param beanType - the type - * @param properties - the property symbols to cache - */ - public synchronized void cachePropertySymbols(IType beanType, IBeanPropertySymbol[] properties) { - if (beanType != null) - { - TypeInfo typeInfo = getOrCreateTypeInfo(beanType); - if (typeInfo != null) { - typeInfo.setPropertySymbols(properties); - } - } - } - - /**Caches the supertypes for the given type. The supertypes will be calculated (and also returned) - * by this method. - * @param type - the type to cache supertypes for - * @return the supertypes of the given type. - */ - public synchronized IType[] cacheSupertypesFor(IType type) - { - IType[] types = null; - - if (type != null) - { - TypeInfo typeInfo = getOrCreateTypeInfo(type); - - if (typeInfo != null) - { - types = typeInfo.getSupertypes(); - } - } - return types; - } - - /**Caches the interface types for the given type. The interface types will be calculated (and also - * returned) by this method. - * @param type - the type to cache interface types for - * @return the interface types implemented by the given type. - */ - public synchronized IType[] cacheInterfaceTypesFor(IType type) - { - IType[] types = null; - - if (type != null) - { - TypeInfo typeInfo = getOrCreateTypeInfo(type); - if (typeInfo != null) - { - types = typeInfo.getInterfaceTypes(); - } - } - return types; - } - - /**Returns the TypeInfo for the given type. If no TypeInfo exists for this type, an empty TypeInfo - * will be created and cached. - * @param type - the type in question - * @return the (modifyable) TypeInfo for the given type - */ - protected TypeInfo getOrCreateTypeInfo(IType type) { - TypeInfo typeInfo = getTypeInfo(type); - if (typeInfo == null) { - try { - final ITypeHierarchy hierarchy = - type.newSupertypeHierarchy(new NullProgressMonitor()); - final IType[] supertypes = hierarchy.getAllSuperclasses(type); - final IType[] interfaceTypes = hierarchy.getAllInterfaces(); - final IType[] rootClasses = hierarchy.getRootClasses(); - List missingSupertypesList = null; - for (int i = 0; i < rootClasses.length; i++) { - String superclassName = rootClasses[i].getSuperclassName(); - if (superclassName != null) { - if (missingSupertypesList == null) { - missingSupertypesList = new ArrayList(1); - } - superclassName = shortTypename(superclassName); - missingSupertypesList.add(superclassName); - } - } - String[] missingSupertypes = null; - if (missingSupertypesList != null) { - missingSupertypes = (String[]) missingSupertypesList.toArray(new String[missingSupertypesList.size()]); - } else { - missingSupertypes = TypeInfo.NO_NAMES; - } - typeInfo = new TypeInfo(); - typeInfo.setSupertypes(supertypes); - typeInfo.setInterfaceTypes(interfaceTypes); - typeInfo.setMissingSupertypeNames(missingSupertypes); - cachedInfo.put(type, typeInfo); - registerCachedType(type, typeInfo); - } catch (JavaModelException e) { - JSFCommonPlugin.log(e); - } - } - return typeInfo; - } - - /**Returns the typename fragment after the last "." (which in most cases is identical to the - * unqualified typename). - * Used only to make sure that if n1 and n2 are names of the same type - * shortname(n1) equals shortname(2) even if one name is qualified and one not. - * @param typename - * @return the typename fragment after the last "." - */ - private String shortTypename(String typename) { - int pos = typename.lastIndexOf('.'); - if (pos >= 0) { - typename = typename.substring(pos + 1); - } - return typename; - } - - /** - * Registers the given type for all ITypeRoot's it depends on, so that it can be uncached if - * one of this ITypeRoot's has changed. The type must be unregistered when it should not be watched - * anymore. - * @param type - the type - * @param typeInfo - TypeInfo of the given type - * @see TypeInfoCache#unregisterCachedType(IType, TypeInfo) - */ - protected void registerCachedType(IType type, TypeInfo typeInfo) { - registerTypeForTypeRoot(type, type.getTypeRoot()); - IType[] supertypes = typeInfo.getSupertypes(); - for (int i = 0; i < supertypes.length; i++) { - registerTypeForTypeRoot(type, supertypes[i].getTypeRoot()); - } - String[] missingSupertypeNames = typeInfo.getMissingSupertypeNames(); - if (missingSupertypeNames != null) { - for (int i = 0; i < missingSupertypeNames.length; i++) { - registerTypeForMissingSupertype(type, missingSupertypeNames[i]); - } - } - } - - private void registerTypeForTypeRoot(IType type, ITypeRoot typeRoot) { - Set dependentTypes = cachedTypesByAffectingTypeRoot.get(typeRoot); - if (dependentTypes == null) { - dependentTypes = new HashSet(5); - cachedTypesByAffectingTypeRoot.put(typeRoot, dependentTypes); - } - dependentTypes.add(type); - } - - private void registerTypeForMissingSupertype(IType type, String supertype) { - Set dependentTypes = cachedTypesByMissingSupertypename.get(supertype); - if (dependentTypes == null) { - dependentTypes = new HashSet(5); - cachedTypesByMissingSupertypename.put(supertype, dependentTypes); - } - dependentTypes.add(type); - } - - /**Unregisters the given type for all ITypeRoot's it depended on. - * @param type - the type - * @param typeInfo - TypeInfo of the given type - */ - protected void unregisterCachedType(IType type, TypeInfo typeInfo) { - unregisterTypeForTypeRoot(type, type.getTypeRoot()); - IType[] supertypes = typeInfo.getSupertypes(); - for (int i = 0; i < supertypes.length; i++) { - unregisterTypeForTypeRoot(type, supertypes[i].getTypeRoot()); - } - String[] missingSupertypeNames = typeInfo.getMissingSupertypeNames(); - if (missingSupertypeNames != null) { - for (int i = 0; i < missingSupertypeNames.length; i++) { - unregisterTypeForMissingSupertype(type, missingSupertypeNames[i]); - } - } - } - - private void unregisterTypeForTypeRoot(IType type, ITypeRoot typeRoot) { - Set dependentTypes = cachedTypesByAffectingTypeRoot.get(typeRoot); - if (dependentTypes != null) { - dependentTypes.remove(type); - if (dependentTypes.isEmpty()) { - cachedTypesByAffectingTypeRoot.remove(typeRoot); - } - } - } - - private void unregisterTypeForMissingSupertype(IType type, String supertype) { - Set dependentTypes = cachedTypesByMissingSupertypename.get(supertype); - if (dependentTypes != null) { - dependentTypes.remove(type); - if (dependentTypes.isEmpty()) { - cachedTypesByMissingSupertypename.remove(supertype); - } - } - } - - /**This will remove all cached info for all types. - */ - protected synchronized void uncacheAllTypes() { - cachedInfo.clear(); - cachedTypesByAffectingTypeRoot.clear(); - cachedTypesByMissingSupertypename.clear(); - } - - /**Removes all cached info for all types that are subtypes of a type of the given ITypeRoot. - * @param typeRoot - */ - protected synchronized void uncacheAffectedTypes(ITypeRoot typeRoot) { - Collection affectedTypes = cachedTypesByAffectingTypeRoot.get(typeRoot); - if (affectedTypes != null && !affectedTypes.isEmpty()) { - List affectedTypesCopy = new ArrayList(affectedTypes); - for (Iterator it = affectedTypesCopy.iterator(); it.hasNext(); ) { - IType cachedType = (IType) it.next(); - TypeInfo typeInfo = cachedInfo.remove(cachedType); - unregisterCachedType(cachedType, typeInfo); - } - } - } - - /**Removes all cached info for all types (or subtypes of types) that specify a supertype - * that has a name similar to the given name. - * @param supertypename - the missing supertype name. May be qualified or not - */ - protected synchronized void uncacheTypesWithMissingSupertype(String supertypename) { - Collection affectedTypes = cachedTypesByMissingSupertypename.get(shortTypename(supertypename)); - if (affectedTypes != null && !affectedTypes.isEmpty()) { - List affectedTypesCopy = new ArrayList(affectedTypes); - for (Iterator it = affectedTypesCopy.iterator(); it.hasNext(); ) { - IType cachedType = (IType) it.next(); - TypeInfo typeInfo = cachedInfo.remove(cachedType); - unregisterCachedType(cachedType, typeInfo); - } - } - } - - /**Removes all cached info that may be affected by the given change. - * @param delta - the change in the java model - */ - protected void updateChangedJavaElement(IJavaElementDelta delta) { - IJavaElement element= delta.getElement(); - switch (element.getElementType()) { - case IJavaElement.JAVA_MODEL: - updateChangedJavaModel(delta, element); - break; - case IJavaElement.JAVA_PROJECT: - updateChangedJavaProject(delta, element); - break; - case IJavaElement.PACKAGE_FRAGMENT_ROOT: - updateChangedPackageFragmentRoot(delta, element); - break; - case IJavaElement.PACKAGE_FRAGMENT: - updateChangedPackageFragment(delta, (IPackageFragment) element); - break; - case IJavaElement.CLASS_FILE: - case IJavaElement.COMPILATION_UNIT: - updateChangedOpenable(delta, element); - break; - } - } - - private void updateChangedChildren(IJavaElementDelta delta) { - if ((delta.getFlags() & IJavaElementDelta.F_CHILDREN) > 0) { - IJavaElementDelta[] children= delta.getAffectedChildren(); - for (int i= 0; i < children.length; i++) { - updateChangedJavaElement(children[i]); - } - } - } - - private void updateChangedJavaModel(IJavaElementDelta delta, IJavaElement element) { - switch (delta.getKind()) { - case IJavaElementDelta.ADDED : - case IJavaElementDelta.REMOVED : - uncacheAllTypes(); - break; - case IJavaElementDelta.CHANGED : - updateChangedChildren(delta); - break; - } - } - - private void updateChangedJavaProject(IJavaElementDelta delta, IJavaElement element) { - int kind = delta.getKind(); - int flags = delta.getFlags(); - if ((flags & IJavaElementDelta.F_OPENED) != 0) { - kind = IJavaElementDelta.ADDED; // affected in the same way - } - if ((flags & IJavaElementDelta.F_CLOSED) != 0) { - kind = IJavaElementDelta.REMOVED; // affected in the same way - } - switch (kind) { - case IJavaElementDelta.ADDED : - case IJavaElementDelta.REMOVED : - uncacheAllTypes(); - break; - case IJavaElementDelta.CHANGED : - updateChangedChildren(delta); - break; - } - } - - private void updateChangedPackageFragment(IJavaElementDelta delta, IPackageFragment element) { - switch (delta.getKind()) { - case IJavaElementDelta.ADDED : - // if the package fragment is in the projects being considered, this could - // introduce new types, changing the hierarchy - case IJavaElementDelta.REMOVED : - // is a change if the package fragment contains supertypes? - uncacheAllTypes(); - break; - case IJavaElementDelta.CHANGED : - // look at the files in the package fragment - updateChangedChildren(delta); - } - } - - private void updateChangedPackageFragmentRoot(IJavaElementDelta delta, IJavaElement element) { - switch (delta.getKind()) { - case IJavaElementDelta.ADDED : - case IJavaElementDelta.REMOVED : - uncacheAllTypes(); - break; - case IJavaElementDelta.CHANGED : - int flags = delta.getFlags(); - if (((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) > 0)||(flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) > 0) { - uncacheAllTypes(); - } else { - updateChangedChildren(delta); - } - break; - } - } - - /**Removes all cached info that may be affected by the change in this IOpenable - * @param delta - the change in the java model - * @param element - the (changed) IOpenable considered - */ - protected void updateChangedOpenable(IJavaElementDelta delta, IJavaElement element) { - if (element instanceof ITypeRoot) { - ITypeRoot typeRoot = (ITypeRoot) element; - uncacheAffectedTypes(typeRoot); - // Creates missing superclass for any cached type? - if (delta.getKind() == IJavaElementDelta.ADDED) { - if (typeRoot instanceof ICompilationUnit) { - ICompilationUnit cu = (ICompilationUnit) typeRoot; - try { - IType[] types = cu.getAllTypes(); - for (int i = 0; i < types.length; i++) { - uncacheTypesWithMissingSupertype(types[i].getElementName()); - } - } catch (JavaModelException e) { - if (!e.isDoesNotExist()) - { - JSFCommonPlugin.log(IStatus.INFO, "Unable to get types for compilation unit " + cu, e); //$NON-NLS-1$ - } - uncacheAllTypes(); - } - } else if (typeRoot instanceof IClassFile) { - IClassFile cf = (IClassFile) typeRoot; - IType type = cf.getType(); - uncacheTypesWithMissingSupertype(type.getElementName()); - } - } - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java deleted file mode 100644 index 4c5718f89..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java +++ /dev/null @@ -1,213 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.jdt.core.Signature; - -/** - * Transforms one CompositeType to another according to particular - * transform rules. - * - * In general, every transformation should be of the form: - * - * CompositeType transform(CompositeType original, other inputs...); - * - * @author cbateman - * - */ -public class TypeTransformer -{ - private final static Map boxConversions = new HashMap(); - private final static Map unBoxConversions = new HashMap(); - - static - { - // see jdt.core.Signature or JVM link spec for more details - boxConversions.put("B", "Ljava.lang.Byte;"); //$NON-NLS-1$//$NON-NLS-2$ - boxConversions.put("C", "Ljava.lang.Character;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("D", "Ljava.lang.Double;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("F", "Ljava.lang.Float;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("I", "Ljava.lang.Integer;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("J", "Ljava.lang.Long;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("S", "Ljava.lang.Short;"); //$NON-NLS-1$ //$NON-NLS-2$ - boxConversions.put("Z", "Ljava.lang.Boolean;"); //$NON-NLS-1$ //$NON-NLS-2$ - // don't box V - boxConversions.put("V", "V"); //$NON-NLS-1$ //$NON-NLS-2$ - - // invert hte box conversions - for (final Iterator it = boxConversions.keySet().iterator(); it.hasNext();) - { - final String newValue = (String) it.next(); - final String newKey = (String) boxConversions.get(newValue); - if (unBoxConversions.put(newKey, newValue) != null) - { - // if put returns non-null then we have replaced a key - // added on a previous iteration. This implies - // that box mappings are no longer one-to-one - throw new AssertionError("Duplicated boxing value"); //$NON-NLS-1$ - } - } - } - - /** - * @param compositeType - * @return an equivilent form of compositeType with all primitive type - * signatures converted to their fully qualified boxed equivilent but - * otherwise unchanged. - * - * Example: J -> Ljava.lang.Long; - */ - public static CompositeType transformBoxPrimitives(CompositeType compositeType) - { - String[] signatures = compositeType.getSignatures(); - String[] newsignatures = new String[signatures.length]; - - for (int i = 0; i < signatures.length; i++) - { - newsignatures[i] = transformBoxPrimitives(signatures[i]); - } - - return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask()); - } - - /** - * Performs boxing for a single typeSignature string - * @param curSignature - * @return the boxed signature - */ - public static String transformBoxPrimitives(final String curSignature) - { - String newSignature = curSignature; - - // first determine if we have a type or method signature - try - { - int kind = Signature.getTypeSignatureKind(curSignature); - - // interested in base types, since these need boxing - if (kind == Signature.BASE_TYPE_SIGNATURE) - { - // grab the box for the primitive - newSignature = (String) boxConversions.get(curSignature); - } - else if (kind == Signature.ARRAY_TYPE_SIGNATURE) - { - // check if it's array of primitives - final String baseType = Signature.getElementType(curSignature); - - if (Signature.getTypeSignatureKind(baseType) == Signature.BASE_TYPE_SIGNATURE) - { - // it is, so box it - final String newBaseType = (String) boxConversions.get(baseType); - final int numBraces = Signature.getArrayCount(curSignature); - newSignature = ""; //$NON-NLS-1$ - for (int j = 0; j < numBraces; j++) - { - newSignature += "["; //$NON-NLS-1$ - } - - newSignature += newBaseType; - } - } - } - catch (IllegalArgumentException e) - { - // signature was not a type signature, so must be a method sig - // do nothing: don't box method types - } - - return newSignature; - } - - /** - * Performs the exact inverse of transformBoxPrimitives -- takes all - * boxing type signatures and replaces them with their primitive equivilent - * @param compositeType - * @return a new composite with all boxed primitives unboxed - */ - public static CompositeType transformUnboxPrimitives(CompositeType compositeType) - { - String[] signatures = compositeType.getSignatures(); - String[] newsignatures = new String[signatures.length]; - - for (int i = 0; i < signatures.length; i++) - { - newsignatures[i] = transformUnboxPrimitives(signatures[i]); - } - - return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask()); - } - - /** - * Performs unboxing for a single typeSignature string - * - * @param typeSignature - * @return the transformed signature - */ - public static String transformUnboxPrimitives(final String typeSignature) - { - String newSignature = typeSignature; - - // first determine if we have a type or method signature - try - { - int kind = Signature.getTypeSignatureKind(typeSignature); - - // interested in class types, since these need boxing - if (kind == Signature.CLASS_TYPE_SIGNATURE) - { - // grab the box for the primitive - String checkForUnbox = (String) unBoxConversions.get(typeSignature); - - if (checkForUnbox != null) - { - newSignature = checkForUnbox; - } - } - else if (kind == Signature.ARRAY_TYPE_SIGNATURE) - { - // check if it's array of objects - final String baseType = Signature.getElementType(typeSignature); - - if (Signature.getTypeSignatureKind(baseType) == Signature.CLASS_TYPE_SIGNATURE) - { - // it is, so unbox it - final String newBaseTypeCandidate = (String) unBoxConversions.get(baseType); - - if (newBaseTypeCandidate != null) - { - final int numBraces = Signature.getArrayCount(typeSignature); - newSignature = ""; //$NON-NLS-1$ - for (int j = 0; j < numBraces; j++) - { - newSignature += "["; //$NON-NLS-1$ - } - - newSignature += newBaseTypeCandidate; - } - } - } - } - catch (IllegalArgumentException e) - { - // signature was not a type signature, so must be a method sig - // do nothing: don't box method types - } - - return newSignature; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java deleted file mode 100644 index a302fc4d6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.Signature; - -/** - * Package utility class - * @author cbateman - * - */ -/*package*/final class TypeUtil -{ - /** - * @param assignmentType - * @return true if assignmentType has lhs flag set - */ - public static boolean matchesLHS(int assignmentType) - { - return (assignmentType & IAssignable.ASSIGNMENT_TYPE_LHS) != 0; - } - - /** - * @param assignmentType - * @return true if assignmentType has rhs flag set - */ - public static boolean matchesRHS(int assignmentType) - { - return (assignmentType & IAssignable.ASSIGNMENT_TYPE_RHS) != 0; - } - - /** - * @param signature - * @return true if the signature is a method signature - */ - public static boolean isMethodSignature(final String signature) - { - // method signature must start with a "(" - return signature.charAt(0) == Signature.C_PARAM_START; - } - private TypeUtil() {/*not instantiable*/} -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java deleted file mode 100644 index 2d1282586..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java +++ /dev/null @@ -1,238 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.internal.types; - -import org.eclipse.jdt.core.Signature; - -/** - * Value object representing a value binding type by it's type and assignability - * information - * - * @author cbateman - * - */ -public class ValueType implements SignatureBasedType, IAssignable -{ - /** - * A default empty string array - */ - protected final static String[] EMPTY_STRING_ARRAY = new String[0]; - - private final String _signature; - private final String[] _typeArgs; - private final int _assignmentMask; - private final String[] _superTypes; - private final String[] _interfaceTypes; - - private final boolean _isEnumType; - - private String[] _allTypes; // lazy creation on getAllTypes - - /** - * Construct a new ValueType object with the given - * signature - * - * @param signature - * @param typeArgs generic type arguments for signature or empty if none - * @param superTypes - * @param interfaceTypes - * @param isEnumType - * @param assignmentMask - */ - public ValueType(final String signature, - final String[] typeArgs, - final String[] superTypes, - final String[] interfaceTypes, - final boolean isEnumType, - final int assignmentMask) - { - if (signature == null) - { - throw new AssertionError("signature can never be null"); //$NON-NLS-1$ - } - - _signature = signature; - _typeArgs = typeArgs; - _assignmentMask = assignmentMask; - _superTypes = superTypes != null ? superTypes : EMPTY_STRING_ARRAY; - _interfaceTypes = interfaceTypes != null ? interfaceTypes : EMPTY_STRING_ARRAY; - _isEnumType = isEnumType; - } - - /** - * Copy constructor equivilent to - * ValueType(template.getSignature(), template.getSuperTypes(), template.getInterfaceTypes(),assingmentMask, template._isEnumType) - * - * @param template - * @param assignmentMask - */ - public ValueType(final ValueType template, final int assignmentMask) - { - this(template._signature, template._typeArgs, template._superTypes, - template._interfaceTypes, template._isEnumType, assignmentMask); - } - - /** - * Convienence constructor for creating ValueType's with no supertype, type argument - * or interface info. Equivilent to: - * ValueType(signature, new String[0], new String[0], new String[0], false, assignmentMask) - * - * @param signature - * @param assignmentMask - */ - public ValueType(final String signature, final int assignmentMask) - { - this(signature, EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY, false, assignmentMask); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.core.internal.types.SignatureBasedType#getSignature() - */ - public String getSignature() - { - return _signature; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#getAssignability() - */ - public int getAssignability() { - return _assignmentMask; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#isLHS() - */ - public boolean isLHS() { - return TypeUtil.matchesLHS(_assignmentMask); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#isRHS() - */ - public boolean isRHS() { - return TypeUtil.matchesRHS(_assignmentMask); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() - { - return Signature.getSignatureSimpleName - (TypeTransformer.transformBoxPrimitives(_signature)); - } - - /** - * @return an array of all signatures of all super types or empty - * array if there are no super types for this type - * - * Note: if isArray() == true, then these are the super types of - * the base element - */ - public String[] getSuperTypes() - { - return _superTypes; - } - - /** - * @return an array of all interfaces implemented or empty array - * if none - * - * Note: if isArray() == true, then these are the interfacess of - * the base element - */ - public String[] getInterfaceTypes() - { - return _interfaceTypes; - } - - /** - * @return all types including the base type, super types and interface - * types. - * - * Note: if isArray() == true, then these are the super types of - * the base element - - */ - public String[] getAllTypes() - { - if (_allTypes == null) - { - int numberOfTypes = 1 + _superTypes.length + _interfaceTypes.length; - _allTypes = new String[numberOfTypes]; - _allTypes[0] = _signature; - System.arraycopy(_superTypes, 0, _allTypes, 1, _superTypes.length); - System.arraycopy(_interfaceTypes, 0, _allTypes, 1+_superTypes.length, _interfaceTypes.length); - } - return _allTypes; - } - - /** - * @return the type arguments for getSignature() if any or empty array if none - */ - public String[] getTypeArguments() - { - return _typeArgs; - } - - /** - * - */ - public CompositeType toCompositeType() - { - return new CompositeType(getAllTypes(), getAssignability()); - } - - /** - * @param signature - * @return true if an instance of this type would satisfy instanceof signature - * - */ - public boolean isInstanceOf(final String signature) - { - // if this is an array, then the super types are for the base - // type and we can't be an instance of anything but signature - if (isArray()) - { - return getSignature().equals(signature); - } - - final String[] allTypes = getAllTypes(); - - for (int i = 0; i < allTypes.length; i++) - { - if (allTypes[i].equals(signature)) - { - return true; - } - } - - return false; - } - - /** - * @return true if this is an array type - */ - public boolean isArray() - { - return Signature.getArrayCount(getSignature()) > 0; - } - - /** - * @return true if the value type represents a (>=Java5) enum type - */ - public boolean isEnumType() { - return _isEnumType; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties deleted file mode 100644 index 3df119baf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2007 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -TypeComparator.Expression.Doesnt.Match.Expected.Types=EL expression does not evaluate to expected types for this attribute -TypeComparator.Expression.Not.Gettable=Expression is not gettable -TypeComparator.Expression.Expected.Settable=Attribute expects settable value, but expression is not settable - -TypeComparator.Expression.No_Method=Expression must be a method expression but is a value expression -TypeComparator.Expression.No_Value=Expression must be a value expression but is a method expression -TypeComparator.Expression.Incompatible_Method=Method must have signature "{0}" but has signature "{1}" -TypeComparator.Expression.Incompatible_Value=Cannot coerce type {1} to {0} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java deleted file mode 100644 index 6af707ee5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java +++ /dev/null @@ -1,163 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Entity</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity() - * @model extendedMetaData="kind='element' name='entity'" - * @generated - */ -public interface Entity extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Returns the value of the '<em><b>Child Entities</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Entity}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Child Entities</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Child Entities</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_ChildEntities() - * @model type="org.eclipse.jst.jsf.common.metadata.Entity" containment="true" - * extendedMetaData="kind='element' name='entity'" - * @generated - */ - EList getChildEntities(); - - /** - * Returns the value of the '<em><b>Traits</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Trait}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Traits</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Traits</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Traits() - * @model type="org.eclipse.jst.jsf.common.metadata.Trait" containment="true" - * extendedMetaData="kind='element' name='trait'" - * @generated - */ - EList getTraits(); - - /** - * Returns the value of the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Id</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Id</em>' attribute. - * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Id() - * @model id="true" required="true" - * @generated - */ - String getId(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Id</em>' attribute. - * @see #getId() - * @generated - */ - void setId(String value); - - /** - * Returns the value of the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type</em>' attribute. - * @see #setType(String) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Type() - * @model - * @generated - */ - String getType(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Type</em>' attribute. - * @see #getType() - * @generated - */ - void setType(String value); - - /** - * Returns the value of the '<em><b>Include Groups</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Include Groups</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Include Groups</em>' reference list. - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_IncludeGroups() - * @model type="org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup" - * extendedMetaData="kind='element' name='include-entity-group'" - * @generated - */ - EList getIncludeGroups(); - - /** - * <!-- begin-user-doc --> - * @param visitor - * <!-- end-user-doc --> - * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor" - * @generated - */ - void accept(IEntityVisitor visitor); - - /** - * <!-- begin-user-doc --> - * @return Model - * <!-- end-user-doc --> - * @model kind="operation" - * @generated - */ - Model getModel(); - -} // Entity diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java deleted file mode 100644 index 09e9f73b1..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Entity Group</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntityGroup() - * @model - * @generated - */ -public interface EntityGroup extends Entity { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - -} // EntityGroup diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java deleted file mode 100644 index be4f1463f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Include Entity Group</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup() - * @model - * @generated - */ -public interface IncludeEntityGroup extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Id</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Id</em>' attribute. - * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_Id() - * @model required="true" - * @generated - */ - String getId(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Id</em>' attribute. - * @see #getId() - * @generated - */ - void setId(String value); - - /** - * Returns the value of the '<em><b>Model Uri</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Model Uri</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Model Uri</em>' attribute. - * @see #setModelUri(String) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_ModelUri() - * @model extendedMetaData="name='uri'" - * @generated - */ - String getModelUri(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Model Uri</em>' attribute. - * @see #getModelUri() - * @generated - */ - void setModelUri(String value); - -} // IncludeEntityGroup diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java deleted file mode 100644 index 8b8ea0c04..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.ecore.EFactory; - -/** - * <!-- begin-user-doc --> - * The <b>Factory</b> for the model. - * It provides a create method for each non-abstract class of the model. - * <p><b>NOT API</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage - * @generated - */ -public interface MetadataFactory extends EFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ - - /** - * The singleton instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - MetadataFactory eINSTANCE = org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataFactoryImpl.init(); - - /** - * Returns a new object of class '<em>Trait</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Trait</em>'. - * @generated - */ - Trait createTrait(); - - /** - * Returns a new object of class '<em>Include Entity Group</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Include Entity Group</em>'. - * @generated - */ - IncludeEntityGroup createIncludeEntityGroup(); - - /** - * Returns a new object of class '<em>Model</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Model</em>'. - * @generated - */ - Model createModel(); - - /** - * Returns a new object of class '<em>Entity</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Entity</em>'. - * @generated - */ - Entity createEntity(); - - /** - * Returns a new object of class '<em>Entity Group</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Entity Group</em>'. - * @generated - */ - EntityGroup createEntityGroup(); - - /** - * Returns the package supported by this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the package supported by this factory. - * @generated - */ - MetadataPackage getMetadataPackage(); - -} //MetadataFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java deleted file mode 100644 index acc23cbbd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java +++ /dev/null @@ -1,871 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * <!-- begin-user-doc --> - * The <b>Package</b> for the model. - * It contains accessors for the meta objects to represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <p><b>NOT API</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.MetadataFactory - * @model kind="package" - * @generated - */ -public interface MetadataPackage extends EPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The package name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNAME = "metadata"; - - /** - * The package namespace URI. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_URI = "http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"; - - /** - * The package namespace name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_PREFIX = "md"; - - /** - * The singleton instance of the package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - MetadataPackage eINSTANCE = org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl.init(); - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl <em>Trait</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getTrait() - * @generated - */ - int TRAIT = 3; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl <em>Entity</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntity() - * @generated - */ - int ENTITY = 2; - - /** - * The feature id for the '<em><b>Child Entities</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY__CHILD_ENTITIES = 0; - - /** - * The feature id for the '<em><b>Traits</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY__TRAITS = 1; - - /** - * The feature id for the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY__ID = 2; - - /** - * The feature id for the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY__TYPE = 3; - - /** - * The feature id for the '<em><b>Include Groups</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY__INCLUDE_GROUPS = 4; - - /** - * The number of structural features of the '<em>Entity</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_FEATURE_COUNT = 5; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl <em>Model</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModel() - * @generated - */ - int MODEL = 0; - - /** - * The feature id for the '<em><b>Child Entities</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__CHILD_ENTITIES = ENTITY__CHILD_ENTITIES; - - /** - * The feature id for the '<em><b>Traits</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__TRAITS = ENTITY__TRAITS; - - /** - * The feature id for the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__ID = ENTITY__ID; - - /** - * The feature id for the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__TYPE = ENTITY__TYPE; - - /** - * The feature id for the '<em><b>Include Groups</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__INCLUDE_GROUPS = ENTITY__INCLUDE_GROUPS; - - /** - * The feature id for the '<em><b>Entity Groups</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__ENTITY_GROUPS = ENTITY_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Source Model Provider</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__SOURCE_MODEL_PROVIDER = ENTITY_FEATURE_COUNT + 1; - - /** - * The feature id for the '<em><b>Current Model Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL__CURRENT_MODEL_CONTEXT = ENTITY_FEATURE_COUNT + 2; - - /** - * The number of structural features of the '<em>Model</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MODEL_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 3; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl <em>Include Entity Group</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIncludeEntityGroup() - * @generated - */ - int INCLUDE_ENTITY_GROUP = 4; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl <em>Entity Group</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntityGroup() - * @generated - */ - int ENTITY_GROUP = 1; - - /** - * The feature id for the '<em><b>Child Entities</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP__CHILD_ENTITIES = ENTITY__CHILD_ENTITIES; - - /** - * The feature id for the '<em><b>Traits</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP__TRAITS = ENTITY__TRAITS; - - /** - * The feature id for the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP__ID = ENTITY__ID; - - /** - * The feature id for the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP__TYPE = ENTITY__TYPE; - - /** - * The feature id for the '<em><b>Include Groups</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP__INCLUDE_GROUPS = ENTITY__INCLUDE_GROUPS; - - /** - * The number of structural features of the '<em>Entity Group</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ENTITY_GROUP_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TRAIT__ID = 0; - - /** - * The feature id for the '<em><b>Value</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TRAIT__VALUE = 1; - - /** - * The feature id for the '<em><b>Source Model Provider</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TRAIT__SOURCE_MODEL_PROVIDER = 2; - - /** - * The number of structural features of the '<em>Trait</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int TRAIT_FEATURE_COUNT = 3; - - /** - * The feature id for the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int INCLUDE_ENTITY_GROUP__ID = 0; - - /** - * The feature id for the '<em><b>Model Uri</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int INCLUDE_ENTITY_GROUP__MODEL_URI = 1; - - /** - * The number of structural features of the '<em>Include Entity Group</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int INCLUDE_ENTITY_GROUP_FEATURE_COUNT = 2; - - /** - * The meta object id for the '<em>ITrait Visitor</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor() - * @generated - */ - int ITRAIT_VISITOR = 5; - - /** - * The meta object id for the '<em>IEntity Visitor</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor() - * @generated - */ - int IENTITY_VISITOR = 6; - - /** - * The meta object id for the '<em>IMeta Data Source Model Provider</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIMetaDataSourceModelProvider() - * @generated - */ - int IMETA_DATA_SOURCE_MODEL_PROVIDER = 7; - - - /** - * The meta object id for the '<em>Model Context</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModelContext() - * @generated - */ - int MODEL_CONTEXT = 8; - - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Trait <em>Trait</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Trait</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Trait - * @generated - */ - EClass getTrait(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Trait#getId() - * @see #getTrait() - * @generated - */ - EAttribute getTrait_Id(); - - /** - * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference '<em>Value</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Trait#getValue() - * @see #getTrait() - * @generated - */ - EReference getTrait_Value(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Source Model Provider</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider() - * @see #getTrait() - * @generated - */ - EAttribute getTrait_SourceModelProvider(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Include Entity Group</em>'. - * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup - * @generated - */ - EClass getIncludeEntityGroup(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId() - * @see #getIncludeEntityGroup() - * @generated - */ - EAttribute getIncludeEntityGroup_Id(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Model Uri</em>'. - * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri() - * @see #getIncludeEntityGroup() - * @generated - */ - EAttribute getIncludeEntityGroup_ModelUri(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Model</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Model - * @generated - */ - EClass getModel(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Source Model Provider</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider() - * @see #getModel() - * @generated - */ - EAttribute getModel_SourceModelProvider(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Current Model Context</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext() - * @see #getModel() - * @generated - */ - EAttribute getModel_CurrentModelContext(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Entity Groups</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups() - * @see #getModel() - * @generated - */ - EReference getModel_EntityGroups(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Entity</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity - * @generated - */ - EClass getEntity(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Child Entities</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities() - * @see #getEntity() - * @generated - */ - EReference getEntity_ChildEntities(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Traits</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity#getTraits() - * @see #getEntity() - * @generated - */ - EReference getEntity_Traits(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity#getId() - * @see #getEntity() - * @generated - */ - EAttribute getEntity_Id(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Type</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity#getType() - * @see #getEntity() - * @generated - */ - EAttribute getEntity_Type(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Include Groups</em>'. - * @see org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups() - * @see #getEntity() - * @generated - */ - EReference getEntity_IncludeGroups(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Entity Group</em>'. - * @see org.eclipse.jst.jsf.common.metadata.EntityGroup - * @generated - */ - EClass getEntityGroup(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor <em>ITrait Visitor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>ITrait Visitor</em>'. - * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor - * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor" serializable="false" - * @generated - */ - EDataType getITraitVisitor(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor <em>IEntity Visitor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>IEntity Visitor</em>'. - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor - * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor" serializable="false" - * @generated - */ - EDataType getIEntityVisitor(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider <em>IMeta Data Source Model Provider</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>IMeta Data Source Model Provider</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider - * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider" - * @generated - */ - EDataType getIMetaDataSourceModelProvider(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor <em>Model Context</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>Model Context</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor - * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor" - * @generated - */ - EDataType getModelContext(); - - /** - * Returns the factory that creates the instances of the model. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the factory that creates the instances of the model. - * @generated - */ - MetadataFactory getMetadataFactory(); - - /** - * <!-- begin-user-doc --> - * Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - interface Literals { - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl <em>Trait</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getTrait() - * @generated - */ - EClass TRAIT = eINSTANCE.getTrait(); - - /** - * The meta object literal for the '<em><b>Id</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute TRAIT__ID = eINSTANCE.getTrait_Id(); - - /** - * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference TRAIT__VALUE = eINSTANCE.getTrait_Value(); - - /** - * The meta object literal for the '<em><b>Source Model Provider</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute TRAIT__SOURCE_MODEL_PROVIDER = eINSTANCE.getTrait_SourceModelProvider(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl <em>Include Entity Group</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIncludeEntityGroup() - * @generated - */ - EClass INCLUDE_ENTITY_GROUP = eINSTANCE.getIncludeEntityGroup(); - - /** - * The meta object literal for the '<em><b>Id</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute INCLUDE_ENTITY_GROUP__ID = eINSTANCE.getIncludeEntityGroup_Id(); - - /** - * The meta object literal for the '<em><b>Model Uri</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute INCLUDE_ENTITY_GROUP__MODEL_URI = eINSTANCE.getIncludeEntityGroup_ModelUri(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl <em>Model</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModel() - * @generated - */ - EClass MODEL = eINSTANCE.getModel(); - - /** - * The meta object literal for the '<em><b>Source Model Provider</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute MODEL__SOURCE_MODEL_PROVIDER = eINSTANCE.getModel_SourceModelProvider(); - - /** - * The meta object literal for the '<em><b>Current Model Context</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute MODEL__CURRENT_MODEL_CONTEXT = eINSTANCE.getModel_CurrentModelContext(); - - /** - * The meta object literal for the '<em><b>Entity Groups</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference MODEL__ENTITY_GROUPS = eINSTANCE.getModel_EntityGroups(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl <em>Entity</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntity() - * @generated - */ - EClass ENTITY = eINSTANCE.getEntity(); - - /** - * The meta object literal for the '<em><b>Child Entities</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ENTITY__CHILD_ENTITIES = eINSTANCE.getEntity_ChildEntities(); - - /** - * The meta object literal for the '<em><b>Traits</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ENTITY__TRAITS = eINSTANCE.getEntity_Traits(); - - /** - * The meta object literal for the '<em><b>Id</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ENTITY__ID = eINSTANCE.getEntity_Id(); - - /** - * The meta object literal for the '<em><b>Type</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ENTITY__TYPE = eINSTANCE.getEntity_Type(); - - /** - * The meta object literal for the '<em><b>Include Groups</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ENTITY__INCLUDE_GROUPS = eINSTANCE.getEntity_IncludeGroups(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl <em>Entity Group</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntityGroup() - * @generated - */ - EClass ENTITY_GROUP = eINSTANCE.getEntityGroup(); - - /** - * The meta object literal for the '<em>ITrait Visitor</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor() - * @generated - */ - EDataType ITRAIT_VISITOR = eINSTANCE.getITraitVisitor(); - - /** - * The meta object literal for the '<em>IEntity Visitor</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor() - * @generated - */ - EDataType IENTITY_VISITOR = eINSTANCE.getIEntityVisitor(); - - /** - * The meta object literal for the '<em>IMeta Data Source Model Provider</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIMetaDataSourceModelProvider() - * @generated - */ - EDataType IMETA_DATA_SOURCE_MODEL_PROVIDER = eINSTANCE.getIMetaDataSourceModelProvider(); - - /** - * The meta object literal for the '<em>Model Context</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor - * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModelContext() - * @generated - */ - EDataType MODEL_CONTEXT = eINSTANCE.getModelContext(); - - } - -} //MetadataPackage diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java deleted file mode 100644 index fbc5ada2d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java +++ /dev/null @@ -1,128 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Model</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel() - * @model extendedMetaData="kind='element' name='metadatamodel'" - * @generated - */ -public interface Model extends Entity { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Returns the value of the '<em><b>Source Model Provider</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Source Model Provider</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Source Model Provider</em>' attribute. - * @see #setSourceModelProvider(IMetaDataSourceModelProvider) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_SourceModelProvider() - * @model unique="false" dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider" transient="true" volatile="true" - * @generated - */ - IMetaDataSourceModelProvider getSourceModelProvider(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Source Model Provider</em>' attribute. - * @see #getSourceModelProvider() - * @generated - */ - void setSourceModelProvider(IMetaDataSourceModelProvider value); - - /** - * Returns the value of the '<em><b>Current Model Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Current Model Context</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Current Model Context</em>' attribute. - * @see #setCurrentModelContext(ModelKeyDescriptor) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_CurrentModelContext() - * @model dataType="org.eclipse.jst.jsf.common.metadata.ModelContext" transient="true" volatile="true" - * @generated - */ - ModelKeyDescriptor getCurrentModelContext(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Current Model Context</em>' attribute. - * @see #getCurrentModelContext() - * @generated - */ - void setCurrentModelContext(ModelKeyDescriptor value); - - /** - * Returns the value of the '<em><b>Entity Groups</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.EntityGroup}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Entity Groups</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Entity Groups</em>' reference list. - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_EntityGroups() - * @model type="org.eclipse.jst.jsf.common.metadata.EntityGroup" - * extendedMetaData="kind='element' name='entityGroup'" - * @generated - */ - EList getEntityGroups(); - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param groupId - * @return EntityGroup - * @model - * @generated - */ - EntityGroup findIncludeGroup(String groupId); - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.IEntityVisitor" - * @generated - */ - void accept(IEntityVisitor visitor); - -} // Model diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java deleted file mode 100644 index 4eb1b30c7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Trait</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait() - * @model extendedMetaData="kind='element' name='trait'" - * @generated - */ -public interface Trait extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Id</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Id</em>' attribute. - * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Id() - * @model id="true" required="true" - * @generated - */ - String getId(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Id</em>' attribute. - * @see #getId() - * @generated - */ - void setId(String value); - - /** - * Returns the value of the '<em><b>Value</b></em>' containment reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Value</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Value</em>' containment reference. - * @see #setValue(EObject) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Value() - * @model containment="true" required="true" - * extendedMetaData="kind='element' namespace='##targetNamespace'" - * @generated - */ - EObject getValue(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Value</em>' containment reference. - * @see #getValue() - * @generated - */ - void setValue(EObject value); - - /** - * Returns the value of the '<em><b>Source Model Provider</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Source Model Provider</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Source Model Provider</em>' attribute. - * @see #setSourceModelProvider(IMetaDataSourceModelProvider) - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_SourceModelProvider() - * @model dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider" - * @generated - */ - IMetaDataSourceModelProvider getSourceModelProvider(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Source Model Provider</em>' attribute. - * @see #getSourceModelProvider() - * @generated - */ - void setSourceModelProvider(IMetaDataSourceModelProvider value); - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param visitor - * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='visitor.visit(this);'" - * @generated - */ - void accept(ITraitVisitor visitor); - -} // Trait diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java deleted file mode 100644 index 8719c1891..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.HashSet; -import java.util.Set; - -/** - * Convenient abstract class that a source model locator should consider extending. - */ -public abstract class AbstractMetaDataLocator implements IMetaDataLocator, IMetaDataObservable{ - - private IDomainSourceModelType domainSourceModelType; - private Set/*<IMetaDataObserver>*/ observers; - - /** - * Constructor - */ - public AbstractMetaDataLocator(){ - observers = new HashSet(1); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#getDomainSourceModelType() - */ - public IDomainSourceModelType getDomainSourceModelType() { - return domainSourceModelType; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#setDomainSourceModelType(org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType) - */ - public void setDomainSourceModelType( - IDomainSourceModelType domainSourceModelType) { - this.domainSourceModelType = domainSourceModelType; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#addObserver(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver) - */ - public void addObserver(IMetaDataObserver observer) { - observers.add(observer); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#removeObserver(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver) - */ - public void removeObserver(IMetaDataObserver observer) { - observers.remove(observer); - } - - /** - * @return the set of {@link IMetaDataObserver}s for this instance - */ - public Set/*<IMetaDataObserver>*/ getObservers(){ - return observers; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java deleted file mode 100644 index 99a06bbd9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java +++ /dev/null @@ -1,362 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.Iterator; - -import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.emf.ecore.xml.type.SimpleAnyType; -import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; -import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; - -/** - * Abstract class that the taglib domain translators use to - * convert the CM model to a standard meta data model - * - */ -public abstract class AbstractTagLibDomainContentModelMetaDataTranslator { - - /** - * {@link IMetaDataModelMergeAssistant} to use - */ - protected IMetaDataModelMergeAssistant _assistant; - - /** - * Set the assistant to use during the translation. Must be called prior to doTransalate(doc); - * @param assistant - */ - protected void setAssistant(IMetaDataModelMergeAssistant assistant){ - _assistant = assistant; - } - - /** - * Transforms the CMDocument into entities and traits of a standard metadata model - * using the assistant that must be set before this call. - * @param doc - */ - protected void doTranslate(CMDocument doc){ - createTags(doc); - createTagfileTraits(doc); - } - - /** - * @param entity - * @param key - * @param value - */ - protected void createSimpleStringEntityTraitIfNecessary(final Entity entity, final String key, - final String value) { - Trait t = findTraitOnEntityById(entity, key); - if (t == null){ - t = internalCreateTrait(entity, key); - - SimpleAnyType val = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); - val.setInstanceType(EcorePackage.eINSTANCE.getEString()); - val.setValue(value); - - t.setValue(val); - } - } - - /** - * @param entity - * @param key - * @param value - */ - protected void createSimpleBooleanObjectEntityTraitIfNecessary(final Entity entity, - String key, boolean value) { - - Trait t = findTraitOnEntityById(entity, key); - if (t == null){ - t = internalCreateTrait(entity, key); - - SimpleAnyType val = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); - val.setInstanceType(EcorePackage.eINSTANCE.getEBoolean()); - val.setRawValue(value == true ? "true" : "false"); - - t.setValue(val); - } - - } - - /** - * @param entity - * @param key - * @return Trait - */ - protected Trait internalCreateTrait(final Entity entity, final String key) { - Trait t = MetadataFactory.eINSTANCE.createTrait(); - t.setId(key); - t.setSourceModelProvider(_assistant.getSourceModelProvider()); - entity.getTraits().add(t); - return t; - } - - /** - * @param entity - * @param key - * @return Trait - */ - protected Trait findTraitOnEntityById(final Entity entity, final String key) { - for (Iterator it=entity.getTraits().iterator();it.hasNext();){ - Trait t = (Trait)it.next(); - if (key.equals(t.getId())) - return t; - } - return null; - } - - /** - * @param nodeName - * @return Entity - */ - protected Entity findTagEntity(final String nodeName) { - for (Iterator it=getMergedModel().getChildEntities().iterator();it.hasNext();){ - Entity entity = (Entity)it.next(); - if (nodeName.equals(entity.getId())) - return entity; - } - return null; - } - - /** - * @param tag - * @param attributeName - * @return Attribute entity for supplied attribute name and given Tag entity. Will return null if not found. - */ - protected Entity findAttributeEntityForTagEntity(final Entity tag, final String attributeName) { - for (Iterator it=tag.getChildEntities().iterator();it.hasNext();){ - Entity attr = (Entity)it.next(); - if (attributeName.equals(attr.getId())) - return attr; - } - return null; - } - /** - * Create entities for tags - * @param doc - */ - protected void createTags(final CMDocument doc) { - for (Iterator it=doc.getElements().iterator();it.hasNext();){ - CMElementDeclaration tag = (CMElementDeclaration)it.next(); - Entity entity = findTagEntity(tag.getNodeName()); - if (entity == null){ - entity = MetadataFactory.eINSTANCE.createEntity(); - entity.setId(getTagNodeName(tag)); - entity.setType("tag"); - getMergedModel().getChildEntities().add(entity); - } - setTagEntityTraits(tag, entity); - } - - } - - /** - * @param tag - * @return tag node name - */ - protected String getTagNodeName(CMElementDeclaration tag) { - return tag.getNodeName(); - } - - /** - * Sets the standard traits for a tag entity from the element declaration - * @param tag - * @param entity - */ - protected void setTagEntityTraits(CMElementDeclaration tag, Entity entity) { - createSimpleStringEntityTraitIfNecessary(entity, "display-label", getTagDisplayName(tag)); - createSimpleStringEntityTraitIfNecessary(entity, "description", getTagDescription(tag)); - createSimpleStringEntityTraitIfNecessary(entity, "small-icon", getTagSmallIcon(tag)); - createSimpleStringEntityTraitIfNecessary(entity, "large-icon", getTagLargeIcon(tag)); - createSimpleBooleanObjectEntityTraitIfNecessary(entity, "expert", getTagIsExpert(tag)); - createSimpleBooleanObjectEntityTraitIfNecessary(entity, "hidden", getTagIsHidden(tag)); - - createAttributeEntities(entity, tag); - } - - /** - * @param tagEntity - * @param tag - */ - protected void createAttributeEntities(Entity tagEntity, - CMElementDeclaration tag) { - - for (Iterator it=tag.getAttributes().iterator();it.hasNext();){ - CMAttributeDeclaration cmAttr = (CMAttributeDeclaration)it.next(); - Entity attr = findAttributeEntityForTagEntity(tagEntity, cmAttr.getAttrName()); - if (attr == null) { - attr = MetadataFactory.eINSTANCE.createEntity(); - attr.setId(cmAttr.getAttrName()); - tagEntity.getChildEntities().add(attr); - } - createAttributeTraits(attr, cmAttr); - } - - - } - - /** - * @param attr - * @param cmAttr - */ - protected void createAttributeTraits(Entity attr, - CMAttributeDeclaration cmAttr) { - - createSimpleStringEntityTraitIfNecessary(attr, "description", getTagAttributeDescription(cmAttr)); - createSimpleBooleanObjectEntityTraitIfNecessary(attr, "required", getTagAttributeIsRequired(cmAttr)); - createSimpleStringEntityTraitIfNecessary(attr, "default-value", getTagAttributeDefaultValue(cmAttr)); - } - - /** - * @param cmAttr - * @return null. subclass should override if CMAttributeDeclaration has the metadata. - */ - protected String getTagAttributeDescription(CMAttributeDeclaration cmAttr) {return null;} - - /** - * @param cmAttr - * @return false. subclass should override if CMAttributeDeclaration has the metadata. - */ - protected boolean getTagAttributeIsRequired(CMAttributeDeclaration cmAttr) {return cmAttr.getUsage() == CMAttributeDeclaration.REQUIRED;} - - /** - * @param cmAttr - * @return null. subclass should override if CMAttributeDeclaration has the metadata. - */ - protected String getTagAttributeDefaultValue(CMAttributeDeclaration cmAttr) {return null;} - - /** - * @param tag - * @return false. subclass should override if CMElementDeclaration has the metadata. - */ - protected boolean getTagIsHidden(CMElementDeclaration tag) {return false;} - - /** - * @param tag - * @return false. subclass should override if CMElementDeclaration has the metadata. - */ - protected boolean getTagIsExpert(CMElementDeclaration tag) {return false;} - - /** - * @param tag - * @return null. subclass should override if CMElementDeclaration has the metadata. - */ - protected String getTagLargeIcon(CMElementDeclaration tag) {return null;} - - /** - * @param tag - * @return null. subclass should override if CMElementDeclaration has the metadata. - */ - protected String getTagSmallIcon(CMElementDeclaration tag) {return null;} - - /** - * @param tag - * @return null. subclass should override if CMElementDeclaration has the metadata. - */ - protected String getTagDescription(CMElementDeclaration tag) {return null;} - - /** - * @param tag - * @return tag.getElementName() - */ - protected String getTagDisplayName(CMElementDeclaration tag) {return tag.getElementName();} - - /** - * Creates standard traits for tag file entity from CMDocument metadata - * @param doc - */ - protected void createTagfileTraits(CMDocument doc) { - Model model = getMergedModel(); - - createSimpleStringEntityTraitIfNecessary(model, "display-label", getURIDisplayLabel()); - createSimpleStringEntityTraitIfNecessary(model, "description", getURIDescription()); - createSimpleStringEntityTraitIfNecessary(model, "default-prefix", getURIDefaultPrefix()); - createSimpleBooleanObjectEntityTraitIfNecessary(model, "expert", getURIExpert()); - createSimpleBooleanObjectEntityTraitIfNecessary(model, "hidden", getURIHidden()); - - } - - /** - * @return the display label to use for this model. Subclasses should override if model has the meta data. - */ - protected String getURIDisplayLabel(){ - return getMergedModel().getId(); - } - - /** - * @return default prefix to use for tags. Returns null. Subclasses should override if model has the meta data. - */ - protected String getURIDefaultPrefix(){ - return null; - } - - /** - * @return description to use. Default is the URI. Subclasses should override if model has the meta data. - */ - protected String getURIDescription(){ - return getMergedModel().getId(); - } - - /** - * @return false. Subclasses should override if model has the meta data. - */ - protected boolean getURIExpert() { return false;} - - /** - * @return false. Subclasses should override if model has the meta data. - */ - protected boolean getURIHidden() {return false; } - - /** - * @return a model of all entities and traits - */ - protected Model getMergedModel() { - Model model = (Model)_assistant.getMergedModel().getRoot(); - if (model == null){ - //need to create model key object - Model tld = createTLDModel(); - _assistant.getMergedModel().setRoot(tld); - model = (Model)_assistant.getMergedModel().getRoot(); - } - return model; - } - - /** - * @return new model - */ - protected Model createTLDModel() { - Model entity = getFactory().createModel(); - entity.setId(_assistant.getMergedModel().getModelKey().getUri()); - return entity; - } - - /** - * @return MetadataFactory instance - */ - protected MetadataFactory getFactory(){ - return (MetadataFactory) MetadataPackage.eINSTANCE.getEFactoryInstance(); - } - - /** - * @return CMDocument being used for the current translate call - */ - protected CMDocument getSourceModel() { - return (CMDocument)_assistant.getSourceModelProvider().getSourceModel(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java deleted file mode 100644 index 01a38e61b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java +++ /dev/null @@ -1,193 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * Default class used for loading metadata. - * Loads the source types from extensions defined against the domain. - * - * see org.eclipse.jst.jsf.common.domainLoadingStrategies ext-pt - */ -public class DomainLoadingStrategy implements IDomainLoadingStrategy, IMetaDataObserver { - - /** - * Domain id - */ - protected String domain; - - private MetaDataModel _model; - private List /*<IDomainSourceModelType>*/ _sourceTypes; - private List /*<IMetaDataSourceModelProvider>*/ _sources; - - /** - * Constructor - * @param domain - */ - public DomainLoadingStrategy(String domain){ - this.domain = domain; - } - - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#load(org.eclipse.jst.jsf.common.metadata.internal.MetaDataModel) - */ - public void load(MetaDataModel model) { - this._model = model; - _sourceTypes = loadDomainSourceModelTypes(); - sortSourceTypes(_sourceTypes); - _sources = locateMetaDataSourceInstances(_sourceTypes, model); - mergeModel(model, _sources); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#reload() - */ - public void reload() throws ModelNotSetException { - //System.out.println("reload");//debug //$NON-NLS-1$ - if (_model == null) - throw new ModelNotSetException(); - - removeOldLocatorObservers(); - _sources = locateMetaDataSourceInstances(_sourceTypes, _model); - mergeModel(_model, _sources); - } - - /** - * Responsible for iterating through the sorted list of <code>IMetaDataSourceModelProvider</code> - * and merging the models after first translating the source model as required, into a single mreged model of - * standard metadata Entities and Traits. - * @param model - * @param sources - */ - protected void mergeModel(MetaDataModel model, List/*<IMetaDataSourceModelProvider>*/ sources) { - - StandardModelFactory.debug(">> Begin Merge: "+model.getModelKey()+"("+sources.size()+ " sources)", StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - - IMetaDataModelMergeAssistant assistant = createModelMergeAssistant(model); - for (Iterator/*<IMetaDataSourceModelProvider>*/ it = sources.iterator();it.hasNext();){ - IMetaDataSourceModelProvider mds = (IMetaDataSourceModelProvider)it.next(); - Iterator translators = mds.getLocator().getDomainSourceModelType().getTranslators().iterator(); - while (translators.hasNext()){ - IMetaDataTranslator translator = (IMetaDataTranslator)translators.next(); - if (translator.canTranslate(mds)){ - StandardModelFactory.debug(">>> Merging: "+model.getModelKey()+"::"+mds, StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$//$NON-NLS-2$ - assistant.setSourceModelProvider(mds); - try { - translator.translate(assistant); - } catch (Exception e) { - StandardModelFactory.debug(">>>> Error during translate/merge of: "+model.getModelKey()+": "+mds, StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ //$NON-NLS-2$ - JSFCommonPlugin.log(IStatus.ERROR, "Error during load of: "+mds, e); //$NON-NLS-1$ - } - } - } - } - assistant.setMergeComplete(); - StandardModelFactory.debug(">> End Merge: "+model.getModelKey(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ - } - - /** - * @param model - * @return an instance of a IMetaDataModelMergeAssistant to be used while merging source models - */ - protected IMetaDataModelMergeAssistant createModelMergeAssistant(MetaDataModel model){ - return new MetaDataModelMergeAssistantImpl(model); - } - - /** - * Allows for subclasses to override the default mechanism for sorting the source types. - * @param sourceTypes - */ - protected void sortSourceTypes(List/*<IDomainSourceModelType>*/ sourceTypes) { - //allows override - } - - /** - * @return list of <code>IDomainSourceModelType</code>s located in the <code>DomainSourceTypesRegistry</code> - * for the specified uri - */ - protected List/*<IDomainSourceModelType>*/ loadDomainSourceModelTypes() { - return DomainSourceTypesRegistry.getInstance().getDomainSourceTypes(domain); - } - - /** - * @param sourceTypes - * @param model - * @return list of <code>IMetaDataSourceModelProvider</code> instances from the domain source types applicable for - * this domain for this particular uri specified in the model - */ - protected List/*<IMetaDataSourceModelProvider>*/ locateMetaDataSourceInstances(List/*<IDomainSourceModelType>*/ sourceTypes, MetaDataModel model) { - List/*<IMetaDataSourceModelProvider>*/ sources = new ArrayList/*<IMetaDataSourceModelProvider>*/(); - for (Iterator/*<IDomainSourceModelType>*/ it = sourceTypes.iterator();it.hasNext();){ - IDomainSourceModelType sourceType = (IDomainSourceModelType)it.next(); - IMetaDataLocator locator = sourceType.getLocator(model.getModelKey().getProject()); - if (locator != null) { - //We MUST set the sourceType here to associate the handler with locator to use for the source models - locator.setDomainSourceModelType(sourceType); - - List/*<IMetaDataSourceModelProvider>*/ providers = locator.locateMetaDataModelProviders(model.getModelKey().getUri()); - if (providers != null && !providers.isEmpty()){ - for (Iterator mdProviders =providers.iterator();mdProviders.hasNext();){ - IMetaDataSourceModelProvider provider = (IMetaDataSourceModelProvider)mdProviders.next(); - //We MUST set the sourceType here to associate the translators to use for the source models - provider.setLocator(locator); - sources.add(provider); - } - } - //listen for changes - locator.addObserver(this); - } - } - return sources; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver#notifyMetadataChanged(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent) - */ - public void notifyMetadataChanged(IMetaDataChangeNotificationEvent event) { - //for now, if any event occurs, we need to flush the _model so that it will rebuild - _model.setNeedsRefresh(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#cleanup() - */ - public void cleanup(){ - removeOldLocatorObservers(); - _sources = null; - _sourceTypes = null; - _model = null; - } - - private void removeOldLocatorObservers(){ - if (_sources != null){ - for (Iterator it= _sources.iterator();it.hasNext();){ - IMetaDataSourceModelProvider provider = (IMetaDataSourceModelProvider)it.next(); - if (provider != null) { - IMetaDataLocator locator = provider.getLocator(); - if (locator != null){ - locator.removeObserver(this); - locator.setDomainSourceModelType(null); - provider.setLocator(null); - } - } - } - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java deleted file mode 100644 index 12a5fd2e3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java +++ /dev/null @@ -1,175 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - - -/** - * Registry of strategies used to load domains of metadata. - * Uses the <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt to load. - * - * see <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt - */ -public class DomainLoadingStrategyRegistry{ - private static DomainLoadingStrategyRegistry INSTANCE; - - private HashMap/*<String, DomainLoadingStrategyDescriptorImpl>*/ domainLoadingStrategyDescriptors; - -// public static final String TAGLIB_DOMAIN ="TagLibraryDomain"; //this does *not* belong here. FIX ME -// public static final String TAGLIB_DOMAIN_SOURCE_HANDLER_ID = TAGLIB_DOMAIN + "SourceHandler"; -// public static final String TAGLIB_DOMAIN_TRANSLATOR = "com.foo.translators."+TAGLIB_DOMAIN + "Translator"; - - private static final String EXTENSION_POINT_ID = "domainLoadingStrategies"; - - private DomainLoadingStrategyRegistry(){ - init(); - } - - /** - * @return singleton instance of the DomainLoadingStrategyRegistry - */ - public synchronized static DomainLoadingStrategyRegistry getInstance() { - if (INSTANCE == null){ - INSTANCE = new DomainLoadingStrategyRegistry(); - } - return INSTANCE; - } - - /** - * Loads registry with descriptors from the domainLoadingStrategies ext-pt. - */ - synchronized final void init(){ - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID ); - if (point != null) { - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element = elements[i]; - DomainLoadingStrategyDescriptorImpl dls = new DomainLoadingStrategyDescriptorImpl(element); - addDomainLoadingStrategyDescriptor(dls); - } - } - } - - /** - * Add domain loading strategy descriptor for a domain to the registry domains - * @param strategy - */ - protected void addDomainLoadingStrategyDescriptor(DomainLoadingStrategyDescriptorImpl strategy){ - getDescriptors().put(strategy.getDomain(), strategy); - } - - /** - * @param domain - * @return an instance of an <code>IDomainLoadingStrategy</code> for the given domain - */ - public IDomainLoadingStrategy getLoadingStrategy(String domain){ - DomainLoadingStrategyDescriptorImpl strategy = (DomainLoadingStrategyDescriptorImpl)getDescriptors().get(domain); - if (strategy == null){ - return createDefaultLoadingStrategy(); - } - return createLoadingStrategy(domain); - } - - - /** - * @return strategy that will only use standard metadata files - */ - private IDomainLoadingStrategy createDefaultLoadingStrategy() { - return new DomainLoadingStrategy(null); - } - - private IDomainLoadingStrategy createLoadingStrategy(String domain){ - return ((DomainLoadingStrategyDescriptorImpl)getDescriptors().get(domain)).newInstance(); - } - - private Map/*<String, DomainLoadingStrategyDescriptorImpl>*/ getDescriptors(){ - if (domainLoadingStrategyDescriptors == null){ - domainLoadingStrategyDescriptors = new HashMap/*<String, DomainLoadingStrategyDescriptorImpl>*/(); - } - return domainLoadingStrategyDescriptors; - } - - /** - * Implementation of a DomainLoadingStrategy descriptor that is responsible for creating instances of the IDomainLoadingStrategy - */ - private static class DomainLoadingStrategyDescriptorImpl { - String domain; - String loadingStrategyClassName; - String bundleId; - Class strategy; - IConfigurationElement element; - - DomainLoadingStrategyDescriptorImpl(IConfigurationElement element){ - this.element = element; - this.init(); - } - - private void init() { - domain = element.getAttribute("domainId"); - bundleId = element.getContributor().getName(); - loadingStrategyClassName = element.getAttribute("domainLoadingStrategy"); - } - - /** - * @return domain id - */ - public String getDomain() { - return domain; - } - - /** - * @return new instance of IDomainLoadingStrategy - */ - public IDomainLoadingStrategy newInstance(){ - try { - Class[] parameterTypes = new Class[]{String.class}; - Object[] initargs = new Object[]{domain}; - Object loader = this.getLoadingStrategy().getConstructor(parameterTypes).newInstance(initargs); - if (loader instanceof IDomainLoadingStrategy) - return (IDomainLoadingStrategy)loader; - } catch (InstantiationException e) { - JSFCommonPlugin.log(IStatus.ERROR, "Unable to instantiate IDomainLoadingStrategy for: "+ domain,e); - } catch (IllegalAccessException e) { - JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException during creation of IDomainLoadingStrategy for: "+ domain,e); - } catch (IllegalArgumentException e) { - JSFCommonPlugin.log(IStatus.ERROR, "IllegalArgumentException during creation of IDomainLoadingStrategy for: "+ domain,e); - } catch (SecurityException e) { - JSFCommonPlugin.log(IStatus.ERROR, "SecurityException during creation of IDomainLoadingStrategy for: "+ domain,e); - } catch (InvocationTargetException e) { - JSFCommonPlugin.log(IStatus.ERROR, "InvocationTargetException during creation of IDomainLoadingStrategy for: "+ domain,e); - } catch (NoSuchMethodException e) { - JSFCommonPlugin.log(IStatus.ERROR, "NoSuchMethodException during creation of IDomainLoadingStrategy for: "+ domain,e); - } - return null; - } - - private Class getLoadingStrategy() { - if (strategy == null){ - strategy = JSFCommonPlugin.loadClass(loadingStrategyClassName, bundleId); - } - return strategy; - } - - } - -}
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java deleted file mode 100644 index dd623ca5d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java +++ /dev/null @@ -1,235 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * Implementation of a {@link IDomainSourceModelType} descriptor. - * Responsible for producing instances of {@link IDomainSourceModelType}. - * Also responsible for creating the {@link IMetaDataTranslator} descriptors from the - * <code>com.eclipse.jst.jsf.common.domainSourceModelTypeTranslators</code> ext-pt - */ -public class DomainSourceModelTypeDescriptor { - private static final String TRANSLATORS_EXTENSION_POINT_ID = "domainSourceModelTypeTranslators"; //$NON-NLS-1$ - private static final String STANDARD_FILE_NULL_TRANSLATOR = "org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFilesTranslator"; //$NON-NLS-1$ - private String domain = "DEFAULT"; //$NON-NLS-1$ - private String domainSourceModelTypeId; - private String locatorClassName = "org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataLocator"; //$NON-NLS-1$ - private Set translatorDescriptors; - private String bundleId = JSFCommonPlugin.PLUGIN_ID; - private int ordinal; - - /** - * Constructor - * @param domain - * @param domainSourceModelTypeId - * @param locatorClassName - * @param bundleId - * @param ordinal - */ - public DomainSourceModelTypeDescriptor(String domain, String domainSourceModelTypeId, String locatorClassName, String bundleId, int ordinal){ - this.domain = domain; - this.locatorClassName = locatorClassName; - this.domainSourceModelTypeId = domainSourceModelTypeId; - this.bundleId = bundleId; - this.ordinal = ordinal; - init(); - } - - /** - * Default model type descriptor that will load only standard metadata files - */ - public DomainSourceModelTypeDescriptor(){ -// getTranslatorDescriptors(); - //createTranslatorInstances() will add the standard null translator - } - - private synchronized void init() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, TRANSLATORS_EXTENSION_POINT_ID ); - if (point != null) { - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element = elements[i]; - String srcHdlrId = element.getAttribute("domainSourceModelTypeId"); //$NON-NLS-1$ - if (srcHdlrId.equals(domainSourceModelTypeId)) - addTranslatorDescriptor(element); - } - } - } - - private void addTranslatorDescriptor(IConfigurationElement element) { - String translator = element.getAttribute("translatorClass"); //$NON-NLS-1$ - DomainSourceModelTranslatorDescriptor d = new DomainSourceModelTranslatorDescriptor(translator, element.getContributor().getName()); - getTranslatorDescriptors().add(d); - } - - private Set getTranslatorDescriptors(){ - if (translatorDescriptors == null){ - translatorDescriptors = new HashSet(); - } - return translatorDescriptors; - } - - /** - * @return domain - */ - public String getDomain() { - return domain; - } - - /** - * @return new instance of the {@link IDomainSourceModelType} - */ - public IDomainSourceModelType getInstance(){ - return new DomainSourceModelTypeImpl(); - } - - /** - * Internal class implementing {@link IDomainSourceModelType} - */ - class DomainSourceModelTypeImpl implements IDomainSourceModelType{ - - private Set translators; - private IMetaDataLocator locator; - - DomainSourceModelTypeImpl(){ - // restrict construction to package scope - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getDomain() - */ - public String getDomain() { - return domain; - } - - /** - * @return value of ordinal defined by the ext-pt used for ordering source types for a domain - */ - public int getOrdinal(){ - return ordinal; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getLocator() - */ - public IMetaDataLocator getLocator(IProject project) { - if (locator == null){ - locator = MetaDataLocatorFactory.getInstance().getLocator(locatorClassName, bundleId, project); - } - - return locator; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getTranslators() - */ - public Set getTranslators() { - if (translators == null){ - translators = createTranslatorInstances(); - } - return translators; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString(){ - StringBuffer buf = new StringBuffer("DomainSourceModelTypeImpl"); //$NON-NLS-1$ - buf.append("(domain = "); //$NON-NLS-1$ - buf.append(getDomain()); - buf.append(", locator = "); //$NON-NLS-1$ - buf.append(locator != null ? locator.toString() : "null"); //$NON-NLS-1$ - buf.append(")"); //$NON-NLS-1$ - return buf.toString(); - } - - private Set createTranslatorInstances() { - translators = new HashSet/*<IMetaDataTranslator>*/(); - if (getTranslatorDescriptors().size() == 0){// for TagLibDomain, we are adding null translator via extension (as of 7/16/07) - //would get here if a domain and source type was defined without a domain translator. Should not happen, but - //add Null Translator for now.... - //we could/should raise exception. - //Developers should add a STANDARD_FILE_NULL_TRANSLATOR if using standard metadata format. - Class klass = JSFCommonPlugin.loadClass(STANDARD_FILE_NULL_TRANSLATOR, JSFCommonPlugin.PLUGIN_ID); - try { - translators.add(klass.newInstance()); - return translators; - } catch (InstantiationException e) { - // TODO: other error handling? - JSFCommonPlugin.log(e, "Error in createTranslatorInstances(STANDARD_FILE_NULL_TRANSLATOR)"); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - // TODO: other error handling? - JSFCommonPlugin.log(e, "Error in createTranslatorInstances(STANDARD_FILE_NULL_TRANSLATOR)"); //$NON-NLS-1$ - } - - } - - Iterator/*<DomainSourceModelTranslatorDescriptor>*/it = getTranslatorDescriptors().iterator(); - while (it.hasNext()){ - DomainSourceModelTranslatorDescriptor d = (DomainSourceModelTranslatorDescriptor)it.next(); - Class klass = JSFCommonPlugin.loadClass(d.getTranslator(), d.getBundleId()); - try { - translators.add(klass.newInstance()); - } catch (InstantiationException e) { - // TODO: other error handling? - JSFCommonPlugin.log(e, "Error in createTranslatorInstances"); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - // TODO: other error handling? - JSFCommonPlugin.log(e, "Error in createTranslatorInstances"); //$NON-NLS-1$ - } - } - return translators; - } - - } - - /** - * Internal class implementing a descriptor for DomainSourceModelTranslators - */ - static class DomainSourceModelTranslatorDescriptor { - - private String _translator; - private String _bundleId; - - /** - * Constructor - * @param translator - * @param bundleId - */ - public DomainSourceModelTranslatorDescriptor(String translator, String bundleId) { - this._translator = translator; - this._bundleId = bundleId; - } - - String getTranslator(){ - return _translator; - } - - String getBundleId(){ - return _bundleId; - } - - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java deleted file mode 100644 index 000fdef91..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java +++ /dev/null @@ -1,139 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.internal.DomainSourceModelTypeDescriptor.DomainSourceModelTypeImpl; - -/** - * Registry of Domain Source Types loaded from domainSourceModelTypes ext-pt. - */ -public class DomainSourceTypesRegistry{ - private static final String EXTENSION_POINT_ID = "domainSourceModelTypes"; //$NON-NLS-1$ - private static DomainSourceTypesRegistry INSTANCE; - private Map/*<String, List/*<DomainSourceModelTypeDescriptor>>*/ domainSourceTypeDescriptors; - - private DomainSourceTypesRegistry(){ - init(); - } - - /** - * @return singleton instance of DomainSourceTypesRegistry - */ - public synchronized static DomainSourceTypesRegistry getInstance() { - if (INSTANCE == null){ - INSTANCE = new DomainSourceTypesRegistry(); - } - return INSTANCE; - } - - /** - * @param domain identifier - * @return list of <code>IDomainSourceModelType</code> sorted in descending order by ordinal - */ - public List/*<IDomainSourceModelType>*/ getDomainSourceTypes(String domain){ - List/*<DomainSourceModelTypeDescriptor>*/ list = getDomainSourceModelDescriptors(domain); - List/*<IDomainSourceModelType>*/ types = new ArrayList/*<IDomainSourceModelType>*/(); - for(Iterator/*<DomainSourceModelTypeDescriptor>*/ it=list.iterator();it.hasNext();){ - DomainSourceModelTypeDescriptor d = (DomainSourceModelTypeDescriptor)it.next(); - types.add(d.getInstance()); - } - //default sort descending by ordinal - Collections.sort(types, new Comparator(){ - public int compare(Object o1, Object o2) { - DomainSourceModelTypeImpl desc1 = (DomainSourceModelTypeImpl)o1; - DomainSourceModelTypeImpl desc2 = (DomainSourceModelTypeImpl)o2; - if (desc1.getOrdinal() == desc2.getOrdinal()) - return 0; - if (desc1.getOrdinal() > desc2.getOrdinal()) - return -1; - - return 1; - } - - }); - - return types; - } - - private List getDomainSourceModelDescriptors(String domain) { - List ret = (List)getDescriptors().get(domain); - if (ret != null && ret.size()>0) - return ret; - - return getDefaultSourceModelDescriptor(); - } - - private List getDefaultSourceModelDescriptor() { - List ret = new ArrayList(); - DomainSourceModelTypeDescriptor desc = new DomainSourceModelTypeDescriptor(); - ret.add(desc); - return ret; - } - - private synchronized void init() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID ); - if (point != null) { - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - IConfigurationElement element = elements[i]; - addDomainSourceTypeDescriptor(element); - } - } - } - - private void addDomainSourceTypeDescriptor(IConfigurationElement element) { - String domainId = element.getAttribute("domainId"); //$NON-NLS-1$ - String srcHdlrId = element.getAttribute("domainSourceModelTypeId"); //$NON-NLS-1$ - String locator = element.getAttribute("locator"); //$NON-NLS-1$ - String ordinalStr = element.getAttribute("ordinal"); //$NON-NLS-1$ - int ordinal = 1; - if (ordinalStr!=null && !ordinalStr.equals("")){ //$NON-NLS-1$ - ordinal = Integer.parseInt(ordinalStr); - } - DomainSourceModelTypeDescriptor d = new DomainSourceModelTypeDescriptor(domainId, srcHdlrId, locator, element.getContributor().getName(), ordinal); - List/*<DomainSourceTypeDescriptor>*/ descs = (List)getDescriptors().get(domainId); - if (descs == null){ - descs = new ArrayList/*<DomainSourceTypeDescriptor>*/(); - getDescriptors().put(domainId, descs); - } - descs.add(d); - } - - private Map/*<String, List/*<DomainSourceTypeDescriptor>>*/ getDescriptors() { - if (domainSourceTypeDescriptors == null){ - domainSourceTypeDescriptors = new HashMap/*<String, List/*<DomainSourceTypeDescriptor>>*/(); - } - return domainSourceTypeDescriptors; - } - -// private Map/*<String, List/*<IDomainSourceModelType>>*/ getDomainSourceTypes() { -// if (domainSourceTypes == null){ -// domainSourceTypes = new HashMap/*<String, List/*<IDomainSourceModelType>>*/(); -// } -// return domainSourceTypes; -// } - -}
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java deleted file mode 100644 index 6c8169616..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Provides class loading by using the plugin's classloader that defined an item of metadata - */ -public interface IClassLoaderProvider { - /** - * @param className - * @return Class - implementers should eat exceptions and return null whenever class cannot be returned - */ - public Class loadClass(String className); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java deleted file mode 100644 index ee21e6249..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - - -/** - * Defines a strategy to use for loading a standard metadata model for a certain domain. - * see <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt - */ -public interface IDomainLoadingStrategy { - - /** - * Create a merged "standard" metadata model. - * @param model to load - * - */ - public void load(MetaDataModel model); - - /** - * Reload a merged "standard" metadata model. - * Allows for some optimization for reload. - * @throws ModelNotSetException - * - */ - public void reload() throws ModelNotSetException; - - - /** - * Opportunity to cleanup and should be called when strategy is being destroyed - */ - public void cleanup(); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java deleted file mode 100644 index 67ed29214..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.Set; - -import org.eclipse.core.resources.IProject; - -/** - * Binds a domain of metadata to a source model type which is defined by a {@link IMetaDataLocator} - * and set of {@link IMetaDataTranslator}s - * Not intended to be implemented by clients. Created from ext-pts. - */ -public interface IDomainSourceModelType { - /** - * @return domain id - */ - public String getDomain(); - /** - * @param project - may be null - * @return instance of IMetaDataLocator - may return null if the locator cannot operate in the current context - */ - public IMetaDataLocator getLocator(IProject project); -// public int getOrdinal(); - /** - * @return set of {@link IMetaDataTranslator}s for the domain source model type - */ - public Set/*<IMetaDataTranslator>*/ getTranslators(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java deleted file mode 100644 index 9405a6a64..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.jface.resource.ImageDescriptor; - -/** - * Provides image descriptors relative to the plugin that provided the image metadata - * - */ -public interface IImageDescriptorProvider { - /** - * @param imagePath - * @return ImageDescriptor - implementers should eat exceptions and return null whenever imageDescriptor cannot be returned - */ - public ImageDescriptor getImageDescriptor(String imagePath); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java deleted file mode 100644 index 29c6ce13f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Experimental and not used at the moment. - * - */ -public interface IMetaDataChangeNotificationEvent { - //change to enums if we do Java5 - /** - * TODO: - */ - public static final int ADDED = 1; - /** - * TODO: - */ - public static final int REMOVED = 2; - /** - * TODO: - */ - public static final int CHANGED = 3; - - /** - * @return the uri - */ - public String getURI(); - /** - * @return when to the event types above - */ - public int getEventType(); - /** - * @return the meta-data locator - */ - public IMetaDataLocator getLocator(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java deleted file mode 100644 index ffdbd62ce..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.List; - -/** - * Locates instances of metadata of a specific source model type - */ -public interface IMetaDataLocator { - /** - * @param uri - * @return a list of <code>IMetaDataModelProvider</code>s for the uri located by this instance - */ - public List/*<IMetaDataModelProvider>*/ locateMetaDataModelProviders(String uri); - - /** - * Opportunity for service to start (add listeners, etc.). - * Framework calls this immediately after construction and all setup should occur at this time. - */ - public void startLocating(); - /** - * Stop looking for instances of metadata model sources. An opportunity to cleanup. - */ - public void stopLocating(); - - /** - * @param observer add a {@link IMetaDataObserver} of this locator - */ - public void addObserver(IMetaDataObserver observer); - /** - * @param observer remove a {@link IMetaDataObserver} of this locator - */ - public void removeObserver(IMetaDataObserver observer); - - /** - * @return IDomainSourceModelType instance that created this locator - */ - public IDomainSourceModelType getDomainSourceModelType(); - /** - * @param domainSourceModelType set the domainSourceModelType instance that created this locator - */ - public void setDomainSourceModelType(IDomainSourceModelType domainSourceModelType); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java deleted file mode 100644 index d579a630d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.Trait; - - -/** - * Helper class interface to merge source models into a single merged model. - * Not intended to be implemented by clients - * - */ -public interface IMetaDataModelMergeAssistant { - /** - * @return merged model - */ - public MetaDataModel getMergedModel(); - /** - * Method that will first check to see if an entity with the same id exists in the merged model. - * If not, it will add it. The entities includeGroups are then also merged. - * @param entity - * @return flag indicating whether or not the entity was new and therefore added to the merged model - * - */ - public boolean addEntity(Entity entity); - /** - * Method will add an entity if not already existing in the merged model, and then check for an existing trait by id on the merged model's entity. - * @param entity - * @param trait - * @return flag indicating whether or not the traits was new and therefore added to the merged model's entity - */ - public boolean addTrait(Entity entity, Trait trait); - - /** - * Method will add an entityGroup to the model if not already exiting in the merged model (by id). - * @param entityGroup - */ - public void addEntityGroup(EntityGroup entityGroup); - /** - * Signal that the merge is complete so that any post-processing may occur. - * This should be the last call made on the merge assistant and should be done before client calls for the merged model result. - * This should signal that entityGroups processing should begin. - */ - public void setMergeComplete(); - - /** - * @param mds - {@link IMetaDataSourceModelProvider} - */ - public void setSourceModelProvider(IMetaDataSourceModelProvider mds); - /** - * @return {@link IMetaDataSourceModelProvider} for current operation - */ - public IMetaDataSourceModelProvider getSourceModelProvider(); - - /** - * @param queryRoot - * @param entityKey - key relative to queryRoot - * @return entity - will return null if not found - */ - public Entity getMergedEntity(Entity queryRoot, String entityKey); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java deleted file mode 100644 index 69152d34d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Allows {@link IMetaDataObserver}s to observe changes. - * Experimental. - * - */ -public interface IMetaDataObservable { - /** - * Add the observer to the set of observers. Has no effect if - * the same observer is already registered - * - * @param observer - */ - public void addObserver(IMetaDataObserver observer); - - /** - * Remove the observer from the set of observers. Has no effect - * if observer was not already registered. - * - * @param observer must not be null - */ - public void removeObserver(IMetaDataObserver observer); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java deleted file mode 100644 index 5a138a33a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Interface for notification when an {@link IMetaDataObservable} changes - * - */ -public interface IMetaDataObserver { - /** - * Callback to observer when an {@link IMetaDataObservable} throws an event - * @param event - */ - public void notifyMetadataChanged(IMetaDataChangeNotificationEvent event); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java deleted file mode 100644 index 6a19c3bb0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.core.runtime.IAdaptable; - - -/** - * Provides a source of metadata that can be transformed into a merged standard model - * LIKELY TO CHANGE - */ -public interface IMetaDataSourceModelProvider extends IAdaptable{ - /** - * @return the source model - */ - public Object getSourceModel(); - /** - * @return the IMetaDataLocator instance that located this model provider instance - */ - public IMetaDataLocator getLocator(); - /** - * @param locator instance that located this model provider instance - */ - public void setLocator(IMetaDataLocator locator); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java deleted file mode 100644 index 2a7f6e2e9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Translate from the source model metadata structure into a standard metadata domain of metadata. - * - */ -public interface IMetaDataTranslator { - /** - * @param assistant perform translation using the IMetaDataModelMergeAssistant - */ - public void translate(IMetaDataModelMergeAssistant assistant); - /** - * @param modelProvider - cannot be null - * @return true if this translator can translate this model source - */ - public boolean canTranslate(IMetaDataSourceModelProvider modelProvider); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java deleted file mode 100644 index 0f0ed7125..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.core.resources.IProject; - -/** - * A <code>IMetaDataLocator</code> that is sensitive to the project context - */ -public interface IPathSensitiveMetaDataLocator extends IMetaDataLocator { - /** - * @param project - */ - public void setProjectContext(IProject project); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java deleted file mode 100644 index 640da3540..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.ResourceBundle; - -/** - * Provides the resource bundle from the plugin that defined an item of metadata. - */ -public interface IResourceBundleProvider { - /** - * @return ResourceBundle - implementers should eat exceptions and return null whenever resourceBundle cannot be returned - */ - public ResourceBundle getResourceBundle(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java deleted file mode 100644 index f82d0fbe4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - */ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.net.URL; - -/** - * Provides absolute URLs from resource path, which is relative to the plug-in - * with the metadata that specified the resource path. - * - * @author Ian Trimble - Oracle - */ -public interface IResourceURLProvider { - - /** - * Get absolute URL for resource path, which is relative to the plug-in that - * specified the resource metadata. - * - * @param resourcePath Path to resource, relative to metadata plug-in. - * @return Absolute URL for resource path. - */ - public URL getResourceURL(String resourcePath); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java deleted file mode 100644 index 02270a31d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - - -/** - * Represents the metadata file defined by the StandardMetaDataFile extension-point - * Not intended to be implemented by clients - */ -public interface IStandardMetaDataSourceInfo { - /** - * @return location of metadata file that the locator class will use - */ - public String getLocation(); - /** - * @return bundle id of plugin defining the metadata file - */ - public String getBundleId(); - /** - * @return class name of the locator that will find the the standard metadata file - */ - public String getLocatorClassname(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java deleted file mode 100644 index 9aeb8b4b0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.List; - - -/** - * Strategy for loading tag metadata. Extends and uses the default {@link DomainLoadingStrategy}. - * Mainly exists for illustrative purposes. Could be removed.. - */ -public class JSPTagLibDomainLoadingStrategy extends DomainLoadingStrategy { - - /** - * Constructor - * @param domain - */ - public JSPTagLibDomainLoadingStrategy(String domain) { - super(domain); - } - - /*@Override*/ - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.DomainLoadingStrategy#sortSourceTypes(java.util.List) - */ - protected void sortSourceTypes(List/*<IDomainSourceType>*/ sourceTypes) { - //an opportunity to override the priority of the source types... - } - - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java deleted file mode 100644 index 74fd0a7b2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.osgi.util.NLS; - -/** - * Externalized strings for Metadata - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.metadata.internal.messages"; //$NON-NLS-1$ - - /** - * Property key not found in bundle - */ - public static String Key_not_found; - - /** - * Missing resource - */ - public static String MissingResource_exception; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // no external instantiation - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java deleted file mode 100644 index 8ecc17df6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Experimental. Subject to change. - * - */ -public class MetaDataChangeNotificationEvent implements - IMetaDataChangeNotificationEvent { - - private String _uri; - private IMetaDataLocator _locator; - private int _type; - - /** - * Constructor - * @param locator - * @param uri - * @param type - */ - public MetaDataChangeNotificationEvent(IMetaDataLocator locator, String uri, int type){ - this._locator = locator; - this._uri = uri; - this._type = type; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getEventType() - */ - public int getEventType() { - return _type; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getLocator() - */ - public IMetaDataLocator getLocator() { - return _locator; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getURI() - */ - public String getURI() { - return _uri; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java deleted file mode 100644 index a590590ec..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java +++ /dev/null @@ -1,169 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * Creates instances of IMetaDataLocators and caches them so that there is only one instance of a particular locator - * when client requests one. - */ -public class MetaDataLocatorFactory - implements IResourceChangeListener { - - private static MetaDataLocatorFactory INSTANCE = null; - private Map<String, IMetaDataLocator> _locators; - - private static final boolean DEBUG = false; - /** - * @return singleton instance of the MetaDataLocatorFactory - */ - public synchronized static MetaDataLocatorFactory getInstance(){ - if (INSTANCE == null){ - INSTANCE = new MetaDataLocatorFactory(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(INSTANCE, IResourceChangeEvent.PRE_CLOSE); - } - return INSTANCE; - } - - - - private Map<String, IMetaDataLocator> getLocators() { - if (_locators == null){ - _locators = new HashMap<String, IMetaDataLocator>(); - } - return _locators; - } - - /** - * @param locatorClassName - may NOT be null - * @param bundleId - may NOT be null - * @param project - may be null - * @return shared instance of IMetaDataLocator - * may return null if is IPathSensitiveMetaDataLocator and there is no project context - */ - public IMetaDataLocator getLocator(final String locatorClassName, final String bundleId, final IProject project){ - final Class klass = JSFCommonPlugin.loadClass(locatorClassName, bundleId); - String key = getKey(locatorClassName, bundleId); - IMetaDataLocator locator = null; - try { - IMetaDataLocator tempLocator = (IMetaDataLocator)klass.newInstance(); - if (tempLocator != null) { - if (tempLocator instanceof IPathSensitiveMetaDataLocator) { - if (project == null) - return null; - - key = getKey(locatorClassName, project.getName()); - } - - locator = getLocators().get(key); - if (locator == null) { - locator = tempLocator; - if (locator instanceof IPathSensitiveMetaDataLocator) - ((IPathSensitiveMetaDataLocator)locator).setProjectContext(project); - - if (DEBUG) - System.out.println("Created locator: "+locator.toString()); //$NON-NLS-1$ - - getLocators().put(key, locator); - locator.startLocating(); - } - } - } catch (InstantiationException e) { - JSFCommonPlugin.log(IStatus.ERROR, "Could not instantiate IMetaDataLocator: "+key, e); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException while creating IMetaDataLocator: "+key, e); //$NON-NLS-1$ - } - - return locator; - } - - /** - * @param locatorClassName - * @param contextId - this may be the bundleID or the projectName if it is a path sensitive locator - * @return key - */ - private String getKey(final String locatorClassName, final String contextId) { - StringBuffer buf = new StringBuffer(contextId); - buf.append(":"); //$NON-NLS-1$ - buf.append(locatorClassName); - return buf.toString(); - } - - /** - * Stops and disposes all locators - */ - public void dispose(){ - ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); - for (Iterator it=getLocators().values().iterator();it.hasNext();){ - IMetaDataLocator locator = (IMetaDataLocator)it.next(); - locator.stopLocating(); - } - getLocators().clear(); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org - * .eclipse.core.resources.IResourceChangeEvent) - */ - public void resourceChanged(final IResourceChangeEvent event) { - if (event.getType() == IResourceChangeEvent.PRE_CLOSE - || event.getType() == IResourceChangeEvent.PRE_DELETE) { - // a project is closing - release and cleanup - final IProject aProject = (IProject) event.getResource(); - - if (aProject != null) { - List<String> locatorsToRemove = new ArrayList<String>(); - for (Iterator it=getLocators().keySet().iterator();it.hasNext();){ - String key = (String)it.next(); - if (locatorIsForProject(key, aProject.getName())) { - locatorsToRemove.add(key); - } - } - - if (! locatorsToRemove.isEmpty()) { - for (String key : locatorsToRemove) { - IMetaDataLocator locator = getLocators().get(key); - - if (DEBUG) - System.out.println("Removed locator: "+locator.toString()); //$NON-NLS-1$ - - locator.stopLocating(); - getLocators().remove(key); - } - } - } - } - } - - private boolean locatorIsForProject(final String key, final String projectName) { - StringTokenizer t = new StringTokenizer(key, ":"); //$NON-NLS-1$ - String contextId = t.nextToken(); - if (contextId.equals(projectName)) - return true; - return false; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java deleted file mode 100644 index 413048c85..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.jst.jsf.common.metadata.Model; - -/** - * Responsible for loading and holding onto the standard metadata model using the IDomainLoadingStrategy. - * Wraps the model (root) with the strategy used for loading it, along with the identifying key (modelKeyDescriptor) - */ -public class MetaDataModel { - - private Object root; - private ModelKeyDescriptor modelKeyDescriptor; - private IDomainLoadingStrategy strategy; - private boolean refresh; - - /** - * Constructor - * @param key - * @param strategy - */ - public MetaDataModel(ModelKeyDescriptor key, IDomainLoadingStrategy strategy){ - this.modelKeyDescriptor = key; - this.strategy = strategy; - } - - /** - * @return the root of the model. - */ - public Object getRoot(){ - return root; - } - - /** - * @param root - */ - public void setRoot(Object root){ - this.root = root; - if (root != null) - ((Model)root).setCurrentModelContext(modelKeyDescriptor); - } - - /** - * @return ModelKeyDescriptor for this model - */ - public ModelKeyDescriptor getModelKey(){ - return modelKeyDescriptor; - } - -// public void accept(IEntityVisitor visitor){ -// if (getRoot() instanceof Model) -// visitor.visit((Model)getRoot()); -// } - - /** - * @return true if the model is null or is not, in fact, a {@link Model} - */ - public boolean isEmpty() { - if (root == null || !(root instanceof Model)) - return true; - - return false; - } - - /** - * Load the model. Delegates to the strategy. - */ - public synchronized void load(){ - StandardModelFactory.debug("> Begin Loading: "+getModelKey(), StandardModelFactory.DEBUG_MD_LOAD); - strategy.load(this); - StandardModelFactory.debug("> End Loading: "+getModelKey(),StandardModelFactory.DEBUG_MD_LOAD); - } - - /** - * Reloads the model delegating to strategy reload - * @throws ModelNotSetException - */ - public void reload()throws ModelNotSetException{ - setRoot(null); - refresh = false; - strategy.reload(); - } - - /** - * @return flag indicating that the model is stale - */ - public boolean needsRefresh() { - return refresh; - } - - /** - * Flag that model is stale - */ - public void setNeedsRefresh() { - refresh = true; - } - - /** - * Cleans up the model releasing references. - */ - public void cleanup(){ - if (strategy != null) - strategy.cleanup(); - strategy = null; - root = null; - modelKeyDescriptor = null; - } - - public String toString() { - StringBuffer buf = new StringBuffer("MetaDataModel: "); - buf.append(getModelKey()); - return buf.toString(); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java deleted file mode 100644 index 03a99fadd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; - -/** - * Simple implementation of {@link IMetaDataModelContext} - * - */ -public class MetaDataModelContextImpl implements IMetaDataModelContext, Cloneable { - private final String _domain; - - /** - * Constructor - * @param domain id - */ - public MetaDataModelContextImpl(final String domain){ - _domain = domain; - } - - public String getDomainID() { - return _domain; - } - - public Object getAdapter(final Class adapter) { - if (IMetaDataModelContext.class.equals(adapter)) - return this; - return null; - } - - @Override - protected Object clone() throws CloneNotSupportedException { - return super.clone(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java deleted file mode 100644 index d3cc95a05..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java +++ /dev/null @@ -1,309 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.ISafeRunnable; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.QualifiedName; -import org.eclipse.jface.util.SafeRunnable; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext; - -/** - * Singleton instance for each IProject used to manage all standard metdata models for that project. - * - * Manager is responsible for loading and caching MetaDataModels. Models are keyed by URI. - * - * The manager listens for project closing resource events so that the resources can be freed up. - */ -public class MetaDataModelManager implements IResourceChangeListener{ - /** - * Key that is used for the IProject instance's session property that - * holds a MetaDataModelManager instance. Each project will have it's own instance of a model manager. - */ - public static final QualifiedName KEY_SESSIONPROPERTY = - new QualifiedName(null, "MetaDataModelManager"); //$NON-NLS-1$ FIX ME - - private static MetaDataModelManager SHARED_INSTANCE; - - // used to lock all instance calls for getModel - private static final Object GLOBAL_INSTANCE_LOCK = new Object(); - private final ModelMap models; - private final IProject project; - - - /** - * @return instance that is project agnostic. * may get removed * - */ - public synchronized static MetaDataModelManager getSharedInstance(){ - if (SHARED_INSTANCE == null) { - SHARED_INSTANCE = new MetaDataModelManager(null); - } - return SHARED_INSTANCE; - } - - /** - * @param project - * @return instance of the model manager for this project. Shouldn't, but may, return null. - */ - public synchronized static MetaDataModelManager getInstance(final IProject project){ - MetaDataModelManager repo = null; - repo = getFromSessionProperty(project); - if (repo == null) { - repo = new MetaDataModelManager(project); - ResourcesPlugin.getWorkspace().addResourceChangeListener(repo, IResourceChangeEvent.PRE_CLOSE); - } - return repo; - } - private MetaDataModelManager(final IProject project) { - this.project = project; - models = new ModelMap(); - setAsSessionProperty(); - } - - /** - * @param project - * @return MetaDataModelManager instance for the project - */ - private static MetaDataModelManager getFromSessionProperty(final IProject project) { - MetaDataModelManager repo = null; - try { - Object obj = project.getSessionProperty(KEY_SESSIONPROPERTY); - if (obj instanceof MetaDataModelManager) { - repo = (MetaDataModelManager)obj; - } - } catch(CoreException ce) { - JSFCommonPlugin.log(IStatus.ERROR, "Internal Error: Unable to recover MetaDataModelManager for: "+project.getName(), ce); //$NON-NLS-1$ - } - return repo; - } - - /** - * Sets this MetaDataModelManager instance as a session property of its - * IProject instance. - */ - private void setAsSessionProperty() { - if (project != null) {//&& project.isAccessible()) { - try { - project.setSessionProperty(KEY_SESSIONPROPERTY, this); - } catch(CoreException ce) { - JSFCommonPlugin.log(IStatus.ERROR, "Internal Error: Unable to store MetaDataModelManager for: "+project.getName(), ce); //$NON-NLS-1$ } - } - } - } - - /** - * Releases a project's MetaDataModelManager instance by removing from project session property - * @param aProject - */ - private void removeAsSessionProperty(IProject aProject){ - try { - ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); - aProject.setSessionProperty(KEY_SESSIONPROPERTY, null); - } catch (CoreException e) { - JSFCommonPlugin.log(e, "Error removing session property"); //$NON-NLS-1$ - } - } - - /** - * Will locate the cached MetaDataModel. Sets the model context in the - * model. - * - * @param modelContext - * @return the MetaDataModel for the given ITaglibDomainMetaDataModelContext - */ - public MetaDataModel getModel( - final ITaglibDomainMetaDataModelContext modelContext) { - synchronized (GLOBAL_INSTANCE_LOCK) { - ModelKeyDescriptor modelKeyDescriptor = StandardModelFactory.getInstance().createModelKeyDescriptor(modelContext); - - StandardModelFactory.debug(">START getModel: "+modelKeyDescriptor, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$ - - MetaDataModel model = models.get(modelKeyDescriptor); - if (model == null || project == null) { //<--- why is the project == null test here?!?! - // long in = System.currentTimeMillis(); - model = loadMetadata(modelKeyDescriptor); - //System.out.println("Time to load "+modelContext.getURI()+": "+ - // String.valueOf(System.currentTimeMillis() - in)); - } else if (model.needsRefresh()) { - try { - model.reload(); - } catch (ModelNotSetException e) { - // simply load it - should not get here - model = loadMetadata(modelKeyDescriptor); - } - } - if (model != null && model.getRoot() != null) - ((Model) model.getRoot()) - .setCurrentModelContext(modelKeyDescriptor); - - StandardModelFactory.debug(">END getModel: "+modelKeyDescriptor, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$ - return model; - } - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org - * .eclipse.core.resources.IResourceChangeEvent) - */ - public void resourceChanged(IResourceChangeEvent event) { - if (event.getType() == IResourceChangeEvent.PRE_CLOSE - || event.getType() == IResourceChangeEvent.PRE_DELETE) { - // a project is closing - release and cleanup - final IProject aProject = (IProject) event.getResource(); - if (aProject != null && aProject.equals(this.project)) { - SafeRunnable.run(new ISafeRunnable() { - - public void handleException(Throwable exception) { - JSFCommonPlugin.log(exception); - } - - public void run() throws Exception { - models.dispose(); - removeAsSessionProperty(project); - } - }); - } - } - } - - private MetaDataModel loadMetadata(ModelKeyDescriptor modelKeyDescriptor) { - if (!Thread.holdsLock(GLOBAL_INSTANCE_LOCK)) { - JSFCommonPlugin - .log(IStatus.ERROR, - "Internal Error: loadMetadata must not be called if class lock not held"); //$NON-NLS-1$ - return null; - } - - IDomainLoadingStrategy strategy = DomainLoadingStrategyRegistry - .getInstance().getLoadingStrategy( - modelKeyDescriptor.getDomain()); - ; - if (strategy == null) { - JSFCommonPlugin - .log( - IStatus.ERROR, - "Internal Error: Unable to locate metadata loading strategy for: " + modelKeyDescriptor.toString()); //$NON-NLS-1$ - return null; - } - MetaDataModel model = StandardModelFactory.getInstance().createModel( - modelKeyDescriptor, strategy);// new MetaDataModel(modelKey, - // strategy); - model.load(); - addModel(model); - - return model; - } - - private void addModel(MetaDataModel model) { - if (model != null) - models.put(model); - } - - /** - * Map of models keyed by ModelKeyDescriptor (.toString()) - * - */ - private static class ModelMap - { - private final Map<String, MetaDataModel> map; - private final AtomicBoolean _isDisposed = new AtomicBoolean(false); - - ModelMap() { - map = new HashMap<String, MetaDataModel>(); - } - - /** - * @param model - * adds model to the map using the given key descriptor - */ - public void put(final MetaDataModel model) { - assert !_isDisposed.get(); - final String key = calculateKey(model); - synchronized (this) { - map.put(key, model); - } - } - - /** - * @param modelKeyDescriptor - * @return MetaDataModel for this ModelKeyDescriptor. May return null. - */ - public MetaDataModel get(final ModelKeyDescriptor modelKeyDescriptor) { - assert !_isDisposed.get(); - - final String key = calculateKey(modelKeyDescriptor); - - synchronized (this) - { - return map.get(key); - } - } - - /** - * @param model - * from the map - */ - public void remove(final MetaDataModel model) { - assert !_isDisposed.get(); - final String key = calculateKey(model); - synchronized(this) - { - map.remove(key); - } - } - - public void dispose() { - if (_isDisposed.compareAndSet(false, true)) { - synchronized(this) - { - for (final Iterator<Map.Entry<String, MetaDataModel>> it = map.entrySet().iterator(); it.hasNext();) - { - // System.out.println("kill mmModel: "+model.toString()); - final Map.Entry<String, MetaDataModel> entry = it.next(); - final MetaDataModel model = entry.getValue(); - - if (model != null) - { - model.cleanup(); - } - it.remove(); - } - } - } - } - - private String calculateKey(final MetaDataModel model) - { - return calculateKey(model.getModelKey()); - } - - private String calculateKey(final ModelKeyDescriptor modelKeyDescriptor) - { - return modelKeyDescriptor.toString(); - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java deleted file mode 100644 index 49f9aa4f7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java +++ /dev/null @@ -1,395 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.Iterator; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.emf.ecore.util.EcoreUtil.Copier; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.query.MetaDataException; -import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper; -import org.eclipse.jst.jsf.common.metadata.query.internal.SearchControl; -import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleEntityQueryVisitorImpl; -import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleResultSet; -import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleTraitQueryVisitorImpl; -import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl; -/** - * Implements {@link IMetaDataModelMergeAssistant} - * - * Responsible for merging source models into one. The first model in has subsequent - * entities and traits added to it. - * - * TODO - make locating of existing entities and traits in the merged model more efficient - * TODO - refactor out Taglibdomain-only aspects of include-group processing - * - */ -public class MetaDataModelMergeAssistantImpl implements - IMetaDataModelMergeAssistant { - - private MetaDataModel mergedModel; - private SimpleEntityQueryVisitorImpl entityVisitor; - private SimpleTraitQueryVisitorImpl traitVisitor; - private IMetaDataSourceModelProvider provider; - - /** - * Constructor. Queries with search control limited to first found. - * @param model - */ - public MetaDataModelMergeAssistantImpl(MetaDataModel model) { - this.mergedModel = model; - entityVisitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, - HierarchicalSearchControl.SCOPE_ALL_LEVELS)); - traitVisitor = new SimpleTraitQueryVisitorImpl(new SearchControl(1)); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#getMergedModel() - */ - public MetaDataModel getMergedModel() { - return mergedModel; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#getSourceModel() - */ - public IMetaDataSourceModelProvider getSourceModelProvider() { - return provider; - } - - public void setSourceModelProvider(IMetaDataSourceModelProvider provider) { - this.provider = provider; - } - - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntityGroup(org.eclipse.jst.jsf.common.metadata.EntityGroup) - */ - public void addEntityGroup(EntityGroup entityGroup) { - Model model = (Model)getMergedModel().getRoot(); - if (!isExistingEntityGroup(model, entityGroup)){ - model.getEntityGroups().add(entityGroup); - } - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntity(org.eclipse.jst.jsf.common.metadata.Entity) - */ - public boolean addEntity(final Entity entity) { - Entity mmEntity = getMergedEntity(entity); - if (mmEntity == null){ - addEntityAsNecessary((Entity)entity.eContainer(), entity); - return true; - } - addIncludeGroupsAsNecessary(mmEntity, entity); - return false; - } - - public Entity getMergedEntity(Entity queryRoot, String entityKey){ - Entity ret = null; - SimpleResultSet rs = (SimpleResultSet)entityVisitor.findEntities(queryRoot, entityKey); - try { - if (! rs.getResults().isEmpty()) - ret = (Entity)rs.getResults().get(0); - rs.close(); - } catch (MetaDataException e) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedEntity()", e); //$NON-NLS-1$ - } - return ret; - } - private void addIncludeGroupsAsNecessary(final Entity mmEntity, final Entity entity) { - for (Iterator it=entity.getIncludeGroups().iterator();it.hasNext();){ - IncludeEntityGroup grp = (IncludeEntityGroup)it.next(); - boolean found = false; - for (Iterator it2=mmEntity.getIncludeGroups().iterator();it2.hasNext();){ - IncludeEntityGroup grp2 = (IncludeEntityGroup)it2.next(); - if (grp2.equals(grp)){ - found = true; - break; - } - } - if (!found){//maybe we should clone and add - mmEntity.getIncludeGroups().add(grp); - } - } - } - - /** - * Checks to see if the entity (by id) is present in the mergedModel or not. - * If not, it will perform a copy of the entity and it's attributes using - * EcoreUtil.Copier. - * - * @param parent - * @param entity - * @return - */ - private Entity addEntityAsNecessary(final Entity parent, final Entity entity) { - Entity mmParent = null; - Entity mmEntity = null; - if (parent != null){ - mmParent = getMergedEntity(parent); - if (mmParent == null){ - mmParent = addEntityAsNecessary((Entity)entity.eContainer(), entity); - } - } - if (mmParent != null){ - mmEntity = addEntityInternal(mmParent, entity); - return mmEntity; - } - return mmEntity; - } - - private boolean isExistingEntityGroup(Model model, EntityGroup entityGroup) { - boolean found = false; - for(Iterator it=model.getEntityGroups().iterator();it.hasNext();){ - if (entityGroup.getId().equals(((EntityGroup)it.next()).getId())) - return true; - } - return found; - } - - private Entity getExistingChildEntity(final Entity parent, final Entity entity) { - for(Iterator it=parent.getChildEntities().iterator();it.hasNext();){ - Entity foundEntity = (Entity)it.next(); - if (entity.getId().equals(foundEntity.getId())) - return foundEntity; - } - return null; - } - - private /*synchronized*/ Entity addEntityInternal(final Entity parent, final Entity entity) { - Copier copier = new Copier(); - Entity mmEntity =(Entity)copier.copy(entity); - copier.copyReferences(); - parent.getChildEntities().add(mmEntity); - return mmEntity; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addTrait(org.eclipse.jst.jsf.common.metadata.Entity, org.eclipse.jst.jsf.common.metadata.Trait) - */ - public boolean addTrait(Entity entity, Trait trait) { - Entity returnedEntity = getMergedEntity(entity); - if (returnedEntity != null){ - return addTraitAsNecessary(returnedEntity, trait); - } - return false; - } - - - private boolean addTraitAsNecessary(Entity mergedEntity, Trait trait) { - Trait mmTrait = getMergedTrait(mergedEntity, trait); - if (mmTrait == null){ - addTraitInternal(mergedEntity, trait); - return true; - - } - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#setMergeComplete() - */ - public void setMergeComplete() { - Model model = (Model)getMergedModel().getRoot(); - if (model != null){ - StandardModelFactory.debug(">> Begin processIncludeGroups for: "+getMergedModel().getModelKey(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ - - processIncludeGroups(model); - - StandardModelFactory.debug(">> End processIncludeGroups for: "+getMergedModel().getModelKey(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ - } - } - - /** - * Copies the passed trait and adds it to the merged entity. - * The source model provider of the trait is then set on the trait so that - * the trait can know where it came from. - * - * @param parent - * @param trait - * @return merged Trait - */ - private Trait addTraitInternal(final Entity parent, final Trait trait) { - Copier copier = new Copier(); - Trait mmTrait =(Trait)copier.copy(trait); - copier.copyReferences(); - parent.getTraits().add(mmTrait); - //set the model key to know from where the trait came - mmTrait.setSourceModelProvider(trait.getSourceModelProvider()); - return mmTrait; - } - - /** - * Locates the entity in the merged model matching by id only. - * If not located, this method returns null; - * - * @param entity - * @return merged entity - */ - private Entity getMergedEntity(Entity entity){ - if (entity instanceof Model) - return (Entity)mergedModel.getRoot(); - - Entity ret = null; - String entityKey = getIdRelativeToRoot(entity); - SimpleResultSet rs = (SimpleResultSet)entityVisitor.findEntities((Entity)mergedModel.getRoot(), entityKey); - try { - if (! rs.getResults().isEmpty()) - ret = (Entity)rs.getResults().get(0); - rs.close(); - } catch (MetaDataException e) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedEntity()", e); //$NON-NLS-1$ - } - return ret; - } - - private String getIdRelativeToRoot(final Entity entity) { - Entity e = entity; - StringBuffer buf = new StringBuffer(); - while (e.eContainer() != null){ - buf.insert(0, e.getId()); - if (e.eContainer()!=null && e.eContainer().eContainer() != null) - buf.insert(0,"/"); //$NON-NLS-1$ - e = (Entity)e.eContainer(); - } - return buf.toString(); - } - - /** - * Locates the trait in the merged model matching by id only. - * If not located, this method returns null; - * - * @param entity - * @param trait - * @return merged Trait - */ - public Trait getMergedTrait(Entity entity, Trait trait){ - SimpleResultSet rs = (SimpleResultSet)traitVisitor.findTraits(entity, trait.getId()); - Trait ret = null; - try { - if (! rs.getResults().isEmpty()) - ret = (Trait)rs.getResults().get(0); - rs.close(); - } catch (MetaDataException e) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedTrait()", e); //$NON-NLS-1$ - } - return ret; - } - - private void processIncludeGroups(final Model root) { - addEntityGroupReferencesRecursively(root); - } - - private void addEntityGroupReferencesRecursively(final Entity entity) { - doIncludes(entity); - for (int i=0, size=entity.getChildEntities().size();i<size;i++){ - addEntityGroupReferencesRecursively((Entity)entity.getChildEntities().get(i)); - } - } - - private void doIncludes(final Entity entity){ - for (int j=0, groupsSize=entity.getIncludeGroups().size();j<groupsSize; j++){ - IncludeEntityGroup include = (IncludeEntityGroup)entity.getIncludeGroups().get(j); - if (include.getId() != null){ - //is this a local merge? - if (include.getModelUri() == null|| - (include.getModelUri() - .equals(getMergedModel() - .getModelKey().getUri())) ){ - EntityGroup eg = ((Model)getMergedModel().getRoot()).findIncludeGroup(include.getId()); - addIncludeRefs(entity, eg); - } else //external model include - addIncludeRefs(entity, include); - } - } - } - /* - * Adds traits and child entities from an external entity group to the passed entity - * @param entity - * @param include - */ - private void addIncludeRefs(final Entity entity, final IncludeEntityGroup include) { - ITaglibDomainMetaDataModelContext modelContext = new TaglibDomainMetaDataModelContextImpl( - getMergedModel().getModelKey().getDomain(), - getMergedModel().getModelKey().getProject(), - include.getModelUri() - ); - - Model externalModel = TaglibDomainMetaDataQueryHelper.getModel(modelContext); - if (externalModel != null){ - EntityGroup entityGroup = externalModel.findIncludeGroup(include.getId()); - addIncludeRefs(entity, entityGroup); - } - else { - JSFCommonPlugin.log(IStatus.ERROR, "Unable to load external metadata model refs for "+modelContext.getURI() //$NON-NLS-1$ - + " into "+ entity.getModel().getCurrentModelContext().getUri()); //$NON-NLS-1$ - } - } - - /* - * Adds traits and child entities from a local entity group to the passed entity if not already present for the entity. - * First - * @param entity - * @param entityGroup - */ - private void addIncludeRefs(final Entity entity, final EntityGroup entityGroup) { - if (entityGroup == null) - return; - - for (int i=0, size=entityGroup.getTraits().size();i<size;i++){ - addTrait(entity, (Trait)entityGroup.getTraits().get(i)); - } - - for (int i=0, size=entityGroup.getChildEntities().size();i<size;i++){ - traverseAndAddIncludes(entity, (Entity)entityGroup.getChildEntities().get(i)); - } - } - - private void traverseAndAddIncludes(final Entity parent, final Entity entity){ - Entity mergedEntity = addIncludedEntityAsNecessary(parent, entity); - - for (final Iterator/*<Trait>*/ it=entity.getTraits().iterator();it.hasNext();){ - Trait trait = (Trait)it.next(); - addTraitAsNecessary(mergedEntity, trait); - } - - for (final Iterator/*<EntityKey>*/ it=entity.getChildEntities().iterator();it.hasNext();){ - Entity e = (Entity)it.next(); - traverseAndAddIncludes(mergedEntity, e);//add as normal - } - - } - - /* - * Checks to see if the entity (by id) is present as a child entity in the parent or not. - * If not, it will add the entity to the childEntities without copying. - * - * @param parent - * @param entity - * @return Entity - */ - private Entity addIncludedEntityAsNecessary(final Entity parent, final Entity entity) { - Entity mergedEntity = getExistingChildEntity(parent, entity); - if (mergedEntity == null){ - mergedEntity = addEntityInternal(parent, entity); - } - return mergedEntity; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java deleted file mode 100644 index dda1cd4cc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.core.resources.IProject; - -/** - * Meta data model key descriptor used to lazily load a model when it is required - * - */ -public class ModelKeyDescriptor { - private final IProject project; - private final String domain; - private final String uri; - private final String key; - - /** - * Constructor - * @param project - * @param domain - * @param uri - */ - public ModelKeyDescriptor(IProject project, String domain, String uri){ - this.project = project; - this.domain = domain; - this.uri = uri; - String proj = project != null ? project.getName() : "Null"; //$NON-NLS-1$ - StringBuffer buf = new StringBuffer(proj); - buf.append(":"); //$NON-NLS-1$ - buf.append(domain); - buf.append(":"); //$NON-NLS-1$ - buf.append(uri); - key = buf.toString(); - } - - /** - * @return domain id - */ - public final String getDomain(){ - return domain; - } - - /** - * @return model uri - */ - public final String getUri(){ - return uri; - } - - /** - * @return project - */ - public final IProject getProject(){ - return project; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public final String toString(){ - return key; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java deleted file mode 100644 index 34b90b125..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Experimental - * - */ -public class ModelNotSetException extends Exception { - private static final long serialVersionUID = 1L; -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java deleted file mode 100644 index eef593724..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.osgi.framework.Bundle; - -/** - * Default implementation of StandardMetaDataSourceFileLocator that will locate standard metadata files - * and resource bundles relative to the plugin that registered the files using the - * <code>org.eclipse.jst.jsf.common.StandardMetaDataFiles</code> ext-pt. - * - */ -public class PluginRelativeStandardMetaDataSourceFileLocator extends StandardMetaDataSourceFileLocator{ - - private ResourceBundle resourceBundle; - - /* - * Returns InputStream of standard metadata file from plugin relative location. - * - */ - public InputStream getInputStream() throws IOException { - URL url = getURL(); - if (url != null) - return url.openStream(); - - String fileName = Path.fromOSString(fileInfo.getLocation()).toString() + " (Plugin: " + fileInfo.getBundleId()+")" ; - throw new FileNotFoundException("Metadata file not found: "+ fileName); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator#getURL() - */ - public URL getURL() { - final Bundle bundle = Platform.getBundle(fileInfo.getBundleId()); - if (bundle == null) - { - return null; - } - final IPath fromOSString = Path.fromOSString(fileInfo.getLocation()); - return FileLocator.find(bundle, fromOSString, null); - } - - - /* - * Returns property resource bundle if it exists. May return null. - * This implementation assumes that the basename of the bundle is the same - * as the source file name and in the same directory. - * - */ - public ResourceBundle getResourceBundle() throws IOException, MalformedURLException { - if (resourceBundle == null){ - URL bundleURL = getStandardMetaDataSourceFileBasenameURL(); - if (bundleURL == null) - return null; - - resourceBundle = ResourceBundleHelper.getResourceBundle(bundleURL); - } - return resourceBundle; - } - - private URL getStandardMetaDataSourceFileBasenameURL() { - IPath annotationPath = Path.fromOSString(fileInfo.getLocation()); - IPath annotationFolder = annotationPath.removeLastSegments(1); - IPath propertiesLocation = annotationPath.removeFirstSegments(annotationPath.segmentCount() - 1).removeFileExtension(); - // append location of properties file - IPath propertiesFile = annotationFolder.append(propertiesLocation); - - // append .properties extension if needed - if (propertiesFile.getFileExtension() == null) - propertiesFile = propertiesFile.addFileExtension("properties"); //$NON-NLS-1$ - // create a URL out of the properties file location - return FileLocator.find(Platform.getBundle(fileInfo.getBundleId()), - propertiesFile, null); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java deleted file mode 100644 index d96b267f8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - copied from org.eclipse.wst.sse.core.internal.encoding.util and modified heavily - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Locale; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; - -/** - * ResourceBundleHelper - * - */ -public final class ResourceBundleHelper { - - /** - * @param resourceURL - * @return ResourceBundle - * @throws MalformedURLException - may return null - * @throws IOException - */ - public static ResourceBundle getResourceBundle(final URL resourceURL) throws MalformedURLException, IOException { - return getResourceBundle(resourceURL, Locale.getDefault()); - } - - /** - * @param resourceURL - * @param targetLocale - * @return ResourceBundle - may return null - * @throws MalformedURLException - * @throws IOException - */ - public static ResourceBundle getResourceBundle(final URL resourceURL, final Locale targetLocale) throws MalformedURLException, IOException { - // try to load bundle from the location specified in the resourceURL - // - final String protocol = resourceURL.getProtocol(); - final String host = resourceURL.getHost(); - final String file = resourceURL.getFile(); - final IPath path = new Path(file); - - String dir = "./"; - final String bundleName = path.removeFileExtension().segment(path.segmentCount() - 1); - if (path.segmentCount() > 1) - { - dir = path.removeLastSegments(1).toString(); - } - - // create a class loader with a class path that points to the resource - // bundle's location - // - final URL[] classpath = new URL[1]; - classpath[0] = FileLocator.resolve(new URL(protocol, host, dir)); - // TODO: does this need to be in a doPrivileged block? - final ClassLoader resourceLoader = new URLClassLoader(classpath, null); - - return ResourceBundle.getBundle(bundleName, targetLocale, resourceLoader); - } - - private ResourceBundleHelper() - { - // no instantiation - } -} - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java deleted file mode 100644 index 5e6489d66..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -/** - * Contains information about annotation files. - */ -public final class StandardMetaDataFileInfo implements IStandardMetaDataSourceInfo{ - - private final String fileLocation; - private final String fileLocatorClassname; - private final String bundleId; - - /** - * Constructor - * @param fileLocation - * @param bundleId - * @param fileLocatorClassname - */ - public StandardMetaDataFileInfo( String fileLocation, String bundleId, String fileLocatorClassname) { - this.fileLocation = fileLocation.trim(); - this.bundleId = bundleId.trim(); - this.fileLocatorClassname = fileLocatorClassname; - } - - /** - * Get the location of the annotation file as originally specified. - * - * @return String - */ - public String getLocation() { - return fileLocation; - } - - /** - * Get the annotation file locator classname that must implement ICMAnnotationSourceFileLocator. - * Can return null or empty string. Caller should provide default. - * - * @return String - */ - public String getLocatorClassname() { - return fileLocatorClassname != null ? fileLocatorClassname.trim() : null; - } - - /** - * Get the bundle id of the plugin where the annotation file is located. - * - * @return String - */ - public String getBundleId() { - return bundleId; - } - - public String toString(){ - StringBuffer buf = new StringBuffer("StandardMetaDataFileInfo"); - buf.append(": "); - buf.append(bundleId); - buf.append("/"); - buf.append(fileLocation); - if (getLocatorClassname() != null){ - buf.append(": "); - buf.append(getLocatorClassname()); - } - return buf.toString(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java deleted file mode 100644 index 4252c8c0c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java +++ /dev/null @@ -1,311 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.common.util.URI; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper; - - -/** - * Registry of standard metadata files - */ -public final class StandardMetaDataFileRegistry { - private Map/*<String, List<IMetaDataSourceModelProvider>>*/ mdFilesMap = new HashMap/*<String, List<IMetaDataSourceModelProvider>>*/(1); - private List/*<IMetaDataSourceModelProvider>*/ EMPTY_LIST = new ArrayList/*<IMetaDataSourceModelProvider>*/(0); - - private static StandardMetaDataFileRegistry reg; - - /** - * @return the singleton instance of the registry - */ - public static StandardMetaDataFileRegistry getInstance() { - if (reg == null){ - reg = new StandardMetaDataFileRegistry(); - } - return reg; - } - - private StandardMetaDataFileRegistry() { - new StandardMetaDataFileRegistryReader(this).readRegistry(); - } - - /** - * @param uri as String - * @return list of standard metadata sources as <code>IMetaDataSourceModelProvider</code>s. - * Returns empty list of no standard metadata files are registered for the given uri. - */ - public synchronized List/*<IMetaDataSourceModelProvider>*/ getStandardMetaDataModelProviders(String uri) { - List/*<IMetaDataSourceModelProvider>*/ theList = (List)mdFilesMap.get(uri); - return theList != null ? theList : EMPTY_LIST ; - } - - /** - * For use by registry reader only - * @param uri - * @param fileInfo - */ - public synchronized void addStandardMetaDataFileInfo(String uri, IStandardMetaDataSourceInfo fileInfo) { - List/*<IMetaDataSourceModelProvider>*/ providers = (List) mdFilesMap.get(uri); - if (providers == null) { - providers = new ArrayList/*<IStandardMetaDataSourceInfo>*/(); - mdFilesMap.put(uri, providers); - } - providers.add(new StandardMetaDataFilesProvider(fileInfo)); - } - -/** - * Internal implementation of IMetaDataSourceModelProvider for "standard" metadata sources - * - */ -static class StandardMetaDataFilesProvider implements IMetaDataSourceModelProvider { - - private org.eclipse.jst.jsf.common.metadata.internal.IStandardMetaDataSourceInfo info; - private Object model; - private IMetaDataLocator locator; - private StandardMetaDataSourceFileLocator fileLocator = null; - - /** - * Constructor - * @param info - */ - StandardMetaDataFilesProvider(IStandardMetaDataSourceInfo info){ - this.info = info; - } - - private StandardMetaDataSourceFileLocator getFileLocator(){ - if (fileLocator == null){ - if (info.getLocatorClassname() == null){ - fileLocator = new PluginRelativeStandardMetaDataSourceFileLocator(); - } - else { - Class klass = JSFCommonPlugin.loadClass(info.getLocatorClassname(), info.getBundleId()); - try { - fileLocator = (StandardMetaDataSourceFileLocator)klass.newInstance(); - } catch (InstantiationException e) { - JSFCommonPlugin.log(IStatus.ERROR, "InstantiationException: StandardMetaDataFilesProvider.getFileLocator()", e); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException: StandardMetaDataFilesProvider.getFileLocator()", e); //$NON-NLS-1$ - } - } - if (fileLocator != null) - fileLocator.setFileInfo(info); - } - return fileLocator; - } - - private InputStream getInputStream() throws IOException { - if (getFileLocator() != null){ - return getFileLocator().getInputStream(); - } - return null; - - } - - private URI getMDFileURI() - { - try - { - StandardMetaDataSourceFileLocator fileLocator2 = getFileLocator(); - if (fileLocator2 != null) - { - final URL url = fileLocator2.getURL(); - if (url == null) - { - JSFCommonPlugin.log(new RuntimeException(), - "Couldn't locate meta-data file for " - + fileLocator2.getFileInfo() - .getLocation()); - return null; - } - - java.net.URI uri = url.toURI(); - return URI.createURI(uri.toString()); - } - } - catch (URISyntaxException e) - { - JSFCommonPlugin.log(IStatus.ERROR, "Metadata File Load Error: " - + getFileLocator().getFileInfo().toString() - + ": URISyntaxException: " + e.getMessage()); - } - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getSourceModel() - */ - public Object getSourceModel() { - if (model != null) - return model; - - InputStream inputStream = null; - try { - URI uri = getMDFileURI(); - inputStream = getInputStream(); - if (inputStream != null && uri != null){ - EList contents = StandardModelFactory.getInstance().loadStandardFileResource(inputStream, this, uri); - //check to see if this is a Model - if (contents != null && !contents.isEmpty() && - contents.get(0) instanceof Model){ - model = contents.get(0); - ((Model)model).setSourceModelProvider(this); - } - } - } catch (FileNotFoundException e){ - JSFCommonPlugin.log(IStatus.ERROR, e.getLocalizedMessage()); - } catch (IOException e) { - JSFCommonPlugin.log(IStatus.ERROR,"IOException(1): StandardMetaDataFilesProvider.getSourceModel():"+getModelName(), e); //$NON-NLS-1$ - } finally { - if (inputStream != null){ - try { - inputStream.close(); - } catch (IOException e) { - JSFCommonPlugin.log( IStatus.ERROR,"IOException (2): StandardMetaDataFilesProvider.getSourceModel():"+getModelName(), e); //$NON-NLS-1$ - } - } - } - return model; - } - - private String getModelName() { - return info.toString(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getLocator() - */ - public IMetaDataLocator getLocator() { - return locator; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#setLocator(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator) - */ - public void setLocator(IMetaDataLocator locator) { - this.locator = locator; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getResourceBundle() - */ - private ResourceBundle internalGetResourceBundle() { - if (getFileLocator() != null){ - try { - return fileLocator.getResourceBundle(); - } catch (MissingResourceException e) { - JSFCommonPlugin.log(IStatus.ERROR, "InternalGetResourceBundle1", e); - } catch (IOException e) { - JSFCommonPlugin.log(IStatus.ERROR, "InternalGetResourceBundle2", e); - } - } - return null; - } - - public Object getAdapter(Class klass) { - final StandardMetaDataFilesProvider mdp = this; - if (klass == IImageDescriptorProvider.class){ - return new IImageDescriptorProvider(){ - String imageBase; - public ImageDescriptor getImageDescriptor(String imagePath) { - imagePath = appendImageBase(imagePath); - String bundleID = mdp.getFileLocator().getFileInfo().getBundleId(); - URL url = FileLocator.find(Platform.getBundle(bundleID), new Path(imagePath), null); - return ImageDescriptor.createFromURL(url); - } - private String appendImageBase(String imagePath) { - return getImageBase() + imagePath; - } - - private String getImageBase(){ - if (imageBase == null){ - Model aModel = (Model)getSourceModel(); - Trait t = TaglibDomainMetaDataQueryHelper.getTrait(aModel, "images-base-path"); //$NON-NLS-1$ - if (t == null){ - imageBase = ""; //$NON-NLS-1$ - } else { - imageBase = TraitValueHelper.getValueAsString(t); - if (imageBase != null && imageBase.length() > 0){ - imageBase = imageBase +"/"; //$NON-NLS-1$ - } - } - } - return imageBase; - } - - }; - - } else if (klass == IResourceBundleProvider.class) { - return new IResourceBundleProvider(){ - - public ResourceBundle getResourceBundle() { - return mdp.internalGetResourceBundle(); - } - - }; - - } else if (klass == IClassLoaderProvider.class){ - return new IClassLoaderProvider(){ - - public Class loadClass(String className) { - String bundleID = mdp.getFileLocator().getFileInfo().getBundleId(); - try { - return Platform.getBundle(bundleID).loadClass(className); - } catch (ClassNotFoundException e) { - return null; - } - } - - }; - } else if (klass == IResourceURLProvider.class) { - return new IResourceURLProvider() { - - public URL getResourceURL(String resourcePath) { - URL resourceURL = null; - String bundleID = mdp.getFileLocator().getFileInfo().getBundleId(); - try { - resourceURL = FileLocator.resolve(Platform.getBundle(bundleID).getResource(resourcePath)); - } catch (IOException ioe) { - //do nothing, will return null resourceURL - } - return resourceURL; - } - - }; - } - return null; - } - -} -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java deleted file mode 100644 index a6b051b38..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java +++ /dev/null @@ -1,95 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - - -/** - * This class reads the standardMetaDataFiles extensions adds each specified standard metadata - * file to the StandardMetaDataFileRegistry. - * - * @see StandardMetaDataFileRegistry - * also see StandardMetaDataFile extension-point - */ -public class StandardMetaDataFileRegistryReader { - /** - * EXTENSION POINT ID - */ - protected static final String EXTENSION_POINT_ID = "standardMetaDataFiles"; //$NON-NLS-1$ - /** - * IConfigurationElement element name - */ - protected static final String TAG_NAME = "StandardMetaDataFile"; //$NON-NLS-1$ - /** - * Uri attribute name for IConfigurationElement - */ - protected static final String ATT_URI = "uri"; //$NON-NLS-1$ - /** - * Location attribute name for IConfigurationElement - */ - protected static final String ATT_LOCATION = "location"; //$NON-NLS-1$ - /** - * Locator attribute name for IConfigurationElement - */ - protected static final String ATT_LOCATOR = "locator"; //$NON-NLS-1$ - - private StandardMetaDataFileRegistry annotationFileRegistry; - - /** - * Constructor - * @param registry - */ - public StandardMetaDataFileRegistryReader(StandardMetaDataFileRegistry registry) { - this.annotationFileRegistry = registry; - } - - /** - * read the registery - */ - public void readRegistry() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID); - if (point != null) { - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - readElement(elements[i]); - } - } - } - - private void readElement(IConfigurationElement element) { - if (element.getName().equalsIgnoreCase(TAG_NAME)) { - String uri = element.getAttribute(ATT_URI); - String location = element.getAttribute(ATT_LOCATION); - String locator = element.getAttribute(ATT_LOCATOR); - String bundleId = null; - if (uri != null && location != null) { - try { - bundleId = element.getContributor().getName(); - StandardMetaDataFileInfo fileInfo = new StandardMetaDataFileInfo(location, bundleId, locator); - annotationFileRegistry.addStandardMetaDataFileInfo(uri, fileInfo); - } - catch (Exception e) { - JSFCommonPlugin.log(IStatus.ERROR, "Internal Error: exception occurred while reading StandardMetaDataFile ext-pt: "+location + ":"+uri, e); //$NON-NLS-1$ } - } - } - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java deleted file mode 100644 index f9869ffb8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.Iterator; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.emf.ecore.util.EcoreUtil.Copier; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFileRegistry.StandardMetaDataFilesProvider; - - -/** - * A 'null' translation of a metadata file. Entities and traits are not transformed. - * - */ -public class StandardMetaDataFilesTranslator implements IMetaDataTranslator { - - public boolean canTranslate(IMetaDataSourceModelProvider modelProvider) { - if (modelProvider instanceof StandardMetaDataFilesProvider) - return true; - return false; - } - - public void translate(IMetaDataModelMergeAssistant assistant) {//TODO: throw proper errors - //null translate - sourceModel object are already Entities and traits - //traverse the tree and add to model - - //temp - throw proper errors - //assert assistant.getSourceModel() instanceof ModelKeyDescriptor; - - MetaDataModel mm = assistant.getMergedModel(); - Model mk = (Model)assistant.getSourceModelProvider().getSourceModel(); - if (mm.getRoot() == null) { - //create copy, otherwise source model becomes merged model because of reference - Copier copier = new Copier(); - Model newModel = (Model)copier.copy(mk.getModel()); - copier.copyReferences(); - mm.setRoot(newModel); - } - else { - //for each entity and trait call "add". assistant will handle merge. - if (mk != null) {//possible that model was not loaded - traverseAndAdd(assistant, mk); - } else if (StandardModelFactory.DEBUG_MD_LOAD) { - JSFCommonPlugin.log(IStatus.ERROR,"Unable to load source model: "+assistant.getSourceModelProvider()); //$NON-NLS-1$ - } - } - } - - /** - * Add entity and any children - * @param assistant - * @param entity - */ - protected void traverseAndAdd(IMetaDataModelMergeAssistant assistant, final Entity entity){ - assistant.addEntity(entity); - - if (entity instanceof Model){ - Model model = (Model)entity; - for (final Iterator/*EntityGroup*/ it=model.getEntityGroups().iterator();it.hasNext();){ - assistant.addEntityGroup((EntityGroup)it.next()); - } - } - - for (final Iterator/*<Trait>*/ it=entity.getTraits().iterator();it.hasNext();){ - Trait trait = (Trait)it.next(); - assistant.addTrait(entity, trait); - } - - for (final Iterator/*<EntityKey>*/ it=entity.getChildEntities().iterator();it.hasNext();){ - Entity e = (Entity)it.next(); - traverseAndAdd(assistant, e); - } - - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java deleted file mode 100644 index fd3e3ea4a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.List; - - -/** - * Implementation of IMetaDataLocator for standard metadata sources. - * Uses StandardMetaDataFileRegistry to locate instances. - * - */ -public class StandardMetaDataLocator extends AbstractMetaDataLocator { - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#locateMetaDataModelProviders(java.lang.String) - */ - public List locateMetaDataModelProviders(String uri) { - return StandardMetaDataFileRegistry.getInstance().getStandardMetaDataModelProviders(uri); - } - - /* - * Does nothing. - */ - public void startLocating() { - //do nothing - } - - /* - * Does nothing. - */ - public void stopLocating() { - //do nothing - } - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java deleted file mode 100644 index e65d0dab2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - - -/** - * Used to supply an InputStream to the parser of an annotation - * meta-data file and the URL to the resource bundle for a properties file, if any. - * - * Implementors must provide a zero-argument constructor. - * - * CURRENTLY INTERNAL... WILL BE MADE API AT SOME POINT - * - */ -public abstract class StandardMetaDataSourceFileLocator { - /** - * metadata file to locate - */ - protected IStandardMetaDataSourceInfo fileInfo; - - /** - * Set the <code>IStandardMetaDataSourceInfo</code> for this locator - * @param fileInfo - */ - public final void setFileInfo(IStandardMetaDataSourceInfo fileInfo){ - this.fileInfo = fileInfo; - } - - /** - * @return the <code>IStandardMetaDataSourceInfo</code> for this locator - */ - protected final IStandardMetaDataSourceInfo getFileInfo(){ - return fileInfo; - } - /** - * Return InputStream to the meta-data source file. - * Callers are responsible for closing the stream. - * @return InputStream - * @throws IOException - */ - public abstract InputStream getInputStream() throws IOException; - - /** - * Return URL to the meta-data source file. - - * @return URL or null if cannot find a the file for getFileInfo - */ - public abstract URL getURL(); - - /** - * Return ResourceBundle for the property files if there are any. Return null if not. - * - * @return java.util.ResourceBundle - * @throws IOException - * @throws MissingResourceException - */ - public abstract ResourceBundle getResourceBundle() throws IOException, MissingResourceException; -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java deleted file mode 100644 index 7f7c249c5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java +++ /dev/null @@ -1,293 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.util.BasicExtendedMetaData; -import org.eclipse.emf.ecore.util.ExtendedMetaData; -import org.eclipse.emf.ecore.xmi.ClassNotFoundException; -import org.eclipse.emf.ecore.xmi.FeatureNotFoundException; -import org.eclipse.emf.ecore.xmi.IllegalValueException; -import org.eclipse.emf.ecore.xmi.PackageNotFoundException; -import org.eclipse.emf.ecore.xmi.UnresolvedReferenceException; -import org.eclipse.emf.ecore.xmi.XMIException; -import org.eclipse.emf.ecore.xmi.XMLResource; -import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceImpl; -import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext; - -/** - * Singleton that produces and loads standard metadata models. - * All models are loaded into the same ResourceSet. - * <p> - * All metadata extension models must be registered with org.eclipse.emf.ecore.generated_package extension-point. - * No other mechanism is provided for model uri resolution. - * <p> - * Debug tracing for model loading is available: <code>org.eclipse.jst.jsf.common/debug/metadataload=true</code> - * <p> - * When the /debug/metadataload trace flag is set, and in case extension models are known not to be available, - * and metadata is referencing those models, error logging can be suppressed by launching with the following properties set:<br> - * metadata.package.ignores<br> - * metadata.classname.ignores - * <p> - * eg. Usage for when WPE is not present<p> - * <code> - -Dmetadata.package.ignores=http://org.eclipse.jsf.pagedesigner/dtinfo.ecore,<br>http://org.eclipse.jsf.pagedesigner/QuickEditTabSections.ecore<br> - -Dmetadata.classname.ignores=DTInfo,QuickEditTabSections<br> - * </code> - * <p> - * see {@link Model} - */ -public class StandardModelFactory { - private static StandardModelFactory INSTANCE; - static boolean DEBUG_MD_LOAD = false; - static boolean DEBUG_MD_GET = false; - private ExtendedMetaData extendedMetaData; - private ResourceSet resourceSet; - - - /** - * @return singleton instance of the metadata model factory - */ - public synchronized static StandardModelFactory getInstance(){ - if (INSTANCE == null){ - INSTANCE = new StandardModelFactory(); - INSTANCE.init(); - - if (JSFCommonPlugin.getPlugin().isDebugging()){ - DEBUG_MD_LOAD = Boolean.valueOf(Platform.getDebugOption(JSFCommonPlugin.PLUGIN_ID+"/debug/metadataload")).booleanValue();//$NON-NLS-1$ - DEBUG_MD_GET = Boolean.valueOf(Platform.getDebugOption(JSFCommonPlugin.PLUGIN_ID+"/debug/metadataget")).booleanValue();//$NON-NLS-1$ - } - } - return INSTANCE; - } - - private void init() { - resourceSet = new ResourceSetImpl(); - - extendedMetaData = new BasicExtendedMetaData(resourceSet.getPackageRegistry()); - - // Register the appropriate resource factory to handle all file extensions. - // - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put - (Resource.Factory.Registry.DEFAULT_EXTENSION, - new XMLResourceFactoryImpl()); - - //relying on the org.eclipse.emf.ecore.generated_package ext-pt to register traits - } - - private StandardModelFactory() { - super(); - } - - /** - * Factory method that probably belongs somewhere else! - * @param key - * @param strategy - * @return an empty MetaDataModel - */ - public MetaDataModel createModel(ModelKeyDescriptor key, IDomainLoadingStrategy strategy){ - return new MetaDataModel(key, strategy); - } - - /** - * Factory method that probably belongs somewhere else! - * @param modelContext - * @return a ModelKeyDescriptor for the context - */ - public ModelKeyDescriptor createModelKeyDescriptor(final ITaglibDomainMetaDataModelContext modelContext) { - return new ModelKeyDescriptor(modelContext.getProject(), modelContext.getDomainID(), modelContext.getURI()); - } - - /** - * @param inputStream - * @param provider - * @param uri - * @return the root of the standard model from the resource as an EList - * @throws IOException - */ - public EList loadStandardFileResource(final InputStream inputStream, - final IMetaDataSourceModelProvider provider, - final org.eclipse.emf.common.util.URI uri) throws IOException - { - final XMLResource res = new MetadataResourceImpl(provider); - - debug(String.format( - ">>> Loading standard meta-data file for uri %s", uri), DEBUG_MD_LOAD); //$NON-NLS-1$ - - res.setURI(uri); - resourceSet.getResources().add(res); - setLoadOptions(res); - res.load(inputStream, null); - if (DEBUG_MD_LOAD) - { - reportErrors(res); - } - final EList root = res.getContents(); - return root; - } - - private void reportErrors(Resource res) { - EList<Resource.Diagnostic> errs = res.getErrors(); - if (! errs.isEmpty()){ - for (Iterator<Resource.Diagnostic> it= errs.iterator();it.hasNext();){ - StandardModelErrorMessageFactory.logErrorMessage(it.next()); - } - } - } - - /** - * Sets default load options for the resource - * @param resource - */ - protected void setLoadOptions(XMLResource resource) { - Map options = resource.getDefaultLoadOptions(); -// options.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true); - options.put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); - options.put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData); - options.put(XMLResource.OPTION_RESOURCE_HANDLER, resource); - options.put(XMLResource.OPTION_LAX_FEATURE_PROCESSING, Boolean.TRUE); - options.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.FALSE);//turning this off so that res.getErrors() has values to check! bizarre that I should need to do this. -// options.put(XMLResource.OPTION_DOM_USE_NAMESPACES_IN_SCOPE, Boolean.TRUE); - -// if (DEBUG_MD_LOAD) -// { -// System.out.println("Using load options: "+options); -// } - } - - - static class StandardModelErrorMessageFactory { - private static List<String> _missingPackageURIs; - private static List<String> _missingClassnames; - - /** - * Simply logs all messages against JSFCommonPlugin, for now. - * @param diagnostic - */ - public static void logErrorMessage(Resource.Diagnostic diagnostic) { - //should be XMIException - if (diagnostic instanceof XMIException) { - XMIException ex = (XMIException)diagnostic; - String msg = createMessage(ex); - if (msg != null) - JSFCommonPlugin.log(IStatus.ERROR, msg); - } - else { - JSFCommonPlugin.log(IStatus.ERROR, diagnostic.toString());//do better??? - } - } - - private static String createMessage(XMIException ex) { - - StringBuffer buf = new StringBuffer("Metadata Load Error: ") //$NON-NLS-1$ - .append(ex.getClass().getSimpleName()).append(": "); //$NON-NLS-1$ - - if (ex instanceof PackageNotFoundException) { - if (shouldIgnore(ex)) - return null; - - buf.append(((PackageNotFoundException)ex).uri()); - } - else if (ex instanceof ClassNotFoundException) { - if (shouldIgnore(ex)) - return null; - - buf.append(((ClassNotFoundException)ex).getName()); - } - else if (ex instanceof FeatureNotFoundException) - buf.append(((FeatureNotFoundException)ex).getName()); - else if (ex instanceof IllegalValueException) - buf.append(((IllegalValueException)ex).getValue().toString()); - else if (ex instanceof UnresolvedReferenceException) - buf.append(((UnresolvedReferenceException)ex).getReference()); - else - buf.append(ex.getMessage()); - - buf.append(" in ").append(ex.getLocation()).append(": Line = ") //$NON-NLS-1$ //$NON-NLS-2$ - .append(ex.getLine()).append(": Column = ").append(ex.getColumn()); //$NON-NLS-1$ - return buf.toString(); - } - - private static boolean shouldIgnore(XMIException ex) { - if (ex instanceof PackageNotFoundException) { - String uri = ((PackageNotFoundException)ex).uri(); - return getMissingPackageURIs().contains(uri); - } - else if (ex instanceof ClassNotFoundException) { - String className = ((ClassNotFoundException)ex).getName(); - return getMissingClassnames().contains(className); - } - return false; - } - - private static List<String> getMissingPackageURIs() { - if (_missingPackageURIs == null) { - _missingPackageURIs = buildList("metadata.package.ignores"); //$NON-NLS-1$ - - } - return _missingPackageURIs; - } - - private static List<String> getMissingClassnames() { - if (_missingClassnames == null) { - _missingClassnames = buildList("metadata.classname.ignores"); //$NON-NLS-1$ - } - return _missingClassnames; - } - - private static List<String> buildList(String propertyName) { - List<String> ret = new ArrayList<String>(); - String ignoreSet = System.getProperty(propertyName); - if (ignoreSet == null )//try env - ignoreSet = System.getenv(propertyName); - - if (ignoreSet != null && !(ignoreSet.equals(""))){ //$NON-NLS-1$ - StringTokenizer st = new StringTokenizer(ignoreSet, ","); //$NON-NLS-1$ - while(st.hasMoreTokens()){ - String uri = st.nextToken(); - if (!(uri.equals(""))) - ret.add(uri); - } - } - - return ret; - } - - } - - /** - * Debug output. The parenthesis shows thread id. - * @param msg - * @param debugFlag - */ - public static void debug(String msg, boolean debugFlag) { - if (debugFlag) - System.out.println(msg + "["+Thread.currentThread().getId()+"]"); //$NON-NLS-1$ //$NON-NLS-2$ - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java deleted file mode 100644 index 040c5069d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext; - -/** - * Simple implementation of {@link ITaglibDomainMetaDataModelContext} - */ -public class TaglibDomainMetaDataModelContextImpl extends MetaDataModelContextImpl implements ITaglibDomainMetaDataModelContext, Cloneable -{ - private final IProject _project; - private final String _uri; - - /** - * Constructor - * @param project - * @param domain - * @param uri - */ - public TaglibDomainMetaDataModelContextImpl(final String domain, final IProject project, final String uri){ - super(domain); - this._project = project; - this._uri = uri; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext#getProject() - */ - public IProject getProject() { - return _project; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext#getURI() - */ - public String getURI() { - return _uri; - } - - public Object getAdapter(Class adapter) { - if (adapter.equals(ITaglibDomainMetaDataModelContext.class)) - return this; - - return super.getAdapter(adapter); - } - - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java deleted file mode 100644 index 272e10e23..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.BasicEObjectImpl; -import org.eclipse.emf.ecore.util.FeatureMap; -import org.eclipse.emf.ecore.xml.type.AnyType; -import org.eclipse.emf.ecore.xml.type.SimpleAnyType; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; -import org.eclipse.osgi.util.NLS; - -/** - * Experimental/prototype class to assist with decoding trait values. - * This could/should be made API at some point after "hardening". (https://bugs.eclipse.org/bugs/show_bug.cgi?id=192052) - */ -public class TraitValueHelper { - private static final String KEY_NOT_FOUND = Messages.Key_not_found; - /** - * @param trait - * @return EClass of trait value - */ - public static EClass getValueType(Trait trait){ - if (trait == null) - return null; - if (trait.getValue() != null) - return trait.getValue().eClass(); - return null; - } - - /** - * @param trait - * @return value of trait as String Object. - */ - public static Object getValue(Trait trait){ - if (trait == null) - return null; - if (trait.getValue() == null) - return null; - - if (trait.getValue() instanceof SimpleAnyType){ - return ((SimpleAnyType)trait.getValue()).getRawValue(); - } - else if (trait.getValue() instanceof AnyType){ - AnyType any = (AnyType)trait.getValue(); - FeatureMap map = any.getMixed(); - return getTextValueFromFeatureMap(map); - } - else if ( trait.getValue().eIsProxy() && trait.getValue() instanceof BasicEObjectImpl){ - BasicEObjectImpl o = (BasicEObjectImpl)trait.getValue(); - return o.eProxyURI().toString(); - } - return trait.getValue(); - } - - private static String getTextValueFromFeatureMap(FeatureMap map) { - for (Iterator it=map.iterator();it.hasNext();){ - FeatureMap.Entry entry = (FeatureMap.Entry)it.next(); - if (entry.getEStructuralFeature().getName().equals("text")) - return (String)entry.getValue(); - } - return null; - } - - /** - * @param trait - * @return value of trait as String. If externalized, will resolve from resource bundle. - */ - public static String getValueAsString(Trait trait){ - Object val = getValue(trait); - if (val instanceof String){ - String result = getNLSValue(trait, (String)val); - return result; - } - return null; - } - - /** - * - * @param trait whose value a {@link ListOfValues} or is a single string - * @return List of Strings. If externalized, will resolve from resource bundle - * using getNLSValue(Trait trait, String rawValue) - */ - public synchronized static List getValueAsListOfStrings(Trait trait){ - //PROTO ONLY!!! Need to make WAY more robust! - List ret = new ArrayList(); - if (trait.getValue() instanceof ListOfValues) { - for(Iterator it=trait.getValue().eContents().iterator();it.hasNext();){ - Object o = it.next(); - if (o instanceof SimpleAnyType){ - SimpleAnyType sat = (SimpleAnyType)o; - String rawValue = getTextValueFromFeatureMap(sat.getMixed()); - String nlsValue = getNLSValue(trait, rawValue); - - ret.add(nlsValue); - } - } - } - else { - //may be single value - String o = getValueAsString(trait); - if (o != null) - ret.add(o); - } - return ret; - } - - /** - * Looks for '%' (and not '%%') at beginning of rawValue. If found, looks to the - * traits sourceModelProvider for resource bundle to resolve the key after - * stripping the '%' sign. - * @param trait - * @param rawValue of string in from metadata - * @return the NLS Value or rawValue if it cannot be located - */ - public static String getNLSValue(Trait trait, String rawValue) { - String result = rawValue; - if (rawValue.startsWith("%") && !rawValue.startsWith("%%")){ - String key = rawValue.substring(1); - result = getNLSPropertyValue(trait, key); - if (result == null){ - result = rawValue; - } - } - return result == null ? null : result.trim(); - } - - //will return null if there is an IOException with ResourceBundle - private static String getNLSPropertyValue(final Trait trait, final String key){ - try{ - IMetaDataSourceModelProvider provider = trait.getSourceModelProvider(); - IResourceBundleProvider resourceBundleProvider = (IResourceBundleProvider)provider.getAdapter(IResourceBundleProvider.class); - if (resourceBundleProvider != null){ - ResourceBundle resourceBundle_ = resourceBundleProvider.getResourceBundle(); - if (resourceBundle_ != null){ - String replVal = resourceBundle_.getString(key); - return replVal; - } - } - //return original string - return key; - - } catch (MissingResourceException e){ - //fall thru - JSFCommonPlugin.log(e, NLS.bind(Messages.MissingResource_exception, new String[]{key})); - } - return key + KEY_NOT_FOUND; - } - - /** - * Will take get the value as a String and attempt to coerce to boolean. - * Will return 'false' if coercion fails, or value was null. - * @param trait - * @return true or false - */ - public static boolean getValueAsBoolean(Trait trait) { - String val = getValueAsString(trait); - if (val == null) - return false; - - return Boolean.valueOf(val).booleanValue(); - } - -// /** -// * @param trait -// * @return name of class or primitive datatype that the value is defined as. -// * For SimpleAnyTypes, the getInstanceType().getInstanceClassName() is returned. -// * For AnyType, java.lang.String is always returned. -// * For all others, the class.getName() is returned. -// */ -// public static String getValueInstanceClassName(Trait trait) {String.class.getName(); -// if (trait.getValue() instanceof SimpleAnyType) { -// return ((SimpleAnyType)trait.getValue()).getInstanceType().getInstanceClassName(); -// } -// else if (trait.getValue() instanceof AnyType) { -// return String.class.getName(); -// } -// else { -// return trait.getValue().getClass().getName(); -// } -// -// } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java deleted file mode 100644 index f9fc4dede..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: EntityGroupImpl.java,v 1.5 2008/02/01 20:20:47 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Entity Group</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -@SuppressWarnings("hiding") -public class EntityGroupImpl extends EntityImpl implements EntityGroup { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EntityGroupImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return MetadataPackage.Literals.ENTITY_GROUP; - } - -} //EntityGroupImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java deleted file mode 100644 index 22cd9706d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java +++ /dev/null @@ -1,415 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: EntityImpl.java,v 1.6 2007/06/11 20:55:58 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import java.util.Collection; -import java.util.Iterator; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.EObjectResolvingEList; -import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Entity</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getChildEntities <em>Child Entities</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getTraits <em>Traits</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getIncludeGroups <em>Include Groups</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class EntityImpl extends EObjectImpl implements Entity { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached value of the '{@link #getChildEntities() <em>Child Entities</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getChildEntities() - * @generated - * @ordered - */ - protected EList childEntities = null; - - /** - * The cached value of the '{@link #getTraits() <em>Traits</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTraits() - * @generated - * @ordered - */ - protected EList traits = null; - - /** - * The default value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected static final String ID_EDEFAULT = null; - - /** - * The cached value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected String id = ID_EDEFAULT; - - /** - * The default value of the '{@link #getType() <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getType() - * @generated - * @ordered - */ - protected static final String TYPE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getType() <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getType() - * @generated - * @ordered - */ - protected String type = TYPE_EDEFAULT; - - /** - * The cached value of the '{@link #getIncludeGroups() <em>Include Groups</em>}' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getIncludeGroups() - * @generated - * @ordered - */ - protected EList includeGroups = null; - - /** - * The cached value of the Model - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - private Model _model; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EntityImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return MetadataPackage.Literals.ENTITY; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getChildEntities() { - if (childEntities == null) { - childEntities = new EObjectContainmentEList(Entity.class, this, MetadataPackage.ENTITY__CHILD_ENTITIES); - } - return childEntities; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getTraits() { - if (traits == null) { - traits = new EObjectContainmentEList(Trait.class, this, MetadataPackage.ENTITY__TRAITS); - } - return traits; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getIncludeGroups() { - if (includeGroups == null) { - includeGroups = new EObjectResolvingEList(IncludeEntityGroup.class, this, MetadataPackage.ENTITY__INCLUDE_GROUPS); - } - return includeGroups; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getId() { - return id; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setId(String newId) { - String oldId = id; - id = newId; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.ENTITY__ID, oldId, id)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getType() { - return type; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setType(String newType) { - String oldType = type; - type = newType; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.ENTITY__TYPE, oldType, type)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public void accept(IEntityVisitor visitor) { - if (visitor.stopVisiting()) - return; - visitor.visit(this); - - if (!getChildEntities().isEmpty()){ - for (Iterator/*<Entity>*/ it = getChildEntities().iterator(); it.hasNext();){ - Entity k = (Entity)it.next(); - k.accept(visitor); - if (visitor.stopVisiting()) - return; - } - } -// if (!getIncludeGroups().isEmpty()){ -// for (Iterator/*<IncludeEntityGroup>*/ it = getIncludeGroups().iterator(); it.hasNext();){ -// IncludeEntityGroup entityGroup = (IncludeEntityGroup)it.next(); -// Model m = getModel(entityGroup); -// if (m != null){ -// Entity k = m.findIncludeGroup(entityGroup.getId()); -// if (k != null){ -// k.accept(visitor); -// if (visitor.stopVisiting()) -// return; -// } -// } -// } -// } - visitor.visitCompleted(this); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public Model getModel() { - if (_model == null){ - EObject parent = this.eContainer(); - while (true){ - if (parent instanceof Model){ - _model = (Model)parent; - break; - } - if (parent != null) - parent = parent.eContainer(); - else - break; - } - } - return _model; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case MetadataPackage.ENTITY__CHILD_ENTITIES: - return ((InternalEList)getChildEntities()).basicRemove(otherEnd, msgs); - case MetadataPackage.ENTITY__TRAITS: - return ((InternalEList)getTraits()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case MetadataPackage.ENTITY__CHILD_ENTITIES: - return getChildEntities(); - case MetadataPackage.ENTITY__TRAITS: - return getTraits(); - case MetadataPackage.ENTITY__ID: - return getId(); - case MetadataPackage.ENTITY__TYPE: - return getType(); - case MetadataPackage.ENTITY__INCLUDE_GROUPS: - return getIncludeGroups(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case MetadataPackage.ENTITY__CHILD_ENTITIES: - getChildEntities().clear(); - getChildEntities().addAll((Collection)newValue); - return; - case MetadataPackage.ENTITY__TRAITS: - getTraits().clear(); - getTraits().addAll((Collection)newValue); - return; - case MetadataPackage.ENTITY__ID: - setId((String)newValue); - return; - case MetadataPackage.ENTITY__TYPE: - setType((String)newValue); - return; - case MetadataPackage.ENTITY__INCLUDE_GROUPS: - getIncludeGroups().clear(); - getIncludeGroups().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case MetadataPackage.ENTITY__CHILD_ENTITIES: - getChildEntities().clear(); - return; - case MetadataPackage.ENTITY__TRAITS: - getTraits().clear(); - return; - case MetadataPackage.ENTITY__ID: - setId(ID_EDEFAULT); - return; - case MetadataPackage.ENTITY__TYPE: - setType(TYPE_EDEFAULT); - return; - case MetadataPackage.ENTITY__INCLUDE_GROUPS: - getIncludeGroups().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case MetadataPackage.ENTITY__CHILD_ENTITIES: - return childEntities != null && !childEntities.isEmpty(); - case MetadataPackage.ENTITY__TRAITS: - return traits != null && !traits.isEmpty(); - case MetadataPackage.ENTITY__ID: - return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); - case MetadataPackage.ENTITY__TYPE: - return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); - case MetadataPackage.ENTITY__INCLUDE_GROUPS: - return includeGroups != null && !includeGroups.isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); - result.append(id); - result.append(", type: "); - result.append(type); - result.append(')'); - return result.toString(); - } - -} //EntityImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java deleted file mode 100644 index 0f8cee869..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IncludeEntityGroupImpl.java,v 1.2 2007/04/16 19:54:10 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Include Entity Group</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl#getModelUri <em>Model Uri</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IncludeEntityGroupImpl extends EObjectImpl implements IncludeEntityGroup { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The default value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected static final String ID_EDEFAULT = null; - - /** - * The cached value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected String id = ID_EDEFAULT; - - /** - * The default value of the '{@link #getModelUri() <em>Model Uri</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getModelUri() - * @generated - * @ordered - */ - protected static final String MODEL_URI_EDEFAULT = null; - - /** - * The cached value of the '{@link #getModelUri() <em>Model Uri</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getModelUri() - * @generated - * @ordered - */ - protected String modelUri = MODEL_URI_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IncludeEntityGroupImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return MetadataPackage.Literals.INCLUDE_ENTITY_GROUP; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getId() { - return id; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setId(String newId) { - String oldId = id; - id = newId; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.INCLUDE_ENTITY_GROUP__ID, oldId, id)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getModelUri() { - return modelUri; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setModelUri(String newModelUri) { - String oldModelUri = modelUri; - modelUri = newModelUri; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI, oldModelUri, modelUri)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case MetadataPackage.INCLUDE_ENTITY_GROUP__ID: - return getId(); - case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI: - return getModelUri(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case MetadataPackage.INCLUDE_ENTITY_GROUP__ID: - setId((String)newValue); - return; - case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI: - setModelUri((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case MetadataPackage.INCLUDE_ENTITY_GROUP__ID: - setId(ID_EDEFAULT); - return; - case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI: - setModelUri(MODEL_URI_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case MetadataPackage.INCLUDE_ENTITY_GROUP__ID: - return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); - case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI: - return MODEL_URI_EDEFAULT == null ? modelUri != null : !MODEL_URI_EDEFAULT.equals(modelUri); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); - result.append(id); - result.append(", modelUri: "); - result.append(modelUri); - result.append(')'); - return result.toString(); - } - -} //IncludeEntityGroupImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java deleted file mode 100644 index ca0430741..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java +++ /dev/null @@ -1,239 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataFactoryImpl.java,v 1.4 2007/05/11 17:54:55 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.impl.EFactoryImpl; -import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; - - - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Factory</b>. - * <!-- end-user-doc --> - * @generated - */ -public class MetadataFactoryImpl extends EFactoryImpl implements MetadataFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Creates the default factory implementation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return MetadataFactory - * @generated - */ - public static MetadataFactory init() { - try { - MetadataFactory theMetadataFactory = (MetadataFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"); - if (theMetadataFactory != null) { - return theMetadataFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new MetadataFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataFactoryImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case MetadataPackage.MODEL: return createModel(); - case MetadataPackage.ENTITY_GROUP: return createEntityGroup(); - case MetadataPackage.ENTITY: return createEntity(); - case MetadataPackage.TRAIT: return createTrait(); - case MetadataPackage.INCLUDE_ENTITY_GROUP: return createIncludeEntityGroup(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) { - case MetadataPackage.IMETA_DATA_SOURCE_MODEL_PROVIDER: - return createIMetaDataSourceModelProviderFromString(eDataType, initialValue); - case MetadataPackage.MODEL_CONTEXT: - return createModelContextFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) { - case MetadataPackage.IMETA_DATA_SOURCE_MODEL_PROVIDER: - return convertIMetaDataSourceModelProviderToString(eDataType, instanceValue); - case MetadataPackage.MODEL_CONTEXT: - return convertModelContextToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Trait createTrait() { - TraitImpl trait = new TraitImpl(); - return trait; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IncludeEntityGroup createIncludeEntityGroup() { - IncludeEntityGroupImpl includeEntityGroup = new IncludeEntityGroupImpl(); - return includeEntityGroup; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Model createModel() { - ModelImpl model = new ModelImpl(); - return model; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Entity createEntity() { - EntityImpl entity = new EntityImpl(); - return entity; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EntityGroup createEntityGroup() { - EntityGroupImpl entityGroup = new EntityGroupImpl(); - return entityGroup; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param eDataType IMetaDataSourceModelProvider - * @param initialValue - * @return IMetaDataSourceModelProvider - * @generated - */ - public IMetaDataSourceModelProvider createIMetaDataSourceModelProviderFromString(EDataType eDataType, String initialValue) { - return (IMetaDataSourceModelProvider)super.createFromString(eDataType, initialValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param eDataType - * @param instanceValue - * @return String - * @generated - */ - public String convertIMetaDataSourceModelProviderToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param eDataType - * @param initialValue - * @return ModelKeyDescriptor - * @generated - */ - public ModelKeyDescriptor createModelContextFromString(EDataType eDataType, String initialValue) { - return (ModelKeyDescriptor)super.createFromString(eDataType, initialValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param eDataType - * @param instanceValue - * @return String - * @generated - */ - public String convertModelContextToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataPackage getMetadataPackage() { - return (MetadataPackage)getEPackage(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return MetadataPackage - * @deprecated - * @generated - */ - public static MetadataPackage getPackage() { - return MetadataPackage.eINSTANCE; - } - -} //MetadataFactoryImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java deleted file mode 100644 index 7f9d582c9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java +++ /dev/null @@ -1,604 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataPackageImpl.java,v 1.6 2007/05/11 17:54:55 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; -import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Package</b>. - * <!-- end-user-doc --> - * @generated - */ -public class MetadataPackageImpl extends EPackageImpl implements MetadataPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass traitEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass includeEntityGroupEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass modelEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass entityEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass entityGroupEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType iTraitVisitorEDataType = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType iEntityVisitorEDataType = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType iMetaDataSourceModelProviderEDataType = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType modelContextEDataType = null; - - /** - * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - * <p>Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#eNS_URI - * @see #init() - * @generated - */ - private MetadataPackageImpl() { - super(eNS_URI, MetadataFactory.eINSTANCE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the <b>Package</b> for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - * <p>Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - * <p>Invocation of this method will not affect any packages that have - * already been initialized. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return MetadataPackage - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static MetadataPackage init() { - if (isInited) return (MetadataPackage)EPackage.Registry.INSTANCE.getEPackage(MetadataPackage.eNS_URI); - - // Obtain or create and register package - MetadataPackageImpl theMetadataPackage = (MetadataPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MetadataPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MetadataPackageImpl()); - - isInited = true; - - // Create package meta-data objects - theMetadataPackage.createPackageContents(); - - // Initialize created meta-data - theMetadataPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theMetadataPackage.freeze(); - - return theMetadataPackage; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getTrait() { - return traitEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getTrait_Value() { - return (EReference)traitEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getTrait_SourceModelProvider() { - return (EAttribute)traitEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIncludeEntityGroup() { - return includeEntityGroupEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIncludeEntityGroup_Id() { - return (EAttribute)includeEntityGroupEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIncludeEntityGroup_ModelUri() { - return (EAttribute)includeEntityGroupEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getTrait_Id() { - return (EAttribute)traitEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getModel() { - return modelEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getModel_SourceModelProvider() { - return (EAttribute)modelEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getModel_CurrentModelContext() { - return (EAttribute)modelEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getModel_EntityGroups() { - return (EReference)modelEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getEntity() { - return entityEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getEntity_ChildEntities() { - return (EReference)entityEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getEntity_Traits() { - return (EReference)entityEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getEntity_Id() { - return (EAttribute)entityEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getEntity_Type() { - return (EAttribute)entityEClass.getEStructuralFeatures().get(3); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getEntity_IncludeGroups() { - return (EReference)entityEClass.getEStructuralFeatures().get(4); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getEntityGroup() { - return entityGroupEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getITraitVisitor() { - return iTraitVisitorEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getIEntityVisitor() { - return iEntityVisitorEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getIMetaDataSourceModelProvider() { - return iMetaDataSourceModelProviderEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getModelContext() { - return modelContextEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataFactory getMetadataFactory() { - return (MetadataFactory)getEFactoryInstance(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - modelEClass = createEClass(MODEL); - createEReference(modelEClass, MODEL__ENTITY_GROUPS); - createEAttribute(modelEClass, MODEL__SOURCE_MODEL_PROVIDER); - createEAttribute(modelEClass, MODEL__CURRENT_MODEL_CONTEXT); - - entityGroupEClass = createEClass(ENTITY_GROUP); - - entityEClass = createEClass(ENTITY); - createEReference(entityEClass, ENTITY__CHILD_ENTITIES); - createEReference(entityEClass, ENTITY__TRAITS); - createEAttribute(entityEClass, ENTITY__ID); - createEAttribute(entityEClass, ENTITY__TYPE); - createEReference(entityEClass, ENTITY__INCLUDE_GROUPS); - - traitEClass = createEClass(TRAIT); - createEAttribute(traitEClass, TRAIT__ID); - createEReference(traitEClass, TRAIT__VALUE); - createEAttribute(traitEClass, TRAIT__SOURCE_MODEL_PROVIDER); - - includeEntityGroupEClass = createEClass(INCLUDE_ENTITY_GROUP); - createEAttribute(includeEntityGroupEClass, INCLUDE_ENTITY_GROUP__ID); - createEAttribute(includeEntityGroupEClass, INCLUDE_ENTITY_GROUP__MODEL_URI); - - // Create data types - iTraitVisitorEDataType = createEDataType(ITRAIT_VISITOR); - iEntityVisitorEDataType = createEDataType(IENTITY_VISITOR); - iMetaDataSourceModelProviderEDataType = createEDataType(IMETA_DATA_SOURCE_MODEL_PROVIDER); - modelContextEDataType = createEDataType(MODEL_CONTEXT); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Add supertypes to classes - modelEClass.getESuperTypes().add(this.getEntity()); - entityGroupEClass.getESuperTypes().add(this.getEntity()); - - // Initialize classes and features; add operations and parameters - initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getModel_EntityGroups(), this.getEntityGroup(), null, "entityGroups", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getModel_SourceModelProvider(), this.getIMetaDataSourceModelProvider(), "sourceModelProvider", null, 0, 1, Model.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getModel_CurrentModelContext(), this.getModelContext(), "currentModelContext", null, 0, 1, Model.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - EOperation op = addEOperation(modelEClass, this.getEntityGroup(), "findIncludeGroup", 0, 1); - addEParameter(op, ecorePackage.getEString(), "groupId", 0, 1); - - op = addEOperation(modelEClass, null, "accept"); - addEParameter(op, this.getIEntityVisitor(), "visitor", 0, 1); - - initEClass(entityGroupEClass, EntityGroup.class, "EntityGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEntity_ChildEntities(), this.getEntity(), null, "childEntities", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - getEntity_ChildEntities().getEKeys().add(this.getEntity_Id()); - getEntity_ChildEntities().getEKeys().add(this.getEntity_Type()); - initEReference(getEntity_Traits(), this.getTrait(), null, "traits", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - getEntity_Traits().getEKeys().add(this.getTrait_Id()); - initEAttribute(getEntity_Id(), ecorePackage.getEString(), "id", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getEntity_Type(), ecorePackage.getEString(), "type", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_IncludeGroups(), this.getIncludeEntityGroup(), null, "includeGroups", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - op = addEOperation(entityEClass, null, "accept"); - addEParameter(op, this.getIEntityVisitor(), "visitor", 0, 1); - - op = addEOperation(entityEClass, this.getModel(), "getModel", 0, 1); - - initEClass(traitEClass, Trait.class, "Trait", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTrait_Id(), ecorePackage.getEString(), "id", null, 1, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTrait_Value(), ecorePackage.getEObject(), null, "value", null, 1, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTrait_SourceModelProvider(), this.getIMetaDataSourceModelProvider(), "sourceModelProvider", null, 0, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - op = addEOperation(traitEClass, null, "accept"); - addEParameter(op, this.getITraitVisitor(), "visitor", 0, 1); - - initEClass(includeEntityGroupEClass, IncludeEntityGroup.class, "IncludeEntityGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIncludeEntityGroup_Id(), ecorePackage.getEString(), "id", null, 1, 1, IncludeEntityGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIncludeEntityGroup_ModelUri(), ecorePackage.getEString(), "modelUri", null, 0, 1, IncludeEntityGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Initialize data types - initEDataType(iTraitVisitorEDataType, ITraitVisitor.class, "ITraitVisitor", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(iEntityVisitorEDataType, IEntityVisitor.class, "IEntityVisitor", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(iMetaDataSourceModelProviderEDataType, IMetaDataSourceModelProvider.class, "IMetaDataSourceModelProvider", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(modelContextEDataType, ModelKeyDescriptor.class, "ModelContext", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - - // Create resource - createResource(eNS_URI); - - // Create annotations - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); - // http://www.eclipse.org/emf/2002/GenModel - createGenModelAnnotations(); - } - - /** - * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; - addAnnotation - (modelEClass, - source, - new String[] { - "kind", "element", - "name", "metadatamodel" - }); - addAnnotation - (getModel_EntityGroups(), - source, - new String[] { - "kind", "element", - "name", "entityGroup" - }); - addAnnotation - (entityEClass, - source, - new String[] { - "kind", "element", - "name", "entity" - }); - addAnnotation - (getEntity_ChildEntities(), - source, - new String[] { - "kind", "element", - "name", "entity" - }); - addAnnotation - (getEntity_Traits(), - source, - new String[] { - "kind", "element", - "name", "trait" - }); - addAnnotation - (getEntity_IncludeGroups(), - source, - new String[] { - "kind", "element", - "name", "include-entity-group" - }); - addAnnotation - (getIncludeEntityGroup_ModelUri(), - source, - new String[] { - "name", "uri" - }); - addAnnotation - (traitEClass, - source, - new String[] { - "kind", "element", - "name", "trait" - }); - addAnnotation - (getTrait_Value(), - source, - new String[] { - "kind", "element", - "namespace", "##targetNamespace" - }); - } - - /** - * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/GenModel</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("cast") - protected void createGenModelAnnotations() { - String source = "http://www.eclipse.org/emf/2002/GenModel"; - addAnnotation - ((EOperation)traitEClass.getEOperations().get(0), - source, - new String[] { - "body", "visitor.visit(this);" - }); - } - -} //MetadataPackageImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java deleted file mode 100644 index 4c5db28e4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java +++ /dev/null @@ -1,270 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: ModelImpl.java,v 1.6 2008/02/01 20:20:47 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import java.util.Collection; -import java.util.Iterator; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.util.EObjectResolvingEList; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Model</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getEntityGroups <em>Entity Groups</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getSourceModelProvider <em>Source Model Provider</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getCurrentModelContext <em>Current Model Context</em>}</li> - * </ul> - * </p> - * - * @generated - */ -@SuppressWarnings("hiding") -public class ModelImpl extends EntityImpl implements Model { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached value of the '{@link #getEntityGroups() <em>Entity Groups</em>}' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getEntityGroups() - * @generated - * @ordered - */ - protected EList entityGroups = null; - - /** - * The default value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSourceModelProvider() - * @generated - * @ordered - */ - protected static final IMetaDataSourceModelProvider SOURCE_MODEL_PROVIDER_EDEFAULT = null; - - /** - * The default value of the '{@link #getCurrentModelContext() <em>Current Model Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getCurrentModelContext() - * @generated - * @ordered - */ - protected static final ModelKeyDescriptor CURRENT_MODEL_CONTEXT_EDEFAULT = null; - - private IMetaDataSourceModelProvider sourceModelProvider; - - private ModelKeyDescriptor _modelContext; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ModelImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return MetadataPackage.Literals.MODEL; - } - - /** - * <!-- begin-user-doc --> - * May return null. - * <!-- end-user-doc --> - * @generated NOT - */ - public IMetaDataSourceModelProvider getSourceModelProvider() { - return sourceModelProvider; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public void setSourceModelProvider(IMetaDataSourceModelProvider newSourceModelProvider) { - sourceModelProvider = newSourceModelProvider; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ModelKeyDescriptor getCurrentModelContext() { - return _modelContext; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public void setCurrentModelContext(ModelKeyDescriptor newCurrentModelContext) { - _modelContext = newCurrentModelContext; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getEntityGroups() { - if (entityGroups == null) { - entityGroups = new EObjectResolvingEList(EntityGroup.class, this, MetadataPackage.MODEL__ENTITY_GROUPS); - } - return entityGroups; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case MetadataPackage.MODEL__ENTITY_GROUPS: - return getEntityGroups(); - case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER: - return getSourceModelProvider(); - case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT: - return getCurrentModelContext(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case MetadataPackage.MODEL__ENTITY_GROUPS: - getEntityGroups().clear(); - getEntityGroups().addAll((Collection)newValue); - return; - case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER: - setSourceModelProvider((IMetaDataSourceModelProvider)newValue); - return; - case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT: - setCurrentModelContext((ModelKeyDescriptor)newValue); - return; - } - super.eSet(featureID, newValue); - } - - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public EntityGroup findIncludeGroup(String groupId){ - EntityGroup ret = null; - for (Iterator it=getEntityGroups().iterator();it.hasNext();){ - EntityGroup entityGroup = (EntityGroup)it.next(); - if (entityGroup.getId().equals(groupId)){ - ret = entityGroup; - break; - } - } - return ret; - } - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case MetadataPackage.MODEL__ENTITY_GROUPS: - getEntityGroups().clear(); - return; - case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER: - setSourceModelProvider(SOURCE_MODEL_PROVIDER_EDEFAULT); - return; - case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT: - setCurrentModelContext(CURRENT_MODEL_CONTEXT_EDEFAULT); - return; - } - super.eUnset(featureID); - } - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - - public void accept(IEntityVisitor visitor) { - if (visitor.stopVisiting()) - return; - visitor.visit(this); - - if (!getChildEntities().isEmpty()){ - for (Iterator/*<Entity>*/ it = getChildEntities().iterator(); it.hasNext();){ - Entity k = (Entity)it.next(); - k.accept(visitor); - if (visitor.stopVisiting()) - return; - } - } - - visitor.visitCompleted(this); - } - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public Model getModel() { - return this; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case MetadataPackage.MODEL__ENTITY_GROUPS: - return entityGroups != null && !entityGroups.isEmpty(); - case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER: - return SOURCE_MODEL_PROVIDER_EDEFAULT == null ? getSourceModelProvider() != null : !SOURCE_MODEL_PROVIDER_EDEFAULT.equals(getSourceModelProvider()); - case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT: - return CURRENT_MODEL_CONTEXT_EDEFAULT == null ? getCurrentModelContext() != null : !CURRENT_MODEL_CONTEXT_EDEFAULT.equals(getCurrentModelContext()); - } - return super.eIsSet(featureID); - } - -} //ModelImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java deleted file mode 100644 index f030f9175..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java +++ /dev/null @@ -1,330 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitImpl.java,v 1.8 2008/09/03 23:29:04 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Trait</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link TraitImpl#getValue <em>Value</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class TraitImpl extends EObjectImpl implements Trait { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The default value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected static final String ID_EDEFAULT = null; - - /** - * The cached value of the '{@link #getId() <em>Id</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getId() - * @generated - * @ordered - */ - protected String id = ID_EDEFAULT; - - /** - * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getValue() - * @generated - * @ordered - */ - protected EObject value = null; - - /** - * The default value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSourceModelProvider() - * @generated - * @ordered - */ - protected static final IMetaDataSourceModelProvider SOURCE_MODEL_PROVIDER_EDEFAULT = null; - - /** - * The cached value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSourceModelProvider() - * @generated - * @ordered - */ - protected IMetaDataSourceModelProvider sourceModelProvider = SOURCE_MODEL_PROVIDER_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected TraitImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return MetadataPackage.Literals.TRAIT; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EObject getValue() { - return value; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param newValue - * @param msgs - * @return NotificationChain - * @generated - */ - public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) { - EObject oldValue = value; - value = newValue; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__VALUE, oldValue, newValue); - if (msgs == null) msgs = notification; else msgs.add(notification); - } - return msgs; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setValue(EObject newValue) { - if (newValue != value) { - NotificationChain msgs = null; - if (value != null) - msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MetadataPackage.TRAIT__VALUE, null, msgs); - if (newValue != null) - msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MetadataPackage.TRAIT__VALUE, null, msgs); - msgs = basicSetValue(newValue, msgs); - if (msgs != null) msgs.dispatch(); - } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__VALUE, newValue, newValue)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IMetaDataSourceModelProvider getSourceModelProvider() { - return sourceModelProvider; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setSourceModelProvider(IMetaDataSourceModelProvider newSourceModelProvider) { - IMetaDataSourceModelProvider oldSourceModelProvider = sourceModelProvider; - sourceModelProvider = newSourceModelProvider; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER, oldSourceModelProvider, sourceModelProvider)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getId() { - return id; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setId(String newId) { - String oldId = id; - id = newId; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__ID, oldId, id)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public void accept(ITraitVisitor visitor) { - visitor.visit(this); - visitor.visitCompleted(this); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case MetadataPackage.TRAIT__VALUE: - return basicSetValue(null, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case MetadataPackage.TRAIT__ID: - return getId(); - case MetadataPackage.TRAIT__VALUE: - return getValue(); - case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER: - return getSourceModelProvider(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case MetadataPackage.TRAIT__ID: - setId((String)newValue); - return; - case MetadataPackage.TRAIT__VALUE: - setValue((EObject)newValue); - return; - case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER: - setSourceModelProvider((IMetaDataSourceModelProvider)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case MetadataPackage.TRAIT__ID: - setId(ID_EDEFAULT); - return; - case MetadataPackage.TRAIT__VALUE: - setValue((EObject)null); - return; - case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER: - setSourceModelProvider(SOURCE_MODEL_PROVIDER_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case MetadataPackage.TRAIT__ID: - return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); - case MetadataPackage.TRAIT__VALUE: - return value != null; - case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER: - return SOURCE_MODEL_PROVIDER_EDEFAULT == null ? sourceModelProvider != null : !SOURCE_MODEL_PROVIDER_EDEFAULT.equals(sourceModelProvider); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); - result.append(id); - result.append(", sourceModelProvider: "); - result.append(sourceModelProvider); - result.append(')'); - return result.toString(); - } - - public boolean equals(Object value_){ - if (!(value_ instanceof String)) - return super.equals(value_); - - String key = (String)value_; - if (key.equals(getId())) - return true; - - return false; - } - - @Override - public int hashCode() - { - // try to match convention x.equals(y) => x.hashCode() == y.hashCode() - return getId() != null ? getId().hashCode() : 0xDEADBEEF; - } -} //TraitImpl
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties deleted file mode 100644 index 5e9fd47a8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2007 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### - -MissingResource_exception=MissingResourceException for NLSPropertyValue: {0} -Key_not_found=(key not found) diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java deleted file mode 100644 index 81b5e28e0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java +++ /dev/null @@ -1,200 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataAdapterFactory.java,v 1.4 2007/04/16 19:54:01 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.util; - - -import org.eclipse.emf.common.notify.Adapter; -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.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; - - - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage - * @generated - */ -public class MetadataAdapterFactory extends AdapterFactoryImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static MetadataPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataAdapterFactory() { - if (modelPackage == null) { - modelPackage = MetadataPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch the delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected MetadataSwitch modelSwitch = - new MetadataSwitch() { - public Object caseModel(Model object) { - return createModelAdapter(); - } - public Object caseEntityGroup(EntityGroup object) { - return createEntityGroupAdapter(); - } - public Object caseEntity(Entity object) { - return createEntityAdapter(); - } - public Object caseTrait(Trait object) { - return createTraitAdapter(); - } - public Object caseIncludeEntityGroup(IncludeEntityGroup object) { - return createIncludeEntityGroupAdapter(); - } - public Object defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - public Adapter createAdapter(Notifier target) { - return (Adapter)modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Trait <em>Trait</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.Trait - * @generated - */ - public Adapter createTraitAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup - * @generated - */ - public Adapter createIncludeEntityGroupAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.Model - * @generated - */ - public Adapter createModelAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.Entity - * @generated - */ - public Adapter createEntityAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.EntityGroup - * @generated - */ - public Adapter createEntityGroupAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //MetadataAdapterFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java deleted file mode 100644 index e365a039b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataResourceFactoryImpl.java,v 1.2 2007/01/24 17:22:46 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.util; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; -import org.eclipse.emf.ecore.xmi.XMLResource; - -/** - * <!-- begin-user-doc --> - * The <b>Resource Factory</b> associated with the package. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceImpl - * @generated - */ -public class MetadataResourceFactoryImpl extends ResourceFactoryImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Creates an instance of the resource factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataResourceFactoryImpl() { - super(); - } - - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public Resource createResource(URI uri) { - XMLResource result = new MetadataResourceImpl(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.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; - } - -} //MetadataResourceFactoryImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java deleted file mode 100644 index aba6948e5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataResourceImpl.java,v 1.11 2008/09/11 17:22:00 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.util; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.xmi.PackageNotFoundException; -import org.eclipse.emf.ecore.xmi.XMLHelper; -import org.eclipse.emf.ecore.xmi.XMLLoad; -import org.eclipse.emf.ecore.xmi.XMLResource; -import org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler; -import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl; -import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl; -import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.xml.sax.helpers.DefaultHandler; - -/** - * <!-- begin-user-doc --> - * The <b>Resource </b> associated with the package. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceFactoryImpl - * @generated NOT - */ -public class MetadataResourceImpl extends XMLResourceImpl implements XMLResource.ResourceHandler { - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Oracle inc."; - - /** - * IMetaDataSourceModelProvider - */ - protected IMetaDataSourceModelProvider _provider; - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param uri the URI of the new resource. - * @generated - */ - public MetadataResourceImpl(URI uri) { - super(uri); - } - - /** - * Constructor - */ - public MetadataResourceImpl() { - super(); - } - - - /** - * Constructor - * @param provider - */ - public MetadataResourceImpl(IMetaDataSourceModelProvider provider){ - super(); - _provider = provider; - } - - /** - * @generated NOT - */ - protected XMLLoad createXMLLoad() { - return new MetadataXMLLoad(createXMLHelper()); - } - /** - * Override createXMLHelper so that MetadataPackage.eINSTANCE is used for the NoNamespace package - * @generated NOT - */ - protected XMLHelper createXMLHelper() { - return new XMLHelperImpl(){ - @Override - public EPackage getNoNamespacePackage() { - return MetadataPackage.eINSTANCE; - } - }; - } - - public void postLoad(XMLResource resource, InputStream inputStream, - Map options) - { - final List<EObject> resContents = resource.getContents(); - - if (resContents.size() > 0) - { - final Object aRoot = resContents.get(0); - if (aRoot instanceof Model) - { - setModelKeyInTraits((Model) aRoot, (Model) aRoot); - } - } - else - { - JSFCommonPlugin.log(IStatus.WARNING, - "No model loaded for "+getURI()); - } - } - - private void setModelKeyInTraits(Model root, Entity currentEntity) { - // TODO: does this have side effect that we care about? nothing is done with the return value - MetadataPackage.eINSTANCE.getTrait_SourceModelProvider(); - for (int i=0;i < currentEntity.getTraits().size();i++){ - ((Trait)currentEntity.getTraits().get(i)).setSourceModelProvider(_provider); - } - for (int j=0;j < currentEntity.getChildEntities().size();j++){ - setModelKeyInTraits(root,(Entity)currentEntity.getChildEntities().get(j)); - } - - if (currentEntity == root){ - for (int k=0;k < root.getEntityGroups().size();k++){ - setModelKeyInTraits(root,(Entity)root.getEntityGroups().get(k)); - } - } - } - - - public void postSave(XMLResource resource, OutputStream outputStream, - Map options) { - // do nothing - } - - public void preLoad(XMLResource resource, InputStream inputStream, - Map options) { - // do nothing - } - - public void preSave(XMLResource resource, OutputStream outputStream, - Map options) { - // do nothing - } - - /** - * Override the handleErrors() method so that resource will load gracefully, and errors reported later - * when appropriate - * - * @generated NOT - */ - private static class MetadataXMLLoad extends XMLLoadImpl { - - public MetadataXMLLoad(XMLHelper helper) { - super(helper); - } - - @Override - protected void handleErrors() throws IOException { - //by doing nothing here, this allows the list of non-fatal errors (res.getErrors()) to be returned - } - - @Override - protected DefaultHandler makeDefaultHandler() { - return new MetadataXMLHandler(resource, helper, options); - } - } - - /** - * Ensures that only EMF extension models registered with the EMF Package Registry are considered. - * @generated NOT - */ - private static class MetadataXMLHandler extends SAXXMLHandler { - - public MetadataXMLHandler(XMLResource xmiResource, XMLHelper helper, - Map<?, ?> options) { - super(xmiResource, helper, options); - } - - @Override - protected EPackage getPackageForURI(String uriString) { - //code taken from super and modified so that only package registry is considered - if (uriString == null) - { - return null; - } - - EPackage ePackage = packageRegistry.getEPackage(uriString); - - if (ePackage != null && ePackage.eIsProxy()) - { - ePackage = null; - } - - if (ePackage == null) - { - ePackage = handleMissingPackage(uriString); - } - - if (ePackage == null) - { - error - (new PackageNotFoundException - (uriString, - getLocation(), - getLineNumber(), - getColumnNumber())); - } - - return ePackage; - } - } -} //MetadataResourceImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java deleted file mode 100644 index 4812ac4f7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java +++ /dev/null @@ -1,233 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataSwitch.java,v 1.6 2007/10/01 04:29:45 cbateman Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.util; - - -import java.util.List; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; - - - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage - * @generated - */ -public class MetadataSwitch { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static MetadataPackage modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataSwitch() { - if (modelPackage == null) { - modelPackage = MetadataPackage.eINSTANCE; - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public Object doSwitch(EObject theEObject) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param theEClass - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(EClass theEClass, EObject theEObject) { - if (theEClass.eContainer() == modelPackage) { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch((EClass)eSuperTypes.get(0), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param classifierID - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case MetadataPackage.MODEL: { - Model model = (Model)theEObject; - Object result = caseModel(model); - if (result == null) result = caseEntity(model); - if (result == null) result = defaultCase(theEObject); - return result; - } - case MetadataPackage.ENTITY_GROUP: { - EntityGroup entityGroup = (EntityGroup)theEObject; - Object result = caseEntityGroup(entityGroup); - if (result == null) result = caseEntity(entityGroup); - if (result == null) result = defaultCase(theEObject); - return result; - } - case MetadataPackage.ENTITY: { - Entity entity = (Entity)theEObject; - Object result = caseEntity(entity); - if (result == null) result = defaultCase(theEObject); - return result; - } - case MetadataPackage.TRAIT: { - Trait trait = (Trait)theEObject; - Object result = caseTrait(trait); - if (result == null) result = defaultCase(theEObject); - return result; - } - case MetadataPackage.INCLUDE_ENTITY_GROUP: { - IncludeEntityGroup includeEntityGroup = (IncludeEntityGroup)theEObject; - Object result = caseIncludeEntityGroup(includeEntityGroup); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Trait</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Trait</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseTrait(Trait object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Include Entity Group</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Include Entity Group</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIncludeEntityGroup(IncludeEntityGroup object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Model</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Model</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseModel(Model object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Entity</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Entity</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseEntity(Entity object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Entity Group</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Entity Group</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseEntityGroup(EntityGroup object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - public Object defaultCase(EObject object) { - return null; - } - -} //MetadataSwitch diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java deleted file mode 100644 index 39a97912f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: MetadataXMLProcessor.java,v 1.3 2007/04/16 19:54:01 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.internal.util; - -import java.util.Map; - -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.xmi.util.XMLProcessor; -import org.eclipse.jst.jsf.common.metadata.MetadataPackage; - - -/** - * This class contains helper methods to serialize and deserialize XML documents - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class MetadataXMLProcessor extends XMLProcessor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - - /** - * Public constructor to instantiate the helper. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public MetadataXMLProcessor() { - super((EPackage.Registry.INSTANCE)); - MetadataPackage.eINSTANCE.eClass(); - } - - /** - * Register for "*" and "xml" file extensions the MetadataResourceFactoryImpl factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected Map getRegistrations() { - if (registrations == null) { - super.getRegistrations(); - registrations.put(XML_EXTENSION, new MetadataResourceFactoryImpl()); - registrations.put(STAR_EXTENSION, new MetadataResourceFactoryImpl()); - } - return registrations; - } - -} //MetadataXMLProcessor diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java deleted file mode 100644 index 836883f01..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * EMF interface objects for design-time metadata. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.metadata; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java deleted file mode 100644 index 282b63923..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Abstract class implmenting {@link IEntityQueryVisitor} that concrete subclasses should provide implementations - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractEntityQueryVisitor extends AbstractEntityVisitor - implements IEntityQueryVisitor { - - /** - * @return EmptyResultSet. Subclasses should override. - */ - public IResultSet findEntities(Entity initialEntityContext, String entityKey) { - return new EmptyResultSet(); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java deleted file mode 100644 index 54e6f0165..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Abstract implementation that concrete subclasses should ovveride - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractEntityVisitor extends AbstractMetaDataVisitor - implements IEntityVisitor { - - public abstract void visit(Entity entity); - - public void visitCompleted(Entity entity){ - //subclasses should override if needed - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java deleted file mode 100644 index 15443e5d5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -/** - * Abstract class implementing {@link IMetaDataVisitor} - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractMetaDataVisitor implements IMetaDataVisitor { - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting() - */ - public boolean stopVisiting() { - return false; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java deleted file mode 100644 index 32b4982db..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import java.util.Collections; -import java.util.List; - -/** - * Abstract implementation of {@link IResultSet} that developers may subclass. - * Users should assume that the results are only valid at the time of the query. This may change in the future. - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractResultSet/*<T>*/ implements IResultSet/*<T>*/ { - private List _results; - private boolean _isClosed = false; - - public List getResults() throws MetaDataException { - initIfNecessary(); - return _results; - } - - public final void close() throws MetaDataException { - doClose(); - _isClosed = true; - _results = null; - } - - /** - * Overridable method to close resultset. This is called by close() - * @throws MetaDataException - */ - protected void doClose() throws MetaDataException { - //subclasses to provide override - } - - public final boolean isClosed() { - return _isClosed; - } - - /** - * @return List of results. Null is tolerated. - */ - protected abstract List getInternalResults(); - - private void initIfNecessary() throws MetaDataException { - if (_isClosed) - throw new MetaDataException("Attempt to access a closed resultset."); - - if (_results == null) { - List checkNullResults = getInternalResults(); - if (checkNullResults == null){ - checkNullResults = Collections.EMPTY_LIST; - } - _results = Collections.unmodifiableList(checkNullResults); - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java deleted file mode 100644 index ddb894088..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Abstract implmentation of {@link ITraitQueryVisitor} that subclasses should use to provide implmentation - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractTraitQueryVisitor extends AbstractTraitVisitor implements - ITraitQueryVisitor { - - /** - * @return EmptyResultSet. Subclasses should override. - */ - public IResultSet findTraits(Entity entity, String traitKey) { - return new EmptyResultSet(); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java deleted file mode 100644 index 795a473e1..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Trait; - -/** - * Abstract Trait visitor - * <p><b>Provisional API - subject to change</b></p> - */ -public abstract class AbstractTraitVisitor extends AbstractMetaDataVisitor implements ITraitVisitor{ - - public abstract void visit(final Trait trait); - - public void visitCompleted(final Trait trait) { - //subclasses should override if needed - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java deleted file mode 100644 index 0c6539e43..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -import java.util.Collections; -import java.util.List; - -/** - * Implementation of an empty result set - * <p><b>Provisional API - subject to change</b></p> - */ -public final class EmptyResultSet implements IResultSet { - private boolean _isClosed = false; - public void close() { - _isClosed = true; - } - - public List getResults() throws MetaDataException{ - if (_isClosed) - throw new MetaDataException("Resultset is closed"); - - return Collections.EMPTY_LIST; - } - - public boolean isClosed() { - return _isClosed; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java deleted file mode 100644 index 7f168c162..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Entity querying interface - * <p>NOT to implemented by clients directly. Clients should subclass AbstractEntityQueryVisitor instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface IEntityQueryVisitor extends IEntityVisitor{ - /** - * @param initialEntityContext - * @param entityKey to find relative to the passed intialEntityContext - * @return IResultSet of Entities matching the key. IResultSet must NOT be null. Implementers may return {@link EmptyResultSet}. - */ - public IResultSet/*<Entity>*/ findEntities(final Entity initialEntityContext, - final String entityKey); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java deleted file mode 100644 index fcc178381..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Visitor interface for Entities - * <p>NOT to implemented by clients directly. Clients should subclass AbstractEntityVisitor instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface IEntityVisitor extends IMetaDataVisitor { - /** - * Visit the entity. - * The entity and then it's children are visited - * @param entity - must not be NULL - */ - public void visit(final Entity entity); - /** - * Signal that the entity and all it's children is now completely 'visited'. - * The entity will call this method at the end of the accept method. - * @param entity - must not be NULL - */ - public void visitCompleted(Entity entity); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java deleted file mode 100644 index c70cdd981..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.context.IModelContext; - -/** - * <p><b>Provisional API - subject to change</b></p> - */ -public interface IMetaDataModelContext extends IModelContext { - /** - * @return domain identifier for this context. - * <p>This must match the domain id from the org.eclipse.jst.jsf.common.DomainLoadingStrategies - */ - public String getDomainID(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java deleted file mode 100644 index 35a3652a3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -/** - * Common interface for Entity and Trait visitors - * <p>NOT to implemented by clients directly. Clients should subclass AbstractMetaDataVisitor instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface IMetaDataVisitor { - /** - * @return true if visitor has recognized that visiting should stop - */ - public boolean stopVisiting(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java deleted file mode 100644 index 0d0ab4866..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import java.util.List; - - - -/** - * Results from a metadata query. The resultset should be considered valid only at the time that the query is performed. - * Once "closed", the resultset should not be accessed again. - * - * <p>Not intended to be implemented directly by clients. Developers should extend {@link AbstractResultSet} instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface IResultSet/*<T>*/{ - - /** - * @return unmodifiable List of results. May NOT be null. Implementer must return Collections.EMPTY_LIST instead. - * @throws MetaDataException - */ - public List/*<T>*/ getResults() throws MetaDataException; - - /** - * Signal that the query results are no longer required allowing for any cleanup that may be required - * Once a resultset is closed, a MetaDataException should be thrown if the next() or hasNext() is called. Clients can check isClosed() first. - * @throws MetaDataException - */ - public void close() throws MetaDataException; - - /** - * @return true if this resultset has been closed. - */ - public boolean isClosed(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java deleted file mode 100644 index 17595f9ea..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.core.resources.IProject; - -/** - * Context for determining the Model to locate in the MetaDataManager - * <p>Should NOT be implemented by clients - * <p><b>Provisional API - subject to change</b></p> - */ -public interface ITaglibDomainMetaDataModelContext extends IMetaDataModelContext { - /** - * @return project - */ - public IProject getProject(); - /** - * @return the namespace URI as String - */ - public String getURI(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java deleted file mode 100644 index fd96a3721..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Entity; - -/** - * Trait querying interface - * <p>NOT to implemented by clients directly. Clients should subclass AbstractTraitQueryVisitor instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface ITraitQueryVisitor extends ITraitVisitor{ - /** - * @param entity - * @param traitKey - * @return IResultSet of Traits. IResultSet must NOT be null. Implementers may return {@link EmptyResultSet}. - */ - public IResultSet/*<Trait>*/ findTraits(final Entity entity, - final String traitKey); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java deleted file mode 100644 index 9b39a101d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import org.eclipse.jst.jsf.common.metadata.Trait; - -/** - * Visitor interface for Traits - * <p>NOT to implemented by clients directly. Clients should subclass AbstractTraitVisitor instead. - * <p><b>Provisional API - subject to change</b></p> - */ -public interface ITraitVisitor extends IMetaDataVisitor { - /** - * Visit the Trait. - * Implementer cannot assume ordering of trait visiting. - * @param trait - must not be null - */ - public void visit(final Trait trait); - - /** - * Signal that the the trait has been completely visited - * @param trait - */ - public void visitCompleted(final Trait trait); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java deleted file mode 100644 index 50b314fbe..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query; - -/** - * Exception intended to be superclass of all exceptions thrown while handling metadata during query - * <p><b>Provisional API - subject to change</b></p> - */ -public class MetaDataException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * Constructor - */ - public MetaDataException(){ - super(); - } - /** - * Constructor - * @param msg - */ - public MetaDataException(String msg){ - super(msg); - } - - /** - * Constructor - * @param msg - * @param cause - */ - public MetaDataException(String msg, Throwable cause){ - super(msg, cause); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java deleted file mode 100644 index b8afde9cb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java +++ /dev/null @@ -1,223 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query; - -import javax.xml.namespace.QName; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.Model; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModel; -import org.eclipse.jst.jsf.common.metadata.internal.TaglibDomainMetaDataModelContextImpl; -import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelManager; -import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleEntityQueryVisitorImpl; -import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleTraitQueryVisitorImpl; -import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl; - - -/** - * Helper class with static methods to simplify querying of a metadata model. - * - * <p>Steps for use: - * <br>1) Get the ITaglibDomainMetaDataModelContext using createMetaDataModelContext or createTagLibraryDomainMetaDataModelContext - * <br>2) Use appropriate getXXX methods using the ITaglibDomainMetaDataModelContext. - * <p><b>Provisional API - subject to change</b></p> - * @see IResultSet - * @see IEntityQueryVisitor - * @see ITraitQueryVisitor - * @see ITaglibDomainMetaDataModelContext - * @see Model - * @see Entity - * @see Trait - */ -public final class TaglibDomainMetaDataQueryHelper{ - /** - * Domain id for Tag library domain of metatdata - */ - public static final String TAGLIB_DOMAIN = "TagLibraryDomain"; //need better place for this - - /** - * private constructor - */ - private TaglibDomainMetaDataQueryHelper (){ - super(); - } - - /** - * Convenience method for creating {@link ITaglibDomainMetaDataModelContext}s for TAGLIB_DOMAIN - * @param project - * @param uri - * @return ITaglibDomainMetaDataModelContext - */ - public static ITaglibDomainMetaDataModelContext createMetaDataModelContext(IProject project, String uri){ - return new TaglibDomainMetaDataModelContextImpl(TAGLIB_DOMAIN, project, uri); - } - /** - * @param modelContext - * @return Model object for given context. May return null if not located. - */ - public static Model getModel(final ITaglibDomainMetaDataModelContext modelContext) { - MetaDataModel model = getMDModel(modelContext); - //we may want to throw error that model is empty - if (model != null && !model.isEmpty()){ - return (Model)model.getRoot(); - } - return null; - } - - /** - * @param modelContext - * @param entityKey relative to root of the model - * @return the first entity match from the root of the model. May return null. - */ - public static Entity getEntity(final ITaglibDomainMetaDataModelContext modelContext, - final String entityKey) { - IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS)); - IResultSet/*<Entity>*/ rs = getEntities(modelContext,entityKey, visitor); - Entity e = null; - try { - if (! rs.getResults().isEmpty()){ - e = (Entity)rs.getResults().get(0); - } - rs.close(); - } catch (MetaDataException ex) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getEntity() - 1", ex); - } - - return e; - } - - /** - * @param modelContext - * @param entityKey relative to root of model - * @param visitor - * @return an IResultSet of entity objects - */ - public static IResultSet/*<Entity>*/ getEntities(final ITaglibDomainMetaDataModelContext modelContext, - final String entityKey, final IEntityQueryVisitor visitor){ - Model model = getModel(modelContext); - //we may want to throw error that model is empty - return getEntities(model, entityKey, visitor); - - } - - /** - * @param entity - * @param traitKey - * @return a trait or null for the given entity and traitKey using a SimpleEntityQueryVisitorImpl - */ - public static Trait getTrait(final Entity entity, final String traitKey){ - ITraitQueryVisitor visitor = new SimpleTraitQueryVisitorImpl(); - Trait t= null; - IResultSet/*<Trait>*/ rs = getTraits(entity, traitKey, visitor); - try { - if (! rs.getResults().isEmpty()){ - t = (Trait)rs.getResults().get(0); - } - rs.close(); - } catch (MetaDataException ex) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getTrait()", ex); - } - - return t; - } - - /** - * @param entity - * @param traitKey - * @param traitQueryVisitor - * @return an IResultSet of trait objects using supplied traitQueryVisitor. IResultSet should NOT be null. - */ - public static IResultSet/*<Trait>*/ getTraits(Entity entity, String traitKey, - ITraitQueryVisitor traitQueryVisitor) { - IResultSet/*<Trait>*/ rs = traitQueryVisitor.findTraits(entity, traitKey); - return rs; - } - - /** - * @param initialEntityContext - * @param entityKey relative to initial passed entity - * @return the first entity located by key using SimpleEntityQueryVisitorImpl - */ - public static Entity getEntity(Entity initialEntityContext, String entityKey) { - IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS)); - Entity e= null; - IResultSet/*<Entity>*/ rs = getEntities(initialEntityContext, entityKey, visitor); - try { - if (! rs.getResults().isEmpty()){ - e = (Entity)rs.getResults().get(0); - } - rs.close(); - } catch (MetaDataException ex) { - JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getEntity() - 0", ex); - } - - return e; - } - - /** - * @param initialEntityContext - * @param entityQuery relative to initial passed entity - * @param entityKeyQueryVisitor - * @return IResultSet of entities located by key using entityQueryVisitor. IResultSet should NOT be null. - */ - public static IResultSet/*<Entity>*/ getEntities(Entity initialEntityContext, String entityQuery, - IEntityQueryVisitor entityKeyQueryVisitor) { - - return entityKeyQueryVisitor.findEntities(initialEntityContext, entityQuery); - } - - - /** - * Retrieve the MetaDataModel from the ModelManager for given key - * @param modelContext - * @return MetaDataModel - */ - private static MetaDataModel getMDModel(final ITaglibDomainMetaDataModelContext modelContext){ - MetaDataModelManager mgr = null; - if (modelContext.getProject() != null) - mgr = MetaDataModelManager.getInstance(modelContext.getProject()); - else //temp(?) - mgr = MetaDataModelManager.getSharedInstance(); - - return mgr.getModel(modelContext); - } - - /** - * @param modelContext - * @param entityKey - * @param traitKey - * @return first trait found for entity and trait key starting from root of the model using SimpleMetaDataQueryImpl - */ - public static Trait getTrait(final ITaglibDomainMetaDataModelContext modelContext, - final String entityKey, final String traitKey) { - Entity entity = getEntity(modelContext, entityKey); - Trait t = null; - if (entity != null){ - t = getTrait(entity, traitKey); - } - return t; - } - - /** - * @param tagEntity - * @return QName for tag entity - */ - public static QName getQNameForTagEntity(Entity tagEntity) { - Assert.isTrue(tagEntity != null); - return new QName(tagEntity.getModel().getCurrentModelContext().getUri(), tagEntity.getId()); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java deleted file mode 100644 index 36d446e56..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.metadata.query.internal; - -/** - * Sets controls on how a tree of nodes can be searched - */ -public class HierarchicalSearchControl extends SearchControl { - //scope levels - /** - * Do not recurse. - */ - public static final int SCOPE_CURRENT_LEVEL = 0; - /** - * Allow for one level of children to be visited from initial context - */ - public static final int SCOPE_ONE_LEVEL = 1; - /** - * Allow unlimited recursion of children - */ - public static final int SCOPE_ALL_LEVELS = 2; - - private int scope = SCOPE_ALL_LEVELS; - - /** - * Constructor using defaults of COUNT_LIMIT_NONE and SCOPE_ALL_LEVELS - */ - public HierarchicalSearchControl(){ - super(); - } - /** - * Constructor - * @param countLimit - * @param scope - */ - public HierarchicalSearchControl(int countLimit, int scope){ - super(countLimit); - this.scope = scope; - } - - - /** - * @param scope - */ - public void setScope(int scope){ - this.scope= scope; - } - - /** - * @return scope - */ - public int getScope(){ - return scope; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java deleted file mode 100644 index 43e131752..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query.internal; - -/** - * Simple class used by {@link SimpleEntityQueryVisitorImpl} allowing some control of a metadata query. - * A query visitor can use this to optimize the query results and signal completion. - */ -public class SearchControl { - - /** - * No limit on query results - */ - public static final int COUNT_LIMIT_NONE = -1; - - //default settings - private int countLimit = COUNT_LIMIT_NONE; - - - /** - * Constructor using defaults of COUNT_LIMIT_NONE - */ - public SearchControl(){ - //use default settings - } - - /** - * Constructor - * @param countLimit - */ - public SearchControl(int countLimit){ - this.countLimit = countLimit; - } - - /** - * @param limit results count limit - */ - public void setCountLimit(int limit){ - this.countLimit = limit; - } - - /** - * @return query results count limit - */ - public int getCountLimit(){ - return countLimit; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java deleted file mode 100644 index 0748095fd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java +++ /dev/null @@ -1,182 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query.internal; - -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.query.AbstractEntityQueryVisitor; -import org.eclipse.jst.jsf.common.metadata.query.IResultSet; - - -/** - * A simple metadata query visitor implementing {@link org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor} and {@link org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor}. - * - simple find entity and traits by id only - * - Does not allow for wild card searchs - * - * TODO - fix for case-sensitivity https://bugs.eclipse.org/bugs/show_bug.cgi?id=212794 - */ -public class SimpleEntityQueryVisitorImpl extends AbstractEntityQueryVisitor { - private HierarchicalSearchControl control; - private boolean _stop; - - private EntityQueryComparator entityComparator; - private List/*<Entity>*/ _entityResults; - - /** - * Constructor that also creates a default SearchControl - */ - public SimpleEntityQueryVisitorImpl() { - super(); - control = new HierarchicalSearchControl(); - } - - /** - * Constructor - * @param control - */ - public SimpleEntityQueryVisitorImpl(HierarchicalSearchControl control) { - super(); - this.control = control; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor#findEntities(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String) - */ - public IResultSet/*<Entity>*/ findEntities(Entity initialEntityContext, - String entityKey) { - - resetQuery(); - - if (initialEntityContext != null){ - entityComparator = new EntityQueryComparator(entityKey); - initialEntityContext.accept(this); - } - - return new SimpleResultSet(getInternalEntityResults()); - } - - private void resetQuery() { - _stop = false; - _entityResults = null; - } - - private List/*<Entity>*/ getInternalEntityResults(){ - if (_entityResults == null){ - _entityResults = new ArrayList/*<Entity>*/(); - } - return _entityResults; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visit(org.eclipse.jst.jsf.common.metadata.Entity) - */ - public void visit(Entity key) { - switch (entityComparator.compareTo(key)){ - case 0: - getInternalEntityResults().add(key); - break; - default: - break; - - } - checkShouldStopVisitingEntities(); - } - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visitCompleted(Entity entity) - */ - public void visitCompleted(Entity entity) { - entityComparator.popContext(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting() - */ - public boolean stopVisiting() { - return _stop; - } - - private void checkShouldStopVisitingEntities(){ - //implement how to set stop to signal to the entity accept() to skip visiting - if (control.getCountLimit()== getInternalEntityResults().size() && control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE ) - _stop = true; - } - - /** - * Simple comparator that compares that an entity's id for with another. - * Case-insensitive compare - * - */ - private class EntityQueryComparator implements Comparable/*<Entity>*/{ - - private String entityKey; - private EntityStack stack; - - /** - * Constructor - * @param entityKey - */ - public EntityQueryComparator(String entityKey){ - this.entityKey = entityKey.toUpperCase(); - stack = new EntityStack(); - } - - public int compareTo(Object entity) { - stack.push(entity); - return entityKey.compareTo(getRelativeId().toUpperCase()); - } - - /** - * Pop stack - */ - public void popContext(){ - stack.pop(); - } - - private String getRelativeId(){ - int size = stack.size(); - int i = 1; - StringBuffer buf = new StringBuffer(); - while(i < size){ - Entity e = (Entity)stack.elementAt(i); - if (!(e instanceof EntityGroup)){ - if (buf.length()>0) - buf.append("/"); - buf.append(e.getId()); - } - i++; - } - return buf.toString(); - } - } - - /** - * Stack used for determining relative key of an entity from the initial context. - */ - private class EntityStack extends Stack/*<Entity>*/ { - /** - * - */ - private static final long serialVersionUID = -6010267544968175003L; - - /** - * Constructor - */ - public EntityStack(){ - super(); - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java deleted file mode 100644 index a3b2f2ae2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query.internal; - - -import java.util.Collections; -import java.util.List; - -import org.eclipse.jst.jsf.common.metadata.query.AbstractResultSet; - -/** - * Simple implementation of {@link org.eclipse.jst.jsf.common.metadata.query.IResultSet} by extending AbstractResultSet - * - */ -public final class SimpleResultSet/*<T>*/ extends AbstractResultSet/*<T>*/ { - private List/*<T>*/ results; - - /** - * Constructor passing a list to hold the results - * @param results - */ - public SimpleResultSet(List/*<T>*/ results){ - super(); - this.results = results; - } - - protected List getInternalResults(){ - if (results == null){ - results = Collections.EMPTY_LIST; - } - return results; - } - - -} - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java deleted file mode 100644 index 00423648f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.query.internal; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jst.jsf.common.metadata.Entity; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.query.AbstractTraitQueryVisitor; -import org.eclipse.jst.jsf.common.metadata.query.IResultSet; - - -/** - * A simple metadata query visitor implementing {@link org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor}. - * - simple find traits by id only - * - Does not allow for wild card searchs - */ -public class SimpleTraitQueryVisitorImpl extends AbstractTraitQueryVisitor { - - private String _traitQuery; - private SearchControl _control; - private boolean _stop; - private List/*<Trait>*/ _traitResults; - - /** - * Constructor that also creates a default SearchControl - */ - public SimpleTraitQueryVisitorImpl() { - super(); - _control = new SearchControl(); - } - - /** - * Constructor - * @param control - */ - public SimpleTraitQueryVisitorImpl(SearchControl control) { - super(); - this._control = control; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor#findTraits(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String) - */ - public IResultSet/*<Trait>*/ findTraits(final Entity entity, final String traitQuery){ - - resetQuery(); - if (entity != null){ - this._traitQuery = traitQuery; - for (Iterator/*<Trait>*/ it=entity.getTraits().iterator();it.hasNext();){ - Trait t = (Trait)it.next(); - t.accept(this); - if (stopVisiting()) - break; - } - } - return new SimpleResultSet(getInternalTraitResults()); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor#visit(org.eclipse.jst.jsf.common.metadata.Trait) - */ - public void visit(Trait trait) { - if (trait.equals(_traitQuery)) - getInternalTraitResults().add(trait); - - checkShouldStopVisitingTraits(); - } - - /** - * - */ - private void resetQuery() { - _stop = false; - _traitResults = null; - } - - /** - * @return lazy init of a SimpleResultSet of Traits - */ - private List/*<Trait>*/ getInternalTraitResults(){ - if (_traitResults == null){ - _traitResults = new ArrayList/*<Trait>*/(); - } - return _traitResults; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting() - */ - public boolean stopVisiting() { - return _stop; - } - - private void checkShouldStopVisitingTraits(){ - if (_control.getCountLimit()== getInternalTraitResults().size() && _control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE) - _stop = true; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java deleted file mode 100644 index bb9019ece..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Meta-data query interface. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.metadata.query; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java deleted file mode 100644 index 52b338259..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>List Of Values</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues() - * @model - * @generated - */ -public interface ListOfValues extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Returns the value of the '<em><b>Entries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.emf.ecore.xml.type.SimpleAnyType}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Entries</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Entries</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues_Entries() - * @model type="org.eclipse.emf.ecore.xml.type.SimpleAnyType" containment="true" - * extendedMetaData="kind='element' name='item'" - * @generated - */ - EList getEntries(); - -} // ListOfValues diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java deleted file mode 100644 index 9c4fea7b5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; - -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Set Generator</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator() - * @model - * @generated - */ -public interface SetGenerator extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Returns the value of the '<em><b>Algorithm</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Algorithm</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Algorithm</em>' attribute. - * @see #setAlgorithm(String) - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Algorithm() - * @model extendedMetaData="kind='element'" - * @generated - */ - String getAlgorithm(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Algorithm</em>' attribute. - * @see #getAlgorithm() - * @generated - */ - void setAlgorithm(String value); - - /** - * Returns the value of the '<em><b>Expression</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Expression</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Expression</em>' attribute. - * @see #setExpression(String) - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Expression() - * @model extendedMetaData="kind='element'" - * @generated - */ - String getExpression(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Expression</em>' attribute. - * @see #getExpression() - * @generated - */ - void setExpression(String value); - -} // SetGenerator diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java deleted file mode 100644 index 6e76eed0b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; - -import org.eclipse.emf.ecore.EFactory; - -/** - * <!-- begin-user-doc --> - * The <b>Factory</b> for the model. - * It provides a create method for each non-abstract class of the model. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage - * @generated - */ -public interface TraitTypesFactory extends EFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The singleton instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - TraitTypesFactory eINSTANCE = org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesFactoryImpl.init(); - - /** - * Returns a new object of class '<em>List Of Values</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>List Of Values</em>'. - * @generated - */ - ListOfValues createListOfValues(); - - /** - * Returns a new object of class '<em>Set Generator</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Set Generator</em>'. - * @generated - */ - SetGenerator createSetGenerator(); - - /** - * Returns the package supported by this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the package supported by this factory. - * @generated - */ - TraitTypesPackage getTraitTypesPackage(); - -} //TraitTypesFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java deleted file mode 100644 index 5ea095d8e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java +++ /dev/null @@ -1,260 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * <!-- begin-user-doc --> - * The <b>Package</b> for the model. - * It contains accessors for the meta objects to represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory - * @model kind="package" - * @generated - */ -@SuppressWarnings("hiding") -public interface TraitTypesPackage extends EPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The package name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNAME = "traittypes"; - - /** - * The package namespace URI. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_URI = "http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"; - - /** - * The package namespace name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_PREFIX = "mdt"; - - /** - * The singleton instance of the package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - TraitTypesPackage eINSTANCE = org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl.init(); - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl <em>List Of Values</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getListOfValues() - * @generated - */ - int LIST_OF_VALUES = 0; - - /** - * The feature id for the '<em><b>Entries</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int LIST_OF_VALUES__ENTRIES = 0; - - /** - * The number of structural features of the '<em>List Of Values</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int LIST_OF_VALUES_FEATURE_COUNT = 1; - - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl <em>Set Generator</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getSetGenerator() - * @generated - */ - int SET_GENERATOR = 1; - - /** - * The feature id for the '<em><b>Algorithm</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int SET_GENERATOR__ALGORITHM = 0; - - /** - * The feature id for the '<em><b>Expression</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int SET_GENERATOR__EXPRESSION = 1; - - /** - * The number of structural features of the '<em>Set Generator</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int SET_GENERATOR_FEATURE_COUNT = 0; - - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>List Of Values</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues - * @generated - */ - EClass getListOfValues(); - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Entries</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries() - * @see #getListOfValues() - * @generated - */ - EReference getListOfValues_Entries(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Set Generator</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator - * @generated - */ - EClass getSetGenerator(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Algorithm</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm() - * @see #getSetGenerator() - * @generated - */ - EAttribute getSetGenerator_Algorithm(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Expression</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression() - * @see #getSetGenerator() - * @generated - */ - EAttribute getSetGenerator_Expression(); - - /** - * Returns the factory that creates the instances of the model. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the factory that creates the instances of the model. - * @generated - */ - TraitTypesFactory getTraitTypesFactory(); - - /** - * <!-- begin-user-doc --> - * Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * @generated - */ - interface Literals { - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl <em>List Of Values</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getListOfValues() - * @generated - */ - EClass LIST_OF_VALUES = eINSTANCE.getListOfValues(); - - /** - * The meta object literal for the '<em><b>Entries</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference LIST_OF_VALUES__ENTRIES = eINSTANCE.getListOfValues_Entries(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl <em>Set Generator</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getSetGenerator() - * @generated - */ - EClass SET_GENERATOR = eINSTANCE.getSetGenerator(); - - /** - * The meta object literal for the '<em><b>Algorithm</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute SET_GENERATOR__ALGORITHM = eINSTANCE.getSetGenerator_Algorithm(); - - /** - * The meta object literal for the '<em><b>Expression</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute SET_GENERATOR__EXPRESSION = eINSTANCE.getSetGenerator_Expression(); - - } - -} //TraitTypesPackage diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java deleted file mode 100644 index c3ce0ea6e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: ListOfValuesImpl.java,v 1.3 2007/04/16 19:54:01 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.EObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.emf.ecore.xml.type.SimpleAnyType; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>List Of Values</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl#getEntries <em>Entries</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class ListOfValuesImpl extends EObjectImpl implements ListOfValues { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached value of the '{@link #getEntries() <em>Entries</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getEntries() - * @generated - * @ordered - */ - protected EList entries = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ListOfValuesImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return TraitTypesPackage.Literals.LIST_OF_VALUES; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getEntries() { - if (entries == null) { - entries = new EObjectContainmentEList(SimpleAnyType.class, this, TraitTypesPackage.LIST_OF_VALUES__ENTRIES); - } - return entries; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case TraitTypesPackage.LIST_OF_VALUES__ENTRIES: - return ((InternalEList)getEntries()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TraitTypesPackage.LIST_OF_VALUES__ENTRIES: - return getEntries(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TraitTypesPackage.LIST_OF_VALUES__ENTRIES: - getEntries().clear(); - getEntries().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case TraitTypesPackage.LIST_OF_VALUES__ENTRIES: - getEntries().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case TraitTypesPackage.LIST_OF_VALUES__ENTRIES: - return entries != null && !entries.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ListOfValuesImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java deleted file mode 100644 index e4d96b686..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: SetGeneratorImpl.java,v 1.2 2007/04/16 19:54:01 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Set Generator</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl#getAlgorithm <em>Algorithm</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl#getExpression <em>Expression</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class SetGeneratorImpl extends EObjectImpl implements SetGenerator { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The default value of the '{@link #getAlgorithm() <em>Algorithm</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAlgorithm() - * @generated - * @ordered - */ - protected static final String ALGORITHM_EDEFAULT = null; - - /** - * The cached value of the '{@link #getAlgorithm() <em>Algorithm</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAlgorithm() - * @generated - * @ordered - */ - protected String algorithm = ALGORITHM_EDEFAULT; - - /** - * The default value of the '{@link #getExpression() <em>Expression</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getExpression() - * @generated - * @ordered - */ - protected static final String EXPRESSION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getExpression() <em>Expression</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getExpression() - * @generated - * @ordered - */ - protected String expression = EXPRESSION_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected SetGeneratorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return TraitTypesPackage.Literals.SET_GENERATOR; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setAlgorithm(String newAlgorithm) { - String oldAlgorithm = algorithm; - algorithm = newAlgorithm; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.SET_GENERATOR__ALGORITHM, oldAlgorithm, algorithm)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getExpression() { - return expression; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setExpression(String newExpression) { - String oldExpression = expression; - expression = newExpression; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.SET_GENERATOR__EXPRESSION, oldExpression, expression)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TraitTypesPackage.SET_GENERATOR__ALGORITHM: - return getAlgorithm(); - case TraitTypesPackage.SET_GENERATOR__EXPRESSION: - return getExpression(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TraitTypesPackage.SET_GENERATOR__ALGORITHM: - setAlgorithm((String)newValue); - return; - case TraitTypesPackage.SET_GENERATOR__EXPRESSION: - setExpression((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case TraitTypesPackage.SET_GENERATOR__ALGORITHM: - setAlgorithm(ALGORITHM_EDEFAULT); - return; - case TraitTypesPackage.SET_GENERATOR__EXPRESSION: - setExpression(EXPRESSION_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case TraitTypesPackage.SET_GENERATOR__ALGORITHM: - return ALGORITHM_EDEFAULT == null ? algorithm != null : !ALGORITHM_EDEFAULT.equals(algorithm); - case TraitTypesPackage.SET_GENERATOR__EXPRESSION: - return EXPRESSION_EDEFAULT == null ? expression != null : !EXPRESSION_EDEFAULT.equals(expression); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (algorithm: "); - result.append(algorithm); - result.append(", expression: "); - result.append(expression); - result.append(')'); - return result.toString(); - } - -} //SetGeneratorImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java deleted file mode 100644 index 6aa6dfc2b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesFactoryImpl.java,v 1.5 2007/05/11 17:54:57 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.impl.EFactoryImpl; - -import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.*; - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Factory</b>. - * <!-- end-user-doc --> - * @generated - */ -public class TraitTypesFactoryImpl extends EFactoryImpl implements TraitTypesFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Creates the default factory implementation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return TraitTypesFactory - * @generated - */ - public static TraitTypesFactory init() { - try { - TraitTypesFactory theTraitTypesFactory = (TraitTypesFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"); - if (theTraitTypesFactory != null) { - return theTraitTypesFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new TraitTypesFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesFactoryImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case TraitTypesPackage.LIST_OF_VALUES: return createListOfValues(); - case TraitTypesPackage.SET_GENERATOR: return createSetGenerator(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ListOfValues createListOfValues() { - ListOfValuesImpl listOfValues = new ListOfValuesImpl(); - return listOfValues; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public SetGenerator createSetGenerator() { - SetGeneratorImpl setGenerator = new SetGeneratorImpl(); - return setGenerator; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesPackage getTraitTypesPackage() { - return (TraitTypesPackage)getEPackage(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return TraitTypesPackage - * @deprecated - * @generated - */ - public static TraitTypesPackage getPackage() { - return TraitTypesPackage.eINSTANCE; - } - -} //TraitTypesFactoryImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java deleted file mode 100644 index e40e5ef5f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java +++ /dev/null @@ -1,277 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesPackageImpl.java,v 1.5 2007/05/11 17:54:57 gkessler Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Package</b>. - * <!-- end-user-doc --> - * @generated - */ -public class TraitTypesPackageImpl extends EPackageImpl implements TraitTypesPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass listOfValuesEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass setGeneratorEClass = null; - - /** - * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - * <p>Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#eNS_URI - * @see #init() - * @generated - */ - private TraitTypesPackageImpl() { - super(eNS_URI, TraitTypesFactory.eINSTANCE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the <b>Package</b> for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - * <p>Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - * <p>Invocation of this method will not affect any packages that have - * already been initialized. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return TraitTypesPackage - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static TraitTypesPackage init() { - if (isInited) return (TraitTypesPackage)EPackage.Registry.INSTANCE.getEPackage(TraitTypesPackage.eNS_URI); - - // Obtain or create and register package - TraitTypesPackageImpl theTraitTypesPackage = (TraitTypesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TraitTypesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TraitTypesPackageImpl()); - - isInited = true; - - // Initialize simple dependencies - XMLTypePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theTraitTypesPackage.createPackageContents(); - - // Initialize created meta-data - theTraitTypesPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theTraitTypesPackage.freeze(); - - return theTraitTypesPackage; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getListOfValues() { - return listOfValuesEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getListOfValues_Entries() { - return (EReference)listOfValuesEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getSetGenerator() { - return setGeneratorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getSetGenerator_Algorithm() { - return (EAttribute)setGeneratorEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getSetGenerator_Expression() { - return (EAttribute)setGeneratorEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesFactory getTraitTypesFactory() { - return (TraitTypesFactory)getEFactoryInstance(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - listOfValuesEClass = createEClass(LIST_OF_VALUES); - createEReference(listOfValuesEClass, LIST_OF_VALUES__ENTRIES); - - setGeneratorEClass = createEClass(SET_GENERATOR); - createEAttribute(setGeneratorEClass, SET_GENERATOR__ALGORITHM); - createEAttribute(setGeneratorEClass, SET_GENERATOR__EXPRESSION); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); - - // Add supertypes to classes - - // Initialize classes and features; add operations and parameters - initEClass(listOfValuesEClass, ListOfValues.class, "ListOfValues", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getListOfValues_Entries(), theXMLTypePackage.getSimpleAnyType(), null, "entries", null, 0, -1, ListOfValues.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(setGeneratorEClass, SetGenerator.class, "SetGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getSetGenerator_Algorithm(), ecorePackage.getEString(), "algorithm", null, 0, 1, SetGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getSetGenerator_Expression(), ecorePackage.getEString(), "expression", null, 0, 1, SetGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - // Create resource - createResource(eNS_URI); - - // Create annotations - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); - } - - /** - * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; - addAnnotation - (getListOfValues_Entries(), - source, - new String[] { - "kind", "element", - "name", "item" - }); - addAnnotation - (getSetGenerator_Algorithm(), - source, - new String[] { - "kind", "element" - }); - addAnnotation - (getSetGenerator_Expression(), - source, - new String[] { - "kind", "element" - }); - } - -} //TraitTypesPackageImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java deleted file mode 100644 index 326147700..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesAdapterFactory.java,v 1.4 2007/04/16 19:54:18 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; - -import org.eclipse.emf.common.notify.Adapter; -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.common.metadata.traittypes.traittypes.*; - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage - * @generated - */ -public class TraitTypesAdapterFactory extends AdapterFactoryImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static TraitTypesPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesAdapterFactory() { - if (modelPackage == null) { - modelPackage = TraitTypesPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch the delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected TraitTypesSwitch modelSwitch = - new TraitTypesSwitch() { - public Object caseListOfValues(ListOfValues object) { - return createListOfValuesAdapter(); - } - public Object caseSetGenerator(SetGenerator object) { - return createSetGeneratorAdapter(); - } - public Object defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - public Adapter createAdapter(Notifier target) { - return (Adapter)modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues - * @generated - */ - public Adapter createListOfValuesAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator - * @generated - */ - public Adapter createSetGeneratorAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //TraitTypesAdapterFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java deleted file mode 100644 index 6a187a3b5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesResourceFactoryImpl.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; - -import org.eclipse.emf.common.util.URI; - -import org.eclipse.emf.ecore.resource.Resource; - -import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; - -import org.eclipse.emf.ecore.xmi.XMLResource; - -/** - * <!-- begin-user-doc --> - * The <b>Resource Factory</b> associated with the package. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util.TraitTypesResourceImpl - * @generated - */ -public class TraitTypesResourceFactoryImpl extends ResourceFactoryImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Creates an instance of the resource factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesResourceFactoryImpl() { - super(); - } - - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Resource createResource(URI uri) { - XMLResource result = new TraitTypesResourceImpl(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.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; - } - -} //TraitTypesResourceFactoryImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java deleted file mode 100644 index ab734a1ce..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesResourceImpl.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; - -import org.eclipse.emf.common.util.URI; - -import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; - -/** - * <!-- begin-user-doc --> - * The <b>Resource </b> associated with the package. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util.TraitTypesResourceFactoryImpl - * @generated - */ -public class TraitTypesResourceImpl extends XMLResourceImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * Creates an instance of the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param uri the URI of the new resource. - * @generated - */ - public TraitTypesResourceImpl(URI uri) { - super(uri); - } - -} //TraitTypesResourceImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java deleted file mode 100644 index e3dc79d70..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java +++ /dev/null @@ -1,161 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesSwitch.java,v 1.6 2007/10/01 04:29:44 cbateman Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; - -import java.util.List; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.*; - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage - * @generated - */ -public class TraitTypesSwitch { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static TraitTypesPackage modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesSwitch() { - if (modelPackage == null) { - modelPackage = TraitTypesPackage.eINSTANCE; - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public Object doSwitch(EObject theEObject) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param theEClass - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(EClass theEClass, EObject theEObject) { - if (theEClass.eContainer() == modelPackage) { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch((EClass)eSuperTypes.get(0), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param classifierID - * @param theEObject - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case TraitTypesPackage.LIST_OF_VALUES: { - ListOfValues listOfValues = (ListOfValues)theEObject; - Object result = caseListOfValues(listOfValues); - if (result == null) result = defaultCase(theEObject); - return result; - } - case TraitTypesPackage.SET_GENERATOR: { - SetGenerator setGenerator = (SetGenerator)theEObject; - Object result = caseSetGenerator(setGenerator); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpretting the object as an instance of '<em>List Of Values</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>List Of Values</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseListOfValues(ListOfValues object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>Set Generator</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>Set Generator</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseSetGenerator(SetGenerator object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - public Object defaultCase(EObject object) { - return null; - } - -} //TraitTypesSwitch diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java deleted file mode 100644 index 2db735611..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: TraitTypesXMLProcessor.java,v 1.4 2007/04/16 19:54:18 itrimble Exp $ - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; - -import java.util.Map; - -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.xmi.util.XMLProcessor; - -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; - -/** - * This class contains helper methods to serialize and deserialize XML documents - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class TraitTypesXMLProcessor extends XMLProcessor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; - - - /** - * Public constructor to instantiate the helper. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TraitTypesXMLProcessor() { - super((EPackage.Registry.INSTANCE)); - TraitTypesPackage.eINSTANCE.eClass(); - } - - /** - * Register for "*" and "xml" file extensions the TraitTypesResourceFactoryImpl factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected Map getRegistrations() { - if (registrations == null) { - super.getRegistrations(); - registrations.put(XML_EXTENSION, new TraitTypesResourceFactoryImpl()); - registrations.put(STAR_EXTENSION, new TraitTypesResourceFactoryImpl()); - } - return registrations; - } - -} //TraitTypesXMLProcessor diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java deleted file mode 100644 index 76e224562..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Common meta-data traits. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java deleted file mode 100644 index 8bc288141..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets; - -import java.util.Set; - -/** - * A java.util.Set with the basic mathematic set axioms of - * extensionality (equality), union, intersection, - * relative complement (set subtraction) and empty (already - * supported by Set). - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface AxiomaticSet extends Set -{ - /** - * Implementations should aim to provide O(mn) time cost - * where n is the number of elements in this set and - * m is the cost to check membership of an element in this - * set in toSet. When a set is itself a member of a set, - * the implementation must call isEquivalent on those subsets - * recursively. - * - * @param toSet - * - * @return true iff this set is equivalent toSet. Note - * that extensionality holds that two sets are equivalent - * if and only if they contain exactly the same elements. - * - * - */ - boolean isEquivalent(AxiomaticSet toSet); - - /** - * @param set - * @return the axiomatic union of this set with set - */ - AxiomaticSet union(AxiomaticSet set); - - - /** - * @param set - * @return the axiomatic intersection of this set with set - */ - AxiomaticSet intersect(AxiomaticSet set); - - /** - * @param set - * @return convenience method that must be equivalent to - * (this.intersect(set).isEmpty()) - */ - boolean isDisjoint(AxiomaticSet set); - - /** - * The set constructed by the removing the intersection - * of this with set from this. The set will contain all - * elements in this that are not in set. - * - * Eqivalence: this - set - * - * @param set - * @return the relative complement or theoretic difference of - * set from this - */ - AxiomaticSet subtract(AxiomaticSet set); - - /** - * @return the first element in the set. There is no guarantee which element - * will be chosen, but the call should always return the same element of the set - * for multiple invocations on the same set. Generally this is a convience method - * for when the set only contains one element. - * - * @throws java.util.NoSuchElementException if the set is empty. - */ - Object getFirstElement(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java deleted file mode 100644 index baf9f8d7a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets; - -import java.util.Iterator; -import java.util.Set; - -/** - * Generic (unoptimized) utilities for doing set operations. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class AxiomaticSetUtil -{ - /** - * Creates the union of firstSet and secondSet in newSet. - * @param newSet - * @param firstSet - * @param secondSet - */ - public static void union(AxiomaticSet newSet, AxiomaticSet firstSet, AxiomaticSet secondSet) - { - newSet.addAll(firstSet); - newSet.addAll(secondSet); - } - - /** - * Creates an intersection of firstSet and secondSet in newSet - * @param newSet - * @param firstSet - * @param secondSet - */ - public static void intersect(AxiomaticSet newSet, AxiomaticSet firstSet, AxiomaticSet secondSet) - { - // minor optimization: always iterate through the smaller of the - // two sets. This way we iterate through the smallest number - // of elements - Iterator it = null; - Set testSet = null; - // if other set smaller, get its iterator - if (secondSet.size() < firstSet.size()) - { - it = secondSet.iterator(); - // test set is other set - testSet = firstSet; - } - // first set is smaller or same - else - { - it = firstSet.iterator(); - testSet = secondSet; - } - - while (it.hasNext()) - { - Object member = it.next(); - if (testSet.contains(member)) - { - newSet.add(member); - } - } - } - - /** - * @param firstSet - * @param secondSet - * @return true firstSet and secondSet have no common elements (their intersection is empty) - */ - public static boolean isDisjoint(AxiomaticSet firstSet, AxiomaticSet secondSet) - { - return firstSet.intersect(secondSet).isEmpty(); - } - - /** - * @param firstOperand - * @param secondOperand - * @return the set formed by removing the intersection of firstOperand and secondOperand - * from firstOperand, leaving only those elements in firstOperand that are not in secondOperand - */ - public static AxiomaticSet subtract( - AxiomaticSet firstOperand, AxiomaticSet secondOperand) - { - ConcreteAxiomaticSet relativeComplement = new ConcreteAxiomaticSet(); - - // iterate through firstOperand and add each element to the result - // set that is not in secondOperand - for (final Iterator it = firstOperand.iterator(); it.hasNext();) - { - Object member = it.next(); - if (!secondOperand.contains(member)) - { - relativeComplement.add(member); - } - } - - return relativeComplement; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java deleted file mode 100644 index b82c03fd6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets; - -import java.util.HashSet; - -/** - * Implements a simple axiomatic set based on a hashset - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class ConcreteAxiomaticSet extends HashSet implements AxiomaticSet { - - /** - * serial version id - */ - private static final long serialVersionUID = 7094728081135008203L; - - public AxiomaticSet intersect(AxiomaticSet set) { - AxiomaticSet intersection = new ConcreteAxiomaticSet(); - AxiomaticSetUtil.intersect(intersection, this, set); - return intersection; - } - - public boolean isEquivalent(AxiomaticSet toSet) { - return equals(toSet); - } - - public AxiomaticSet union(AxiomaticSet set) { - AxiomaticSet union = new ConcreteAxiomaticSet(); - AxiomaticSetUtil.union(union, this, set); - return union; - } - - public boolean isDisjoint(AxiomaticSet set) { - return AxiomaticSetUtil.isDisjoint(this, set); - } - - public Object getFirstElement() { - return iterator().next(); - } - - public AxiomaticSet subtract(AxiomaticSet set) { - return AxiomaticSetUtil.subtract(this, set); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java deleted file mode 100644 index 146b83360..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets; - -import java.util.AbstractSet; -import java.util.Iterator; -import java.util.NoSuchElementException; - -import org.w3c.dom.NodeList; - -/** - * A set backed by a W3C NodeList so as to avoid copying. Note that operations - * that return new sets still invoke a copy. Also, membership operations - * require O(n) time. This should generally used for sets that are assumed to be - * small where O(n) search time will be small compared to doing a full copy. - * - * This set is immutable (mutation methods throw exceptions) - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class NodeSet extends AbstractSet implements AxiomaticSet -{ - private NodeList _data; - - /** - * @param data -- wrap the actual data source - */ - public NodeSet(NodeList data) - { - _data = data; - } - - public Iterator iterator() { - return new Iterator() - { - private int pos = 0; - - public boolean hasNext() { - return pos < _data.getLength(); - } - - public Object next() { - return _data.item(pos++); - } - - public void remove() { - throw new UnsupportedOperationException(); - } - - }; - } - - public int size() { - return _data.getLength(); - } - - public AxiomaticSet intersect(AxiomaticSet set) { - ConcreteAxiomaticSet newSet = new ConcreteAxiomaticSet(); - AxiomaticSetUtil.intersect(newSet, this, set); - return newSet; - } - - public boolean isEquivalent(AxiomaticSet toSet) { - if (this == toSet) - { - return true; - } - - if (toSet instanceof NodeSet - && ((NodeSet)toSet)._data == this._data) - { - return true; - } - - // if different sizes, false - if (toSet.size() != size()) - { - return false; - } - - // otherwise, compare item by item - // Iterator through me with the hope that look ups - // are more efficent in toSet - for (Iterator it = iterator(); it.hasNext();) - { - Object obj = it.next(); - - if (!toSet.contains(obj)) - { - // fail fase on membership mismatch - return false; - } - } - - // if we get to here then the item by item match succeeded - return true; - } - - public AxiomaticSet union(AxiomaticSet set) { - ConcreteAxiomaticSet newSet = new ConcreteAxiomaticSet(); - AxiomaticSetUtil.union(newSet, this, set); - return newSet; - } - - public boolean isDisjoint(AxiomaticSet set) { - return AxiomaticSetUtil.isDisjoint(this, set); - } - - public Object getFirstElement() { - if (_data.getLength()>0) - { - return _data.item(0); - } - throw new NoSuchElementException("Set is empty"); //$NON-NLS-1$ - } - - public AxiomaticSet subtract(AxiomaticSet set) { - return AxiomaticSetUtil.subtract(this, set); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java deleted file mode 100644 index d71ebf020..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets.constraint; - -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jst.jsf.common.sets.AxiomaticSet; - -/** - * A set constraint that is specific to members of the set. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class AbstractMemberConstraint extends AbstractSetConstraint { - - public Diagnostic isSatisfied(AxiomaticSet set) { - return null; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java deleted file mode 100644 index f176a3775..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets.constraint; - -import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jst.jsf.common.sets.AxiomaticSet; - -/** - * Super-class of all axiomatic set constraints. - * - * A set constraint applies one or more pre-conditions on a set - * and returns a diagnostic that flags whether or not the set - * satisfies that constraint or not. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class AbstractSetConstraint -{ - /** - * The following post-conditions must hold: - * - * 1) if the set satisfies the constraint with no caveats, - * the returned diagnostic must in turn satisfy - * Diagnostic.getSeverity() == Diagnostic.OK - * - * 2) if the set does not satisfy the constraint, the returned diagnostic - * must satisfy Diagnostic.getSeverity() == Diagnostic.ERROR - * - * 3) if the set strictly satisfies the constraint but the constraint includes - * parameters that can only be heuristically applied, the constraint may choose - * to return a diagnostic where Diagnostic.getSeverity() == Diagnostic.WARNING - * - * The diagnostic returned should _never_ have any other severity but OK, ERROR or WARNING - * - * Algorithmically: - * - * Constraint is satisfied can be tested by Diagnostic.getSeverity() != ERROR - * Constraint is not satisfied can be tested by Diagnostic.getSeverity() == ERROR - * - * @param set - * @return a diagnostic object that contains information about whether - * or not the constraint is satisfied for set. - * <b>MUST NOT RETURN NULL</b> - */ - public abstract Diagnostic isSatisfied(AxiomaticSet set); - - /** - * Convenience method - * - * @param set - * @return true if the constraint is satisfied for set - */ - public final boolean passesConstraint(AxiomaticSet set) - { - return isSatisfied(set).getSeverity() != Diagnostic.ERROR; - } - - /** - * Convenience method - * - * @param set - * @return true if the constraint is <b>not</b> satisfied for set - */ - public final boolean failsConstraint(AxiomaticSet set) - { - return !passesConstraint(set); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java deleted file mode 100644 index 94a901681..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Classes for creating validation constraints on sets. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.sets.constraint; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java deleted file mode 100644 index 8c2d5b53a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java +++ /dev/null @@ -1,75 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets.mapping; - -import java.util.Iterator; - -import org.eclipse.jst.jsf.common.sets.AxiomaticSet; -import org.eclipse.jst.jsf.common.sets.ConcreteAxiomaticSet; - -/** - * Super-class of all ObjectInjectiveSetMapping. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class AbstractObjectInjectiveSetMapping implements - ObjectInjectiveSetMapping { - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.sets.mapping.ObjectInjectiveSetMapping#mapIterator(org.eclipse.jst.jsf.common.sets.AxiomaticSet) - */ - public Iterator mapIterator(final AxiomaticSet set) - { - return new Iterator() - { - final Iterator setIterator = set.iterator(); - - public boolean hasNext() - { - return setIterator.hasNext(); - } - - public Object next() - { - return map(setIterator.next()); - } - - public void remove() - { - throw new UnsupportedOperationException("cannot modify iterator"); //$NON-NLS-1$ - } - }; - } - - /** - * @param element - * @return the result object from the mapping on element - */ - public abstract Object map(Object element); - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.common.sets.mapping.AxiomaticSetMapping#map(org.eclipse.jst.jsf.common.sets.AxiomaticSet) - */ - public final AxiomaticSet map(AxiomaticSet set) { - AxiomaticSet resultSet = new ConcreteAxiomaticSet(); - - for (final Iterator it = mapIterator(set); it.hasNext();) - { - resultSet.add(it.next()); - } - - return resultSet; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java deleted file mode 100644 index d6ab1ff51..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets.mapping; - -import org.eclipse.jst.jsf.common.sets.AxiomaticSet; - -/** - * Defines an axiomatic mapping from set to another. In formal notation, this may - * also be defined as a "function" or a "proposition". - * - * Applying the map method can be seen as being equivalent to: - * - * AxiomaticSetMapping: set -> map(set) - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface AxiomaticSetMapping -{ - /** - * @param set - * @return the new set resulting from applying the map to set - */ - AxiomaticSet map(AxiomaticSet set); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java deleted file mode 100644 index ce33eecc3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.sets.mapping; - -import java.util.Iterator; - -import org.eclipse.jst.jsf.common.sets.AxiomaticSet; - -/** - * A type of axiomatic set mapping that operates injectively on the input - * set to create its result set. Note that the injection (one-to-oneness) - * of the mapping is based on Java objects and not on the value of the object. - * Therefore, the result set is not guaranteed to be injective on the basis - * of value. - * - * For example, consider a set of integers: - * - * X = {new Integer(4), new Integer(6), new Integer(9)} - * - * an ObjectInjectiveSetMapping may be defined that maps this set - * to a result based on: - * - * map(x) = new Boolean(x < 8) for all x in X - * - * An ObjectiveInjectiveSetMapping result set would look like this: - * - * map(X) = {new Boolean(true), new Boolean(true), new Boolean(false)} - * - * Note that boolean TRUE maps twice, so based on the value of the set members, - * the mapping is not injective. However, each Java object in X maps to a - * distinct Java object in map(X) - * - * This interface should not be implemented by clients. Clients should - * sub-class AbstractObjectInjectiveSetMapping to avoid future API breakage. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface ObjectInjectiveSetMapping extends AxiomaticSetMapping -{ - /** - * This method optimizes the case where a client wants to apply some - * mapping or constraint to each element of a set until a particular - * condition applies and then stop. - * - * Mapping's that implement this - * interface should generally implement their map(set) method as: - * - * for (Iterator it = mapIterator(set); it.hasNext();) - * { - * result.add(doMapping(it.next)); - * } - * - * @param set - * @return an iterator that allows a client to apply the mapping - * one element of set at a time. The iterator is immutable and should - * throw UnsupportedOperationException if remove() is called. - */ - public Iterator mapIterator(AxiomaticSet set); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java deleted file mode 100644 index 8a7dacc7d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Classes for creating member mappings between sets. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.sets.mapping; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java deleted file mode 100644 index 744883704..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Axiomatic Sets framework. - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.common.sets; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java deleted file mode 100644 index 526d717ff..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java +++ /dev/null @@ -1,213 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.util; - -import java.beans.Introspector; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.Flags; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeHierarchy; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * A class that does bean introspection on a JDT IType - * - * This functionality is not meant to replace runtime bean - * introspection. Rather, it is meant to provide a - * more "lightweight" (in terms of class loading as well as - * error handling of bean instantiation out of context) way - * to determine a bean's properties at design time. - * - * This class may not be sub-classed by clients. - * - * @author cbateman - * - */ -public class JDTBeanIntrospector -{ - private final static String GET_PREFIX = "get"; //$NON-NLS-1$ - private final static String SET_PREFIX = "set"; //$NON-NLS-1$ - private final static String IS_PREFIX = "is"; //$NON-NLS-1$ - - private final IType _type; - - /** - * @param type - */ - public JDTBeanIntrospector(IType type) - { - _type = type; - } - - /** - * @return an map of all properties with the property names - * as keys and the values being JDTBeanProperty objects representing - * the properties. - */ - public Map<String, JDTBeanProperty> getProperties() - { - final Map<String, JDTBeanProperty> propertiesWorkingCopy = - new HashMap<String, JDTBeanProperty>(); - final IMethod[] methods = getAllMethods(); - - for (int i = 0; i < methods.length; i++) - { - final IMethod method = methods[i]; - - try - { - processPropertyMethod(method, propertiesWorkingCopy); - } - catch (JavaModelException jme) - { - // log and then proceed to next method - JSFCommonPlugin.log(jme, "Error processing IMethod for bean property info"); //$NON-NLS-1$ - } - } - - final Map properties = new HashMap(); - - for (Entry<String, JDTBeanProperty> entry : propertiesWorkingCopy.entrySet()) - { - final String key = entry.getKey(); - JDTBeanPropertyWorkingCopy wcopy = (JDTBeanPropertyWorkingCopy) entry.getValue(); - properties.put(key, wcopy.toValueObject()); - } - - return properties; - } - - private void processPropertyMethod(IMethod method, Map<String, JDTBeanProperty> properties) throws JavaModelException - { - // to be a bean method, it must not a constructor, must be public - // and must not be static - if (!method.isConstructor() - && ( Flags.isPublic(method.getFlags()) - || _type.isInterface()) - && !Flags.isStatic(method.getFlags())) - { - final String methodName = method.getElementName(); - final String returnType = method.getReturnType(); - - // either starts with get or is boolean and starts with is - - // is access must start with 'is', have a boolean return type and no parameters - final boolean startsWithIs = methodName.startsWith(IS_PREFIX) - && Signature.SIG_BOOLEAN.equals(returnType) - && method.getNumberOfParameters() == 0 - && methodName.length() > IS_PREFIX.length(); - - // get accessor must start with 'get', have no parameters and return non-void - final boolean startsWithGet = (methodName.startsWith(GET_PREFIX) - && method.getNumberOfParameters() == 0) - && !Signature.SIG_VOID.equals(returnType) - && methodName.length() > GET_PREFIX.length(); - - // mutator must start with 'set' and have one parameter and a void return type - final boolean startsWithSet = methodName.startsWith(SET_PREFIX) - && method.getNumberOfParameters() == 1 - && Signature.SIG_VOID.equals(returnType) - && methodName.length() > SET_PREFIX.length(); - - if (startsWithGet || startsWithSet || startsWithIs) - { - final String propertyName = - Introspector.decapitalize(methodName.substring(startsWithIs ? 2 : 3)); - - JDTBeanPropertyWorkingCopy workingCopy = - (JDTBeanPropertyWorkingCopy) properties.get(propertyName); - - if (workingCopy == null) - { - workingCopy = new JDTBeanPropertyWorkingCopy(_type); - properties.put(propertyName, workingCopy); - } - - if (startsWithIs) - { - workingCopy.setIsGetter(method); - } - else if (startsWithGet) - { - workingCopy.setGetter(method); - } - else if (startsWithSet) - { - workingCopy.addSetter(method); - } - } - } - } - - /** - * @return all methods for the type including inherited ones - */ - public IMethod[] getAllMethods() - { - IMethod[] methods = new IMethod[0]; - - try - { - // type not resolved so don't proceed - if (_type != null) - { - // TODO: type hierarchy is potentially expensive, should - // cache once and listen for changes - ITypeHierarchy hierarchy = _type.newSupertypeHierarchy(new NullProgressMonitor()); - - methods = getAllMethods(hierarchy, _type); - } - } - catch(JavaModelException jme) - { - JSFCommonPlugin.log(jme, "Error getting type information for bean"); //$NON-NLS-1$ - } - - return methods; - } - - /** - * @param typeHierarchy - * @param type - * @return all methods of the type and it's super types - */ - private static IMethod[] getAllMethods(final ITypeHierarchy typeHierarchy, final IType type) - { - final List<IMethod> methods = new ArrayList<IMethod>(); - final IType[] superTypes = typeHierarchy.getAllSuperclasses(type); - final IType[] closure = new IType[superTypes.length+1]; - closure[0] = type; - System.arraycopy(superTypes, 0, closure, 1, superTypes.length); - - for (int i = 0; i < closure.length; i++) - { - try { - final IType superType = closure[i]; - methods.addAll(Arrays.asList(superType.getMethods())); - } catch (JavaModelException e) { - JSFCommonPlugin.log(e, "Error getting super type information for bean"); //$NON-NLS-1$ - } - } - - return methods.toArray(new IMethod[methods.size()]); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java deleted file mode 100644 index 3f92f8361..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java +++ /dev/null @@ -1,250 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.common.util; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * Represents a single bean property backed by JDT data - * - * This class may not be sub-classed by clients. - * - * @author cbateman - * - */ -public class JDTBeanProperty -{ - /** - * the IMethod for the accessor (either is or get) - */ - private IMethod _getter; - - /** - * the IMethod for a "set" accessor method - */ - private IMethod _setter; - - /** - * The IType that this property belongs to - */ - protected final IType _type; - - /** - * @param type - */ - protected JDTBeanProperty(IType type) - { - _type = type; - } - - /** - * @return true if this property is readable - */ - public boolean isReadable() - { - return _getter != null; - } - - /** - * @return true if this property is writable - */ - public boolean isWritable() - { - return _setter != null; - } - - - /** - * @return the get accessor IMethod or null if none - */ - public IMethod getGetter() { - return _getter; - } - - - - /** - * Set the get accessor IMethod - * @param getter -- may be null to indicate none - */ - void setGetter(IMethod getter) { - _getter = getter; - } - - - /** - * @return the set mutator IMethod or null if none - */ - public IMethod getSetter() { - return _setter; - } - - /** - * @param setter - */ - void setSetter(IMethod setter) { - _setter = setter; - } - - /** - * @return the IType for this property's type or null if it - * cannot determined. Note that null does not necessarily indicate an error - * since some types like arrays of things do not have corresponding JDT IType's - * If typeSignature represents an array, the base element IType is returned - * if possible - */ - public IType getType() - { - final String typeSignature = Signature.getElementType(getTypeSignature()); - return TypeUtil.resolveType(_type, typeSignature); - } - - /** - * @return the number of array nesting levels in typeSignature. - * Returns 0 if not an array. - */ - public int getArrayCount() - { - return Signature.getArrayCount(getTypeSignature()); - } - - /** - * @return true if property is an enum type, false otherwise or if cannot be resolved - */ - public boolean isEnumType() - { - return TypeUtil.isEnumType(getType()); - } - - /** - * Fully equivalent to: - * - * getTypeSignature(true) - * - * @return the fully resolved (if possible) type signature for - * the property or null if unable to determine. - * - * NOTE: this is the "type erasure" signature, so any type parameters - * will be removed and only the raw type signature will be returned. - */ - public String getTypeSignature() - { - return getTypeSignature(true); - } - - - /** - * @param eraseTypeParameters if true, the returned type has type parameters - * erased. If false, template types are resolved. - * - * @see org.eclipse.jst.jsf.common.util.TypeUtil#resolveTypeSignature(IType, String, boolean) - * for more information on how specific kinds of unresolved generics are resolved - * - * @return the fully resolved (if possible) type signature for - * the property or null if unable to determine. - */ - public String getTypeSignature(boolean eraseTypeParameters) - { - try - { - String unResolvedSig = getUnresolvedType(); - return TypeUtil.resolveTypeSignature(_type, unResolvedSig, eraseTypeParameters); - } - catch (JavaModelException jme) - { - JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$ - return null; - } - } - - /** - * For example, if this property was formed from: List<String> getListOfStrings() - * then the list would consist of the signature "Ljava.lang.String;". All - * nested type paramters are resolved - * - * @see org.eclipse.jst.jsf.common.util.TypeUtil#resolveTypeSignature(IType, String, boolean) - * for more information on how specific kinds of unresolved generics are resolved - * - * @return a list of type signatures (fully resolved if possible) - * of this property's bounding type parameters. - */ - public List<String> getTypeParameterSignatures() - { - List<String> signatures = new ArrayList<String>(); - - try - { - final String[] typeParameters = Signature.getTypeArguments(getUnresolvedType()); - //System.err.println(getUnresolvedType()); - for (String parameter : typeParameters) - { - //System.out.println(parameter); - signatures.add(TypeUtil.resolveTypeSignature(_type, parameter, false)); - } - } - catch (JavaModelException jme) - { - JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$ - // fall-through and return empty array - } - - return signatures; - } - -// public Map<String, String> getTypeParameterSignatureMap() -// { -// Map<String, String> signatures = new HashMap<String, String>(); -// -// try -// { -// final String[] typeParameters = Signature.getTypeArguments(getUnresolvedType()); -// -// for (String parameter : typeParameters) -// { -// signatures.add(TypeUtil.resolveTypeSignature(_type, parameter, false)); -// } -// } -// catch (JavaModelException jme) -// { -// JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$ -// // fall-through and return empty array -// } -// -// return signatures; -// } - - private String getUnresolvedType() throws JavaModelException - { - String typeSig = null; - - // first decide which method to use; getter always gets precendence - if (_getter != null) - { - typeSig = _getter.getReturnType(); - } - // TODO: if no getter or setter could we have been created? - // use setter - else - { - typeSig = _setter.getParameterTypes()[0]; - } - - return typeSig; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java deleted file mode 100644 index f3bdf1408..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java +++ /dev/null @@ -1,163 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.common.util; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -/** - * A writable version of the JDTBeanProperty object - * - * This class may not be sub-classed by clients - * - * @author cbateman - * - */ -public class JDTBeanPropertyWorkingCopy extends JDTBeanProperty -{ - private final List _setters; - - /** - * the IMethod for the boolean "is" accessor method - */ - private IMethod _isGetter; - - /** - * Constructor - * @param type - */ - public JDTBeanPropertyWorkingCopy(IType type) - { - super(type); - _setters = new ArrayList(); - } - - /** - * @return the bean properties spawned from this working copy - * Normally, there is only one property in the array, however, - * since this working copy represents all properties with the same - * name, there could be multiple properties since setters can - * be overloaded by name and could result in zero or one readable - * properties plus zero or more write-only properties with the same - * name. I can't see anywhere in the spec that covers this - * boundary case - */ - public JDTBeanProperty toValueObject() - { - // if the isGetter is present that it takes precedence - // over the the normal getter - IMethod getter = getIsGetter() != null ? - getIsGetter() : getGetter(); - IMethod matchedSetter = null; - - if (getter != null) - { - matchedSetter = determineMatchedSetter(getter); - } - // if there's no getter than pick any setter: there - // are bigger problem when there's no getter than - // ambiguous setters - else if (_setters.size() > 0) - { - matchedSetter = (IMethod) _setters.get(0); - } - - JDTBeanProperty beanProp = new JDTBeanProperty(_type); - beanProp.setGetter(getter); - beanProp.setSetter(matchedSetter); - return beanProp; - } - - private IMethod determineMatchedSetter(IMethod getter) - { - IMethod matchedSetter = null; - - try - { - final String getterSig = - TypeUtil.resolveTypeSignature(_type, getter.getReturnType()); - - FIND_MATCHING_SETTER:for - (final Iterator it = _setters.iterator(); it.hasNext();) - { - final IMethod setter = (IMethod) it.next(); - if (setter.getNumberOfParameters() == 1) - { - final String paramSig = - TypeUtil.resolveTypeSignature - (_type,setter.getParameterTypes()[0]); - - if (paramSig.equals(getterSig)) - { - // we've found our match since only one - // setter with the same name as the getter - // can have the same matching type for a - // single arg method - matchedSetter = setter; - break FIND_MATCHING_SETTER; - } - } - } - } - catch (JavaModelException jme) - { - JSFCommonPlugin.log(jme, "Error determining getter return type, bean properties analysis may be inaccurate"); //$NON-NLS-1$ - } - - return matchedSetter; - } - - //@Override - public void setGetter(IMethod getter) { - super.setGetter(getter); - } - - /** - * @param isGetter - */ - public void setIsGetter(IMethod isGetter) { - _isGetter = isGetter; - } - - /** - * @param setter - */ - public void addSetter(IMethod setter) { - if (setter != null - && setter.getNumberOfParameters() == 1) - { - _setters.add(setter); - } - } - - /** - * Not supported on working copy. This is synthetically generated - * on toValueObject() - * @return nothing; throws exception - */ - public final IMethod getSetter() - { - throw new UnsupportedOperationException("Setter not calculated in working copy. Call toValueObject().getSetter()"); //$NON-NLS-1$ - } - - /** - * @return the "is" getter method or null if not found - */ - public IMethod getIsGetter() { - return _isGetter; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java deleted file mode 100644 index 1d2a55075..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java +++ /dev/null @@ -1,597 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.common.util; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jdt.core.IField; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeParameter; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.internal.types.TypeInfoCache; - -/** - * Utility for handling IType's and type signatures - * - * Class is static and cannot be extended or instantiated. - * - * @author cbateman - * - */ -public final class TypeUtil -{ - static IType resolveType(final IType owningType, final String typeSignature) - { - // if type signature is already resolved then simply look it up - if (typeSignature.charAt(0) == Signature.C_RESOLVED - || (Signature.getTypeSignatureKind(typeSignature) == Signature.BASE_TYPE_SIGNATURE) - || (Signature.getTypeSignatureKind(typeSignature) == Signature.ARRAY_TYPE_SIGNATURE - && Signature.getElementType(typeSignature).charAt(0) == Signature.C_RESOLVED)) - { - IType type = null; - - try - { - type = owningType.getJavaProject(). - findType(getFullyQualifiedName(typeSignature)); - } - catch (JavaModelException jme) - { - // do nothing; return type == null; - } - - return type; - } - - - return resolveTypeRelative(owningType, typeSignature); - } - - /** - * Fully equivalent to: - * - * #resolveTypeSignature(owningType, typeSignature, true) - * - * If resolved, type signature has generic type parameters erased (absent). - * - * @param owningType - * @param typeSignature - * @return the resolved type signature for typeSignature in owningType or - * typeSignature unchanged if cannot resolve. - */ - public static String resolveTypeSignature(final IType owningType, final String typeSignature) - { - return resolveTypeSignature(owningType, typeSignature, true); - } - - /** - * Resolve typeSignature in the context of owningType. This method will return - * a type erased signture if eraseTypeParameters == true and will attempt to - * resolve and include parameters if eraseTypeParamters == false - * - * NOTE: special rules apply to the way unresolved type parameters and wildcards - * are resolved: - * - * 1) If a fully unresolved type parameter is found, then it will be replaced with Ljava.lang.Object; - * - * i.e. List<T> -> Ljava.util.List<Ljava.lang.Object;>; for any unresolved T. - * - * 2) Any bounded wildcard will be replaced by the bound: - * - * i.e. List<? extends String> -> Ljava.util.List<Ljava.lang.String;>; - * i.e. List<? super String> -> Ljava.util.List<Ljava.lang.String;>; - * - * Note limitation here: bounds that use 'super' will take the "best case" scenario that the list - * type is of that type. - * - * 3) The unbounded wildcard will be replaced by Ljava.lang.Object; - * - * i.e. List<?> -> Ljava.util.List<Ljava.lang.Object;>; - * - * - * The reason for this substition is to return the most accurate reasonable approximation - * of the type within what is known by owningType - * - * @param owningType - * @param typeSignature - * @param eraseTypeParameters if set to false, type parameters are resolved included - * in the signature - * @return the resolved type signature for typeSignature in owningType or - * typeSignature unchanged if cannot resolve. - */ - public static String resolveTypeSignature(final IType owningType, final String typeSignature, boolean eraseTypeParameters) - { - final int sigKind = Signature.getTypeSignatureKind(typeSignature); - - switch (sigKind) - { - case Signature.BASE_TYPE_SIGNATURE: - return typeSignature; - - case Signature.ARRAY_TYPE_SIGNATURE: - { - final String elementType = Signature.getElementType(typeSignature); - - if (Signature.getTypeSignatureKind(elementType) == Signature.BASE_TYPE_SIGNATURE) - { - return typeSignature; - } - - final String resolvedElementType = resolveSignatureRelative(owningType, elementType, eraseTypeParameters); - String resultType = ""; //$NON-NLS-1$ - for (int i = 0; i < Signature.getArrayCount(typeSignature);i++) - { - resultType+=Signature.C_ARRAY; - } - - return resultType+resolvedElementType; - } - - case Signature.TYPE_VARIABLE_SIGNATURE: - return resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters); - - case Signature.CLASS_TYPE_SIGNATURE: - return resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters); - - case Signature.WILDCARD_TYPE_SIGNATURE: - // strip the wildcard and try again. Too bad Signature doesn't seem to have a method - // for this - if (typeSignature.charAt(0) == Signature.C_STAR) - { - return TypeConstants.TYPE_JAVAOBJECT; - } - return resolveTypeSignature(owningType, typeSignature.substring(1), eraseTypeParameters); - - case Signature.CAPTURE_TYPE_SIGNATURE: - // strip the capture and try again - return resolveTypeSignature(owningType, Signature.removeCapture(typeSignature), eraseTypeParameters); -// case Signature.TYPE_VARIABLE_SIGNATURE: -// resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters); - - default: - return typeSignature; - } - } - - /** - * @param owningType -- type relative to which typeSignature will be resolved - * @param typeSignature -- non-array type signature - * @return the resolved type signature if possible or typeSignature if not - */ - private static String resolveSignatureRelative(final IType owningType, final String typeSignature, final boolean eraseTypeParameters) - { - // if already fully resolved, return the input - if (typeSignature.charAt(0) == Signature.C_RESOLVED) - { - return typeSignature; - } - - List<String> typeParameters = new ArrayList<String>(); - - IType resolvedType = resolveTypeRelative(owningType, typeSignature); - - if (resolvedType != null) - { - if (!eraseTypeParameters) - { - // ensure that type parameters are resolved recursively - for (String typeParam : Signature.getTypeArguments(typeSignature)) - { - typeParam = Signature.removeCapture(typeParam); - // check and remove bound wildcarding (extends/super/?) - if (Signature.getTypeSignatureKind(typeParam) == Signature.WILDCARD_TYPE_SIGNATURE) - { - // convert ? to Object, strip extends/super - if (typeParam.charAt(0) == Signature.C_STAR) - { - typeParam = TypeConstants.TYPE_JAVAOBJECT; - } - else - { - typeParam = typeParam.substring(1); - } - } - final String resolvedParameter = - resolveSignatureRelative( - // use the enclosing type, - // *not* the resolved type because - // we need to resolve in that context - owningType, - typeParam, eraseTypeParameters); - typeParameters.add(resolvedParameter); - } - } - - final String resolvedTypeSignature = - Signature.createTypeSignature - (resolvedType.getFullyQualifiedName(), true); - - - if (typeParameters.size() > 0 && !eraseTypeParameters) - { - StringBuffer sb = new StringBuffer(resolvedTypeSignature); - - if (sb.charAt(sb.length()-1) == ';') - { - sb = sb.delete(sb.length()-1, sb.length()); - } - - sb.append("<"); //$NON-NLS-1$ - for(String param : typeParameters) - { - //System.out.println("type param: "+resolvedType.getTypeParameter(param)); - sb.append(param); - } - - // replace the dangling ',' with the closing ">" - sb.append(">;"); //$NON-NLS-1$ - return sb.toString(); - } - - return resolvedTypeSignature; - } - - if (Signature.getTypeSignatureKind(typeSignature) == - Signature.CLASS_TYPE_SIGNATURE - || Signature.getTypeSignatureKind(typeSignature) - == Signature.TYPE_VARIABLE_SIGNATURE) - { - // if we are unable to resolve, check to see if the owning type has - // a parameter by this name - ITypeParameter typeParam = owningType.getTypeParameter(Signature.getSignatureSimpleName(typeSignature)); - - // if we have a type parameter and it hasn't been resolved to a type, - // then assume it is a method template placeholder (i.e. T in ArrayList). - // at runtime these unresolved parameter variables are effectively - // turned into Object's. For example, think List.add(E o). At runtime, - // E will behave exactly like java.lang.Object in that signature - if (typeParam.exists()) - { - return TypeConstants.TYPE_JAVAOBJECT; - } - - // TODO: is there a better way to handle a failure to resolve - // than just garbage out? - //JSFCommonPlugin.log(new Exception("Failed to resolve type: "+typeSignature), "Failed to resolve type: "+typeSignature); //$NON-NLS-1$ //$NON-NLS-2$ - } - - return typeSignature; - } - - private static IType resolveTypeRelative(final IType owningType, final String typeSignature) - { - final String fullName = getFullyQualifiedName(typeSignature); - - IType resolvedType = null; - - try - { - // TODO: this call is only supported on sourceTypes! - String[][] resolved = owningType.resolveType(fullName); - - if (resolved != null && resolved.length > 0) - { - resolvedType = owningType.getJavaProject().findType(resolved[0][0], resolved[0][1]); - } - else - { - resolvedType = resolveInParents(owningType, fullName); - } - } - catch (JavaModelException jme) - { - // do nothing; newType == null - } - - return resolvedType; - } - - /** - * @param type - * @return a type signature for a type - */ - public static String getSignature(IType type) - { - final String fullyQualifiedName = type.getFullyQualifiedName(); - return Signature.createTypeSignature(fullyQualifiedName, true); - } - - - /** - * @param owner - * @param unresolvedSignature - * @return the resolved method signature for unresolvedSignature in owner - */ - public static String resolveMethodSignature(final IType owner, - final String unresolvedSignature) - { - - final String unresolvedSignatureNormalized = - unresolvedSignature.replaceAll("/", "."); - - // get the list of parameters - final String[] parameters = - Signature.getParameterTypes(unresolvedSignatureNormalized); - - for (int i = 0; i < parameters.length; i++) - { - // try to full resolve the type - parameters[i] = resolveTypeSignature(owner, parameters[i]); - } - - // resolve return type - final String resolvedReturn = - resolveTypeSignature(owner, - Signature.getReturnType(unresolvedSignatureNormalized)); - - return Signature.createMethodSignature(parameters, resolvedReturn); - } - - /** - * @param typeSignature - * @return a fully qualified Java class name from a type signature - * i.e. Ljava.lang.String; -> java.lang.String - */ - public static String getFullyQualifiedName(final String typeSignature) - { - final String packageName = Signature.getSignatureQualifier(typeSignature); - final String typeName = Signature.getSignatureSimpleName(typeSignature); - return "".equals(packageName) ? typeName : packageName + "." + typeName; //$NON-NLS-1$//$NON-NLS-2$ - } - - private static IType resolveInParents(IType childType, String fullyQualifiedName) - throws JavaModelException - { - IType resolvedType = null; - - final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance(); - IType[] superTypes = typeInfoCache.getCachedSupertypes(childType); - if (superTypes == null) { - superTypes = typeInfoCache.cacheSupertypesFor(childType); - } - - String[][] resolved; - - LOOP_UNTIL_FIRST_MATCH: - for (int i = 0; i < superTypes.length; i++) - { - final IType type = superTypes[i]; - - resolved = type.resolveType(fullyQualifiedName); - - if (resolved != null && resolved.length > 0) - { - resolvedType = childType.getJavaProject().findType(resolved[0][0], resolved[0][1]); - break LOOP_UNTIL_FIRST_MATCH; - } - } - - return resolvedType; - } - - /** - * Attempts to get a Java IType for a fully qualified signature. Note that - * generic type arguments are generally ignored by JDT when doing such - * look ups. - * - * @param javaProject the project context inside which to resolve the type - * @param fullyResolvedTypeSignature a fully resolved type signature - * @return the IType if resolved, null otherwise - */ - public static IType resolveType(final IJavaProject javaProject, final String fullyResolvedTypeSignature) - { - String fullyQualifiedName = getFullyQualifiedName(fullyResolvedTypeSignature); - fullyQualifiedName = Signature.getTypeErasure(fullyQualifiedName); - try { - return javaProject.findType(fullyQualifiedName); - } catch (JavaModelException e) { - // accessible problem - JSFCommonPlugin.log(e); - return null; - } - } - - /** - * @param type - * @param typeParamSignature -- must be a Type Variable Signature - * @param typeArguments - * @return the signature for the type argument in typeArguments that matches the - * named typeParamSignature in type. - * @throws IllegalArgumentException if typeParamSignature is not valid - * - * For example, given type for java.util.Map, typeParamSignature == "V" and - * typeArguments = {Ljava.util.String;, Lcom.test.Blah;}, the result would be - * the typeArgument that matches "V", which is "Lcom.test.Blah;} - * - * returns null if the match cannot be found. - */ - public static String matchTypeParameterToArgument(final IType type, final String typeParamSignature, final List<String> typeArguments) - { - if (Signature.getTypeSignatureKind(typeParamSignature) != Signature.TYPE_VARIABLE_SIGNATURE) - { - throw new IllegalArgumentException(); - } - - try - { - ITypeParameter[] typeParams = type.getTypeParameters(); - - for (int pos = 0; pos < typeParams.length; pos++) - { - if (typeParams[pos].getElementName().equals(Signature.getSignatureSimpleName(typeParamSignature))) - { - if (pos < typeArguments.size()) - { - // TODO: should typeArguments.size ever != typeParams.length? - return typeArguments.get(pos); - } - } - } - } - catch (JavaModelException e) - { - JSFCommonPlugin.log(e); - } - - return null; - } - - /** - * @param type - * @param fieldName - * @return true if fieldName is a member of type. Note that if type is java.lang.Enum - * then this will always return true since we cannot know what fields the instance has (it could be any enum) - */ - public static boolean isEnumMember(final IType type, final String fieldName) - { - try - { - if (type == null || !isEnumType(type)) - { - throw new IllegalArgumentException("type must be non-null and isEnum()==true"); //$NON-NLS-1$ - } - - if (fieldName == null) - { - throw new IllegalArgumentException("fieldName must be non-null"); //$NON-NLS-1$ - } - - // if type is the java.lang.Enum, always true - if (TypeConstants.TYPE_ENUM_BASE.equals(Signature.createTypeSignature(type.getFullyQualifiedName(), true))) - { - return true; - } - - final IField field = type.getField(fieldName); - - if (field.exists() && field.isEnumConstant()) - { - return true; - } - } - catch (JavaModelException jme) - { - // fall through and return false - } - - return false; - } - - /** - * @param typeSig1 the type signature of the first enum. Must be non-null, fully resolved enum type. - * @param typeSig2 the type signature of the second enum. Must be non-null, fully resolved enum type. - * - * @return true if typeSig1.compareTo(typeSig2) is a legal operation (won't throw a CCE) - */ - public static boolean isEnumsCompareCompatible(final String typeSig1, final String typeSig2) - { - if (typeSig1 == null || typeSig2 == null) - { - throw new IllegalArgumentException("args must not be null"); //$NON-NLS-1$ - } - - if (Signature.getTypeSignatureKind(typeSig1) != Signature.CLASS_TYPE_SIGNATURE - || Signature.getTypeSignatureKind(typeSig2) != Signature.CLASS_TYPE_SIGNATURE) - { - throw new IllegalArgumentException("args must be resolved class types"); //$NON-NLS-1$ - } - - // if one or the other is the raw enum type, then they *may* be comparable; we don't know - if (TypeConstants.TYPE_ENUM_BASE.equals(typeSig1) - || TypeConstants.TYPE_ENUM_BASE.equals(typeSig2)) - { - return true; - } - - // TODO: support the case of enum base type with generic type argument - - // only comparable if is the same class - return typeSig1.equals(typeSig2); - } - - /** - * @param typeSig1 the type signature of the first enum. Must be non-null, fully resolved enum type. - * @param typeSig2 the type signature of the second enum. Must be non-null, fully resolved enum type. - * @return true if instances typeSig1 and typeSig2 can never be equal due - * their being definitively different enum types - */ - public static boolean canNeverBeEqual(final String typeSig1, final String typeSig2) - { - if (typeSig1 == null || typeSig2 == null) - { - throw new IllegalArgumentException("args must not be null"); //$NON-NLS-1$ - } - - if (Signature.getTypeSignatureKind(typeSig1) != Signature.CLASS_TYPE_SIGNATURE - || Signature.getTypeSignatureKind(typeSig2) != Signature.CLASS_TYPE_SIGNATURE) - { - throw new IllegalArgumentException("args must be resolved class types"); //$NON-NLS-1$ - } - - // if either one is the base enum type, then we can't be sure - if (TypeConstants.TYPE_ENUM_BASE.equals(typeSig1) - || TypeConstants.TYPE_ENUM_BASE.equals(typeSig2)) - { - return false; - } - - // if they are definitely not the same enum types, then their values - // can never be equal - return !typeSig1.equals(typeSig2); - } - - - /** - * NOTE: we diverge from IType.isEnum() because we also return true if the base type - * is a java.lang.Enum since we consider this to be "any enumeration type" whereas JDT considers - * it merely a class since it doesn't use an "enum" keyword declaration. - * @param type - * @return true if type is an enum type or is java.lang.Enum - */ - static boolean isEnumType(IType type) - { - if (type == null) - { - return false; - } - - // check if it's the enumeration base type - if (TypeConstants.TYPE_ENUM_BASE.equals(Signature.createTypeSignature(type.getFullyQualifiedName(), true))) - { - return true; - } - - try - { - return type.isEnum(); - } - catch (JavaModelException jme) - { - // log and fallthrough to return false - JSFCommonPlugin.log(jme, "Problem resolving isEnum"); //$NON-NLS-1$ - } - - // if unresolved assume false - return false; - } - - private TypeUtil() - { - // no external instantiation - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java deleted file mode 100644 index 239a12524..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Common utility classes. - */ -package org.eclipse.jst.jsf.common.util; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationHelper.java deleted file mode 100644 index 506ee47e0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationHelper.java +++ /dev/null @@ -1,267 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationFileRegistry; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationMap; - -/** - * Class meant for all public access to the design-time meta-data (CMAnnotations) values. - * - * <li>Annotation files are registered against a uri (eg. http://java.sun.com/jsf/core) - * using the extension-point <code>org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles</code>.</li> - * <li>Any number of annotation files can be associated with the uri and against any element or attribute.</li> - * <li>It is recommended that a single plugin should avoid registering meta-data for the same attribute or element - * from different annotationFiles.</li> - * <li>A CMAnnotation allows for a collection of property values for a named property.</li> - * <li>Querying the registry using this helper class can return lists of <code>CMAnnotationPropertyValue</code> - * which allows the caller to make the determination of whether the property value is of interest or not.</li> - * <li>The caller can also query the registry for specific plugin supplied annotation meta-data.</li> - * - * <li>-- include link to doc--</li> - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.CMElementAnnotation - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAttributeAnnotation - * @see CMAnnotationPropertyValue - * - * also see org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles extension-point - * - * @deprecated see <code>org.eclipse.jst.jsf.common.metadata</code> package - */ -public class CMAnnotationHelper { - private static List EMPTY_LIST = new ArrayList(0); - - /** - * Returns a list of CMAnnotationPropertyValue objects for a given property name and uri/tag/tag attribute combo. - * A list is being returned because it is possible that there are multiple annotation files with the same - * named property. Caller can decide what to do. - * - * Will return empty if annotation is not found or meta-data property name not present. - * - * @param uri - * @param cmElementName - * @param cmAttrName - * @param meta_prop_name - * @return list of CMAnnotationPropertyValue objects - */ - public static List getCMAttributeProperties(String uri, String cmElementName, String cmAttrName, String meta_prop_name) { - return getCMAttributeProperties(null, uri, cmElementName, cmAttrName, meta_prop_name); - } - - - /** - * Returns a list of CMAnnotationPropertyValue objects for a given bundleId, property name and uri/tag/tag attribute combo. - * A list is being returned because it is possible that there are multiple annotation files with the same - * named property. Caller can decide what to do. - * - * Use this method if you are not looking for a property value from a specific bundle. Usually the caller. - * - * Will return empty if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param cmAttrName - * @param meta_prop_name - * @return list of CMAnnotationPropertyValue objects - */ - public static List getCMAttributeProperties(String bundleId, String uri, String cmElementName, String cmAttrName, String meta_prop_name) { - if (!CMAnnotationFileRegistry.getInstance().hasAnnotations(uri)) - return EMPTY_LIST; - - List list = new ArrayList(); - List maps = CMAnnotationFileRegistry.getInstance().getAnnotationMaps(uri); - if (maps != null){ - Iterator it = maps.iterator(); - while (it.hasNext()){ - CMAnnotationMap map = (CMAnnotationMap)it.next(); - if (bundleId == null || map.getFileInfo().getBundleId().equals(bundleId)){ - CMAnnotationPropertyValue propVal = map.getCMAttributePropertyValue(cmElementName, cmAttrName, meta_prop_name); - if (propVal != null){ - list.add(propVal); - } - } - } - } - return list; - } - - /** - * Convenience method to return the first string value for a given bundle, uri, element, attr, and meta_prop_name. - * Caller needs to be aware that this could be a multi-value property. If so, <code>getCMAttributePropertyValues</code> - * should probably be called. - * - * Caller must be sure that only one annotation meta-data file is associated with this uri from the specified bundle. - * If there are multiple annotations, only the first bundle's values will be returned. - * - * Will return null if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param cmAttrName - * @param meta_prop_name - * @return property value as String - */ - public static String getCMAttributePropertyValue(String bundleId, String uri, String cmElementName, String cmAttrName, String meta_prop_name){ - List vals = getCMAttributeProperties(bundleId, uri, cmElementName, cmAttrName, meta_prop_name); - if (vals != null && !vals.isEmpty()){ - return((CMAnnotationPropertyValue)vals.get(0)).getPropertyValue(); - } - return null; - } - - /** - * Convenience method to return the list of property values for a given bundle, uri, element, attr, and meta_prop_name. - * - * Caller must be sure that only one annotation meta-data file is associated with this uri from the specified bundle. - * If there are multiple annotations, only the first bundle's values will be returned. - * - * Will return empty list if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param cmAttrName - * @param meta_prop_name - * @return property values as List - */ - public static List getCMAttributePropertyValues(String bundleId, String uri, String cmElementName, String cmAttrName, String meta_prop_name){ - List vals = getCMAttributeProperties(bundleId, uri, cmElementName, cmAttrName, meta_prop_name); - if (!vals.isEmpty()){ - return((CMAnnotationPropertyValue)vals.get(0)).getPropertyValues(); - } - return EMPTY_LIST; - } - /** - * Returns a list of CMAnnotationPropertyValue objects for a given property name and uri/tag element combo. - * A list is being returned because it is possible that there are multiple annotation files with the same - * named property. Caller can decide what to do. - * - * Will return empty list if annotation is not found or meta-data property name not present. - * - * @param uri - * @param cmElementName - * @param meta_prop_name - * @return list of CMAnnotationPropertyValue objects - */ - public static List getCMElementProperties(String uri, String cmElementName, String meta_prop_name) { - return getCMElementProperties(null, uri, cmElementName, meta_prop_name); - } - - - /** - * Returns a list of CMAnnotationPropertyValue objects for a given bundle, property name and uri/tag element combo. - * A list is being returned because it is possible that there are multiple annotation files with the same - * named property. Caller can decide what to do. - * - * Use this method if you are not looking for a property value from a specific bundle. Usually the caller. - * - * Will return empty list if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param meta_prop_name - * @return list of CMAnnotationPropertyValue objects - */ - public static List getCMElementProperties(String bundleId, String uri, String cmElementName, String meta_prop_name) { - if (!CMAnnotationFileRegistry.getInstance().hasAnnotations(uri)) - return EMPTY_LIST; - - List list = new ArrayList(); - List maps = CMAnnotationFileRegistry.getInstance().getAnnotationMaps(uri); - if (maps != null){ - Iterator it = maps.iterator(); - while (it.hasNext()){ - CMAnnotationMap map = (CMAnnotationMap)it.next(); - if (bundleId == null || map.getFileInfo().getBundleId().equals(bundleId)){ - CMAnnotationPropertyValue propVal = map.getCMElementPropertyValue(cmElementName, meta_prop_name); - if (propVal != null){ - list.add(propVal); - } - } - } - } - return list; - } - - /** - * Convenience method to return the first string value for a given bundle, uri, element, and meta_prop_name. - * Caller needs to be aware that this could be a multi-value property. If so, <code>getCMAttributePropertyValues</code> - * should probably be called. - * - * Caller must be sure that only one annotation meta-data file is associated with this uri from the specified bundle. - * If there are multiple annotations, only the first bundle's values will be returned. - * - * Will return null if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param meta_prop_name - * @return property value as String - */ - public static String getCMElementPropertyValue(String bundleId, String uri, String cmElementName, String meta_prop_name){ - List vals = getCMElementProperties(bundleId, uri, cmElementName, meta_prop_name); - if (vals != null && !vals.isEmpty()){ - return((CMAnnotationPropertyValue)vals.get(0)).getPropertyValue(); - } - return null; - } - - /** - * Convenience method to return the list of property values for a given bundle, uri, element, and meta_prop_name. - * - * Caller must be sure that only one annotation meta-data file is associated with this uri from the specified bundle. - * If there are multiple annotations, only the first bundle's values will be returned. - * - * Will return empty list if annotation is not found or meta-data property name not present. - * - * @param bundleId - * @param uri - * @param cmElementName - * @param meta_prop_name - * @return List of property values as Strings - */ - public static List getCMElementPropertyValues(String bundleId, String uri, String cmElementName, String meta_prop_name){ - List vals = getCMElementProperties(bundleId, uri, cmElementName, meta_prop_name); - if (vals != null && !vals.isEmpty()){ - return((CMAnnotationPropertyValue)vals.get(0)).getPropertyValues(); - } - return null; - } - - /** - * Return whether or not there are annotation files for a given uri and bundleId. - * @param bundleId - * @param uri - * @return boolean - */ - public static boolean hasAnnotations(String bundleId, String uri) { - return CMAnnotationFileRegistry.getInstance().hasAnnotations(bundleId, uri); - } - - /** - * Return whether or not there are annotation files for a given uri. - * @param uri - * @return boolean - */ - public static boolean hasAnnotations(String uri) { - return CMAnnotationFileRegistry.getInstance().hasAnnotations(uri); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationPropertyValue.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationPropertyValue.java deleted file mode 100644 index 414757271..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationPropertyValue.java +++ /dev/null @@ -1,69 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation; - -import java.util.List; - -/** - * The class used to return result of a query on the annotation model. - * - * @author Gerry Kessler - Oracle - * - * @deprecated see <code>org.eclipse.jst.jsf.common.metadata</code> package - */ -public class CMAnnotationPropertyValue { - private ICMAnnotationSourceFileInfo fileInfo; - private List propertyValues; - - /** - * Constructor - * @param fileInfo - * @param propertyValues - */ - public CMAnnotationPropertyValue(ICMAnnotationSourceFileInfo fileInfo, List propertyValues){ - this.fileInfo = fileInfo; - this.propertyValues = propertyValues; - } - - /** - * Convenience method for accessing the bundleid - * @return String - */ - public String getBundleId(){ - return fileInfo.getBundleId(); - } - - /** - * @return ICMAnnotationSourceFileInfo used to define this property - */ - public ICMAnnotationSourceFileInfo getFileInfo(){ - return fileInfo; - } - - /** - * Return first string property value. - * If caller expects more values, they should use getPropertyValues(). - * @return String - */ - public String getPropertyValue(){ - return ((String)propertyValues.get(0)).trim(); - } - - /** - * Return list of property values as strings for the given property - * @return java.util.List - */ - public List getPropertyValues(){ - return propertyValues; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationSourceFileLocator.java deleted file mode 100644 index 71abc4bc5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationSourceFileLocator.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation; - -import java.io.IOException; -import java.io.InputStream; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - - -/** - * Used to supply an InputStream to the parser of an annotation - * meta-data file and the URL to the resource bundle for a properties file, if any. - * - * Implementors must provide a zero-argument constructor. - * - * @author Gerry Kessler - Oracle - * @deprecated see <code>org.eclipse.jst.jsf.common.metadata</code> package - */ -public abstract class CMAnnotationSourceFileLocator{ - /** - * ICMAnnotationSourceFileInfo - */ - protected ICMAnnotationSourceFileInfo fileInfo; - - /** - * Set the ICMAnnotationSourceFileInfo for locator - * @param fileInfo - */ - public final void setFileInfo(ICMAnnotationSourceFileInfo fileInfo){ - this.fileInfo = fileInfo; - } - - /** - * @return ICMAnnotationSourceFileInfo for the locator - */ - protected final ICMAnnotationSourceFileInfo getFileInfo(){ - return fileInfo; - } - /** - * Return InputStream to the meta-data annotation. - * Callers are responsble for closing the stream. - * @return InputStream - * @throws IOException - */ - public abstract InputStream getAnnotationSourceInputStream() throws IOException; - /** - * Return ResourceBundle for the property files if there are any. Return null if not. - * - * @return java.util.ResourceBundle - * @throws IOException - * @throws MissingResourceException - */ - public abstract ResourceBundle getResourceBundle() throws IOException, MissingResourceException; -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationFileParser.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationFileParser.java deleted file mode 100644 index ebf214f9a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationFileParser.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation; - -import org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor; - -/** - * Interface used to allow parsing of meta-data files that do not conform to the default schema provided. - * - * @author Gerry Kessler - Oracle - * - * also see ext-pt: org.eclipse.jst.jsf.contentmodel.annotations.annotationFile - * also see xml schema defn: <code>http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema</code> - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor - * @see org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator - * - * @deprecated see <code>org.eclipse.jst.jsf.common.metadata</code> package - */ -public interface ICMAnnotationFileParser { - - /** - * Parse the annotation file using the InputStream provided by the locator and - * using the ICMAnnotationAdvisor methods to fill the internal model. - * - * The implementor is responsible for closing the inputstream when parse is complete. - * - * @param advisor - * @param locator - * - * @throws Exception - */ - public void parse(ICMAnnotationAdvisor advisor, CMAnnotationSourceFileLocator locator) throws Exception; -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationSourceFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationSourceFileInfo.java deleted file mode 100644 index 8b9ca6abc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationSourceFileInfo.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation; - -/** - * The interface used to access information about the annotationFile extension - * - * Not intended to be implemented by clients. - * @author Gerry Kessler - Oracle - * - * @deprecated see <code>org.eclipse.jst.jsf.common.metadata</code> package - */ -public interface ICMAnnotationSourceFileInfo { - /** - * @return location of annotation file that the locator class will use - */ - public String getAnnotationFileLocation(); - /** - * @return bundle id of plugin defining the annotation file - */ - public String getBundleId(); - /** - * @return class name of parser to use on the annotation file - */ - public String getParserClassName(); - /** - * @return class name of the file locator - */ - public String getAnnotationFileLocatorClassname(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotation.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotation.java deleted file mode 100644 index 5fa5d3d53..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotation.java +++ /dev/null @@ -1,113 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - -/** - * Content model annotation. A property with a set of values. - * @deprecated see common.metadata package - */ -public abstract class CMAnnotation { - private String _name; - private Hashtable props = new Hashtable(3); - - /** - * @param name - */ - public CMAnnotation(String name) { - setName(name.trim()); - } - - private void setName(String name) { - _name = name; - } - - /** - * @return the name - */ - public String getName() { - return _name; - } - - /** - * @param propertyName - * @param propertyValue - */ - public void setProperty(String propertyName, String propertyValue) { - CMAnnotationProperty prop = getAnnotationProperty(propertyName); - if (prop == null){ - prop = new CMAnnotationProperty(propertyName, propertyValue); - props.put(propertyName, prop); - } - else { - prop.setValue(propertyValue); - } - } - - /** - * @param propertyName - * @return the annotation property - */ - public CMAnnotationProperty getAnnotationProperty(String propertyName){ - if (props.containsKey(propertyName)) - return (CMAnnotationProperty)props.get(propertyName); - return null; - } - - class CMAnnotationProperty { - private String propName; - private List propValues = new ArrayList(2); - - /** - * @param propertyName - */ - public CMAnnotationProperty(String propertyName){ - propName = propertyName; - } - - /** - * @param propertyName - * @param propertyValue - */ - public CMAnnotationProperty(String propertyName, String propertyValue){ - propName = propertyName; - propValues.add(propertyValue); - } - - /** - * @param propertyValue - */ - public void setValue(String propertyValue) { - propValues.add(propertyValue); - } - - /** - * @return the property name - */ - public String getPropertyName(){ - return propName; - } - - /** - * @return the property value - */ - public List getPropertyValues(){ - return propValues; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java deleted file mode 100644 index 87359c88a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; - -/** - * An internal class implementing ICMAnnotationAdvisor that allows us to decouple the parser - * from the internal data model (CMAnnotationMap). - * - * @author Gerry Kessler - Oracle - * @deprecated see common.metadata package - */ -public final class CMAnnotationAdvisor implements ICMAnnotationAdvisor { - - private CMAnnotationMap map; - - /** - * @param map - */ - public CMAnnotationAdvisor(CMAnnotationMap map) { - this.map = map; - setCaseSensitive(true);// default to case sensitive - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor#addElementAnnotation(java.lang.String, java.lang.String, java.lang.String) - */ - public void addElementAnnotation(String elementName, String propertyName, String propertyValue) { - - CMElementAnnotation elem = getElementAnnotation(getStringValueForCaseSensitivity(elementName)); - elem.setProperty(getStringValueForCaseSensitivity(propertyName), propertyValue); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor#addAttributeAnnotation(java.lang.String, java.lang.String, java.lang.String, java.lang.String) - */ - public void addAttributeAnnotation(String elementName, String attributeName, - String propertyName, String propertyValue) { - - CMElementAnnotation elem = getElementAnnotation(getStringValueForCaseSensitivity(elementName)); - CMAttributeAnnotation attr = getAttributeAnnotation(elem, - getStringValueForCaseSensitivity(attributeName)); - attr.setProperty(getStringValueForCaseSensitivity(propertyName), propertyValue); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor#getFileInfo() - */ - public ICMAnnotationSourceFileInfo getFileInfo() { - return this.map.getFileInfo(); - } - - /** - * This implementation is case sensitive by default - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor#setCaseSensitive(boolean) - */ - public void setCaseSensitive(boolean val) { - map.setCaseSensitive(val); - } - - private CMElementAnnotation getElementAnnotation(String elementName) { - CMElementAnnotation elem = map.getElementAnnotation(elementName); - if (elem == null) { - elem = new CMElementAnnotation(elementName); - map.addCMElementAnnotation(elem); - } - return elem; - } - - private CMAttributeAnnotation getAttributeAnnotation(CMElementAnnotation elem, - String attributeName) { - // attrAnnotations map will always be initialized so do not need to check for null - CMAttributeAnnotation attr = (CMAttributeAnnotation) elem.getAttributeAnnotations().get( - attributeName); - if (attr == null) { - attr = new CMAttributeAnnotation(elem.getName(), attributeName); - elem.addCMAttributeAnnotation(attr); - } - return attr; - } - - private String getStringValueForCaseSensitivity(String val) { - return map.getStringValueForCaseSensitivity(val); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java deleted file mode 100644 index 8388dac6a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; - -/** - * Contains information about annotation files. - * @deprecated see common.metadata package - */ -public final class CMAnnotationFileInfo implements ICMAnnotationSourceFileInfo{ - private String annotationFileLocation; - private String annotationFileLocatorClassname; - private String bundleId; - private String parserClassname; - - /** - * @param annotationFileLocation - * @param bundleId - * @param parserClassname - * @param annotationFileLocatorClassname - */ - public CMAnnotationFileInfo(String annotationFileLocation, String bundleId, String parserClassname, String annotationFileLocatorClassname) { - this.annotationFileLocation = annotationFileLocation.trim(); - this.bundleId = bundleId.trim(); - this.parserClassname = parserClassname; - this.annotationFileLocatorClassname = annotationFileLocatorClassname; - } - - /** - * Get the location of the annotation file as originally specified. - * - * @return String - */ - public String getAnnotationFileLocation() { - return annotationFileLocation; - } - - /** - * Get the annotation file locator classname that must implement ICMAnnotationSourceFileLocator. - * Can return null or empty string. Caller should provide default. - * - * @return String - */ - public String getAnnotationFileLocatorClassname() { - return annotationFileLocatorClassname != null ? annotationFileLocatorClassname.trim() : null; - } - - /** - * Get the bundle id of the plugin where the annotation file is located. - * - * @return String - */ - public String getBundleId() { - return bundleId; - } - - /** - * Return classname for the annotation file parser (ICMAnnotationFileParser) to use. - * Can return null or empty string. If it does, the caller should provide a default. - * - * @return String - */ - public String getParserClassName(){ - return parserClassname != null ? parserClassname.trim() : null; - } - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java deleted file mode 100644 index 81369d3a0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java +++ /dev/null @@ -1,164 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.io.IOException; -import java.io.InputStream; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -/** - * Default implementation of ICMAnnotationFileParser that will parse xml files conforming to - * http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema. - * - * @author Gerry Kessler - Oracle - * - * also see http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema - * @deprecated see common.metadata package - */ -public class CMAnnotationFileParser implements ICMAnnotationFileParser { - - private static final String TAG_ID_ANNOTATIONS = "grammar-annotations"; //$NON-NLS-1$ - private static final String TAG_ID_ELEMENT = "cm-element"; //$NON-NLS-1$ - private static final String TAG_ID_ATTRIBUTE = "cm-attribute"; //$NON-NLS-1$ - private static final String TAG_ID_PROPERTY = "property"; //$NON-NLS-1$ - private static final String TAG_ID_PROPERTY_VALUE = "value"; //$NON-NLS-1$ - - /** - * This method is called to parse an annotation file and store the contents - * into an annotationMap via the advisor - */ - private void parse(ICMAnnotationAdvisor advisor, InputStream input) throws Exception { - ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader(); - try { - SAXParserFactory factory = SAXParserFactory.newInstance(); - factory.setNamespaceAware(true); - SAXParser parser = factory.newSAXParser(); - parser.parse(new InputSource(input), new CMAnnotationMapContentHandler(advisor)); - } finally { - Thread.currentThread().setContextClassLoader(prevClassLoader); - if (input != null){ - try { - input.close(); - } catch (IOException e) { - JSFCommonPlugin.log(e, "error closing annotation file"); - } - } - } - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser#parse(org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor, org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator) - */ - public void parse(ICMAnnotationAdvisor advisor, CMAnnotationSourceFileLocator locator) - throws Exception { - - InputStream inputStream = locator.getAnnotationSourceInputStream(); - parse(advisor, inputStream); - } - - /** - * Default content handler for annotation files following grammar-annotations schema - * - * @author Gerry Kessler - Oracle - */ - protected class CMAnnotationMapContentHandler extends DefaultHandler { - private ICMAnnotationAdvisor advisor; - private String elementName; - private String attributeName; - private String currentPropertyName; - private String currentPropertyValue; - private StringBuffer propertyValueBuffer; - - private boolean isInCMAttribute = false; - - private boolean doCaptureNodeText; - - /** - * Constructor - * @param advisor - */ - public CMAnnotationMapContentHandler(ICMAnnotationAdvisor advisor) { - this.advisor = advisor; - } - - public void startElement(String uri, String localName, String qName, Attributes attributes) - throws SAXException { - if (localName.equals(TAG_ID_ANNOTATIONS)) { - int attributesLength = attributes.getLength(); - for (int i = 0; i < attributesLength; i++) { - String attributeName_ = attributes.getLocalName(i); - String attributeValue = attributes.getValue(i); - if (attributeName_.equals("caseSensitive")) { //$NON-NLS-1$ - if (attributeValue.trim().equals("false")) {//$NON-NLS-1$ - advisor.setCaseSensitive(false); - } - } - } - } else if (localName.equals(TAG_ID_ELEMENT)) { - isInCMAttribute = false; - elementName = attributes.getValue("name"); //$NON-NLS-1$ - } else if (localName.equals(TAG_ID_ATTRIBUTE)) { - isInCMAttribute = true; - attributeName = attributes.getValue("name"); //$NON-NLS-1$ - } else if (localName.equals(TAG_ID_PROPERTY)) { - currentPropertyName = attributes.getValue("name"); //$NON-NLS-1$ - } else if (localName.equals(TAG_ID_PROPERTY_VALUE)) { - propertyValueBuffer = new StringBuffer(); - doCaptureNodeText = true; - } - } - - public void endElement(String uri, String localName, String qName) throws SAXException { - if (currentPropertyName != null && localName.equals(TAG_ID_PROPERTY_VALUE)) { - doCaptureNodeText = false; - currentPropertyValue = propertyValueBuffer.toString(); - if (currentPropertyValue != null) { - if (isInCMAttribute) - advisor.addAttributeAnnotation(elementName, attributeName, - currentPropertyName, currentPropertyValue); - else - advisor.addElementAnnotation(elementName, currentPropertyName, - currentPropertyValue); - } - } - - if (localName.equals(TAG_ID_ELEMENT)) { - elementName = null; - } else if (localName.equals(TAG_ID_ATTRIBUTE)) { - isInCMAttribute = false; - attributeName = null; - } else if (localName.equals(TAG_ID_PROPERTY)) { - currentPropertyName = null; - } else if (localName.equals(TAG_ID_PROPERTY_VALUE)) { - currentPropertyValue = null; - } - } - - public void characters(char[] ch, int start, int length) { - if (doCaptureNodeText) - propertyValueBuffer.append(ch, start, length); - } - - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java deleted file mode 100644 index 673600112..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser; -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; -import org.eclipse.osgi.util.NLS; -import org.osgi.framework.Bundle; - -/** - * Helper class used by the annotations registry to parse and poplulate the annotation maps using - * the specified parsed, and source file locator from the extension. - * - * @author Gerry Kessler - Oracle - * @deprecated see common.metadata package - */ -public class CMAnnotationFileParserHelper { - private static final String DEFAULT_PARSER_NAME = "org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationFileParser"; //$NON-NLS-1$ - private static final String DEFAULT_LOCATOR_NAME = "org.eclipse.jst.jsf.contentmodel.annotation.internal.CMPluginRelativeSourceFileLocator"; //$NON-NLS-1$ - - /** - * default constructor - */ - public CMAnnotationFileParserHelper() { - super(); - } - - /** - * @param map - */ - public void parse(CMAnnotationMap map){ - ICMAnnotationFileParser parser = getParser(map.getFileInfo()); - ICMAnnotationAdvisor advisor = new CMAnnotationAdvisor(map); - CMAnnotationSourceFileLocator locator = getLocator(map.getFileInfo()); - map.setLocator(locator); - try { - parser.parse(advisor, locator); - } catch (Exception e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileParserHelper_unable_to_parse , new String[]{map.getFileInfo().getAnnotationFileLocation(), map.getFileInfo().getAnnotationFileLocatorClassname()})); - } - } - - private ICMAnnotationFileParser getParser(ICMAnnotationSourceFileInfo fileInfo) { - String parserClassName = fileInfo.getParserClassName(); - Object obj = null; - if (parserClassName != null && !parserClassName.equals("")){ //$NON-NLS-1$ - obj = getObjectForClassname(fileInfo.getBundleId(), parserClassName); - } - else {//return default - obj = getObjectForClassname(JSFCommonPlugin.PLUGIN_ID, DEFAULT_PARSER_NAME ); - } - if (obj != null && obj instanceof ICMAnnotationFileParser) - return (ICMAnnotationFileParser)obj; - - return null; - } - - private CMAnnotationSourceFileLocator getLocator(ICMAnnotationSourceFileInfo fileInfo) { - String locatorClassName = fileInfo.getAnnotationFileLocatorClassname(); - Object obj = null; - if (locatorClassName != null && !locatorClassName.equals("")){ //$NON-NLS-1$ - obj = getObjectForClassname(fileInfo.getBundleId(), locatorClassName); - } - else {//return default - obj = getObjectForClassname(JSFCommonPlugin.PLUGIN_ID, DEFAULT_LOCATOR_NAME); - } - if (obj != null && obj instanceof CMAnnotationSourceFileLocator){ - CMAnnotationSourceFileLocator locator = (CMAnnotationSourceFileLocator)obj; - locator.setFileInfo(fileInfo); - return locator; - } - return null; - } - - private static Object getObjectForClassname(String bundleId, String providerClassName){ - try { - Bundle bundle =Platform.getBundle(bundleId); - if (bundle == null){ - JSFCommonPlugin.log(IStatus.ERROR, NLS.bind(Messages.CMAnnotationFileParserHelper_unable_to_find_bundleid, new String[]{bundleId, providerClassName})); - return null; - } - Class klass = bundle.loadClass(providerClassName); - if (klass != null){ - return klass.newInstance(); - } - return null; - } catch (ClassNotFoundException e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileParserHelper_class_not_found, new String[]{bundleId, providerClassName})); - } catch (InstantiationException e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileParserHelper_instantiation_exception, new String[]{bundleId, providerClassName})); - } catch (IllegalAccessException e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileParserHelper_illegal_access_exception, new String[]{bundleId, providerClassName})); - } - return null; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java deleted file mode 100644 index 58d8ed6bc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java +++ /dev/null @@ -1,191 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; -import org.eclipse.osgi.util.NLS; - -/** - * This internal class is used to associate one or more annotation files with a grammar - * file mapped by a key (uri). - * - * Using the CMAnnotationFileRegistryReader, extenders of <code>org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles</code> are loaded - * into the annotationFilesMap keyed by uri. There can be multiple annotationFiles mapped to the same uri. - * - * This registry should only be accessed by clients using the <code>org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationHelper</code>. - * Only when the system attempts to access an annotation for a content model, will the file be parsed and cached. - * - * When queried, CMAnnotationPropertyValue objects are returned for each named property found in each annotation file for a particular uri. - * - * also see org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles extension-point - * @see CMAnnotationFileRegistryReader - * @see CMAnnotationMap - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo - * - * @deprecated see common.metadata package - */ -public final class CMAnnotationFileRegistry { - //all annotation files registered using "org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles" ext-pt. and keyed by uri. - private Map annotationFilesMap = new HashMap(1); - //will return list of CMAnnotationMap (parsed annotation files) objects keyed by uri - private Map parsedFilesMap = new HashMap(1); - - private static CMAnnotationFileRegistry reg; - - private static final boolean DISABLED = true; - - /** - * @return return the singleton instance of the registry - */ - public static CMAnnotationFileRegistry getInstance() { - if (reg == null){ - reg = new CMAnnotationFileRegistry(); - } - return reg; - - } - - //constructor reads the annotationFile registry and populates the annotationFilesMap - private CMAnnotationFileRegistry() { - if (!(DISABLED)) - new CMAnnotationFileRegistryReader(this).readRegistry(); - } - - private synchronized List getAnnotationFilesInfos(String uri) { - List theList = (List) annotationFilesMap.get(uri); - return theList != null ? theList : new ArrayList(); - } - - /** - * For use by registry reader only - * @param uri - * @param fileInfo - */ - public synchronized void addAnnotationFileInfo(String uri, ICMAnnotationSourceFileInfo fileInfo) { - List fileInfos = (List) annotationFilesMap.get(uri); - if (fileInfos == null) { - fileInfos = new ArrayList(); - annotationFilesMap.put(uri, fileInfos); - } - fileInfos.add(fileInfo); - } - - private synchronized void addParsedFileToMap(String uri, CMAnnotationMap map) { - List maps = (List) parsedFilesMap.get(uri); - if (maps == null) { - maps = new ArrayList(); - parsedFilesMap.put(uri, maps); - } - maps.add(map); - } - - /** - * Return list of CMAnnotationMaps for a given uri. - * By calling this method, unparsed annotation files for the given - * uri will be parsed. - * - * @param uri - * @return List of CMAnnotationMaps - */ - public synchronized List getAnnotationMaps(String uri) { - if (DISABLED){ - JSFCommonPlugin.log(IStatus.ERROR, "Attempted metadata access using CMAnnotationFiles for uri: "+uri+". Use org.eclipse.jst.jsf.common.metadata, instead." ); - return Collections.EMPTY_LIST; - } - - List list = (List)parsedFilesMap.get(uri); - if (list == null){ - loadAnnotationsForGrammar(uri); - list = (List)parsedFilesMap.get(uri); - } - return list; - } - - - /** - * Does this bundle define an annotationFile extension for the given uri. - * - * @param bundleId - * @param uri - * @return boolean - */ - public boolean hasAnnotations(String bundleId, String uri) { -// if (DISABLED){ -// -// } - List maps = (List)annotationFilesMap.get(uri); - if (maps == null || maps.size() ==0) - return false; - - for (int i=0;i<maps.size();i++){ - if (((ICMAnnotationSourceFileInfo)maps.get(i)).getBundleId().equals(bundleId)) - return true; - } - return false; - } - /** - * Are there any annotationFile extensions defined for the given uri. - * @param uri - * @return boolean - */ - public boolean hasAnnotations(String uri){ - if (DISABLED){ - JSFCommonPlugin.log(IStatus.ERROR, "Attempted metadata access using CMAnnotationFiles for uri: "+uri+". Use org.eclipse.jst.jsf.common.metadata, instead." ); - return false; - } - if (annotationFilesMap.get(uri) != null) - return true; - return false; - } - - private boolean areAnnotationsParsed(String uri) { - if (hasAnnotations(uri)){ - if (parsedFilesMap.get(uri) != null) - return true; - } - return false; - } - - private void loadAnnotationsForGrammar(String uri) { - if (areAnnotationsParsed(uri)) - return; - - if (DISABLED) - return; - - List annotationFiles = getAnnotationFilesInfos(uri); - for (Iterator i = annotationFiles.iterator(); i.hasNext();) { - try { - CMAnnotationFileInfo annotationFileInfo = (CMAnnotationFileInfo) i.next(); - CMAnnotationMap map = new CMAnnotationMap(annotationFileInfo); - CMAnnotationFileParserHelper parserHelper = new CMAnnotationFileParserHelper(); - parserHelper.parse(map); - addParsedFileToMap(uri, map); - } - catch (Exception e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileRegistry_load_error, new String[]{uri})); - } - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistryReader.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistryReader.java deleted file mode 100644 index ce5bcc035..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistryReader.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.osgi.util.NLS; - - -/** - * This class reads the Activator manifests and adds each specified grammar - * annotation file to the CMAnnotationsRegistry. - * - * @see CMAnnotationFileRegistry - * also see org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles extension-point - * @deprecated see common.metadata package - */ -public class CMAnnotationFileRegistryReader { - private static final String EXTENSION_POINT_ID = "annotationFiles"; //$NON-NLS-1$ - private static final String TAG_NAME = "annotationFile"; //$NON-NLS-1$ - private static final String ATT_URI = "uri"; //$NON-NLS-1$ - private static final String ATT_LOCATION = "location"; //$NON-NLS-1$ - private static final String ATT_LOCATOR = "locator"; //$NON-NLS-1$ - private static final String ATT_PARSER = "parser"; //$NON-NLS-1$ - - private CMAnnotationFileRegistry annotationFileRegistry; - - /** - * @param annotationFileRegistry - */ - public CMAnnotationFileRegistryReader(CMAnnotationFileRegistry annotationFileRegistry) { - this.annotationFileRegistry = annotationFileRegistry; - } - - /** - * read the registery - */ - public void readRegistry() { - IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID); - if (point != null) { - IConfigurationElement[] elements = point.getConfigurationElements(); - for (int i = 0; i < elements.length; i++) { - readElement(elements[i]); - } - } - } - - private void readElement(IConfigurationElement element) { - if (element.getName().equals(TAG_NAME)) { - String uri = element.getAttribute(ATT_URI); - String location = element.getAttribute(ATT_LOCATION); - String locator = element.getAttribute(ATT_LOCATOR); - String parser = element.getAttribute(ATT_PARSER); - String bundleId = null; - if (uri != null && location != null) { - try { - bundleId = element.getContributor().getName(); - CMAnnotationFileInfo fileInfo = new CMAnnotationFileInfo(location, bundleId, parser, locator); - annotationFileRegistry.addAnnotationFileInfo(uri, fileInfo); - } - catch (Exception e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationFileRegistryReader_problem, new String[]{bundleId, uri, location})); - } - } - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java deleted file mode 100644 index 47d258f08..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java +++ /dev/null @@ -1,311 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Oracle - code borrowed and repurposed for JSF subproject - * - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.io.IOException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.Vector; - -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationPropertyValue; -import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; -import org.eclipse.osgi.util.NLS; - - -/** - * Internal data model of content model annotations. - * The content model is assumed to be xml-based (elements and attributes). - * - * Map of annotations for content model elements keyed by tag element name. - * Attribute annotations are stored in a map inside the element annotation. - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.CMElementAnnotation - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAttributeAnnotation - * - * @deprecated see common.metadata package - */ -public class CMAnnotationMap { - /** - * map of tag-element annotations keyed by tag name - */ - protected Map cmNodeToAnnotationMap = new Hashtable(); - private boolean isCaseSensitive = true; - private ICMAnnotationSourceFileInfo fileInfo; - private ResourceBundle resourceBundle; - private CMAnnotationSourceFileLocator locator; - - /** - * Constructor - * @param fileInfo - */ - public CMAnnotationMap(ICMAnnotationSourceFileInfo fileInfo) { - this.fileInfo = fileInfo; - } - - /** - * Set whether or not the model should be queried in a case sensitive manner - * @param isCaseSensitive - */ - public void setCaseSensitive(boolean isCaseSensitive) { - this.isCaseSensitive = isCaseSensitive; - } - - /** - * Set the ICMAnnotationSourceFileLocator used to find and load the annotation file - * @param locator - */ - public void setLocator(CMAnnotationSourceFileLocator locator){ - this.locator = locator; - } - - /** - * Return the annotation for the specified element name. - * Will be null if no annotation is found. - * - * @param elementName - * @return CMElementAnnotation - */ - public CMElementAnnotation getElementAnnotation(String elementName) { - CMElementAnnotation elem = null; - if (cmNodeToAnnotationMap.containsKey(elementName)){ - List annos = (List)cmNodeToAnnotationMap.get(elementName); - Iterator it = annos.iterator(); - while(it.hasNext()){ - elem = (CMElementAnnotation)it.next(); - if (elem.getName() == elementName) - break; - } - } - return elem; - } - - /** - * Annotation advisor will call this method when adding an annotation to a map. - * - * @param annotation - */ - public void addCMElementAnnotation(CMElementAnnotation annotation) { - addAnnotationForCMNodeName(annotation.getName(), annotation); - } - - private void addAnnotationForCMNodeName(String cmNodeName, CMElementAnnotation annotation) { - List list = (List) cmNodeToAnnotationMap.get(cmNodeName); - if (list == null) { - list = new Vector(); - cmNodeToAnnotationMap.put(cmNodeName, list); - } - list.add(annotation); - } - - /** - * Returns list of NLS fixed String values for a given property name of an element. - * - * @param elementName - * @param propertyName - * @return List of Strings - can be null - */ - public List getCMElementPropertyValues(String elementName, String propertyName) { - List result = null; - String key = getStringValueForCaseSensitivity(elementName); - String propName = getStringValueForCaseSensitivity(propertyName); - List annotationList = (List) cmNodeToAnnotationMap.get(key); - if (annotationList != null) { - for (Iterator i = annotationList.iterator(); i.hasNext();) { - CMAnnotation annotation = (CMAnnotation) i.next(); - if (annotation.getAnnotationProperty(propName)!= null) { - result = getNLSPropertyValues(annotation, propName); - break; - } - } - } - return result; - } - - /** - * Returns the first NLS fixed String value for a given property name of an element. - * Caller should use <code>getCMElementPropertyValues</code> if multiple values can be returned for a - * property name. - * - * @param elementName - * @param propertyName - * @return String - can be null - */ - public String getCMElementProperty(String elementName, String propertyName) { - String result = null; - List vals = getCMElementPropertyValues(elementName, propertyName); - if (vals != null){ - if (vals.get(0) != null) - result = vals.get(0).toString(); - } - return result; - } - - /** - * Returns list of NLS fixed String values for a given property name of an attribute of a particular element. - * - * @param elementName - * @param attributeName - * @param propertyName - * @return List of Strings - can be null - */ - public List getCMAttributePropertyValues(String elementName, String attributeName, String propertyName) { - - List result = null; - String key = getStringValueForCaseSensitivity(elementName); - String attrName = getStringValueForCaseSensitivity(attributeName); - String propName = getStringValueForCaseSensitivity(propertyName); - List annotationListForElement = (List) cmNodeToAnnotationMap.get(key); - if (annotationListForElement != null) { - CMAttributeAnnotation annotationForAttr = getCMAttributeAnnotation(annotationListForElement, attrName); - if (annotationForAttr != null){ - if (annotationForAttr.getAnnotationProperty(propName) != null){ - List propVals = getNLSPropertyValues(annotationForAttr, propName); - if (propVals != null) - result = propVals; - } - } - } - return result; - } - - /** - * Gets the first property value for the specified element and attribute. - * - * @param elementName - * @param attributeName - * @param propertyName - * @return String - can be null - */ - public String getCMAttributeProperty(String elementName, String attributeName, String propertyName) { - String result = null; - List propVals = getCMAttributePropertyValues(elementName, attributeName, propertyName); - if (propVals != null){ - result = (String)propVals.get(0); - } - return result; - } - - /** - * Return a <code>CMAnnotationPropertyValue</code> object for the given element, attribute, and property name. - * - * @param elementName - * @param attributeName - * @param propertyName - * @return CMAnnotationPropertyValue - can be null - */ - public CMAnnotationPropertyValue getCMAttributePropertyValue(String elementName, String attributeName, String propertyName) { - CMAnnotationPropertyValue result = null; - List val = getCMAttributePropertyValues(elementName, attributeName, propertyName); - if (val != null){ - result = new CMAnnotationPropertyValue(fileInfo, val); - } - return result; - } - - /** - * Return a <code>CMAnnotationPropertyValue</code> object for the given element and property name. - * - * @param elementName - * @param propertyName - * @return CMAnnotationPropertyValue - can be null - */ - public CMAnnotationPropertyValue getCMElementPropertyValue(String elementName, String propertyName) { - CMAnnotationPropertyValue result = null; - List val = getCMElementPropertyValues(elementName, propertyName); - if (val != null){ - result = new CMAnnotationPropertyValue( fileInfo, val); - } - return result; - } - - private CMAttributeAnnotation getCMAttributeAnnotation(List annotationListForElement, String attributeName) { - for (int i=0;i < annotationListForElement.size();i++){ - CMElementAnnotation annotationForElement = (CMElementAnnotation)annotationListForElement.get(i); - if (annotationForElement != null){ - Map attributeAnnotations = annotationForElement.getAttributeAnnotations(); - if (attributeAnnotations != null){ - CMAttributeAnnotation attributeAnnotation = (CMAttributeAnnotation)attributeAnnotations.get(attributeName); - if (attributeAnnotation != null){ - return attributeAnnotation; - } - } - } - } - return null ; - } - - private List getNLSPropertyValues(CMAnnotation annotation, String propertyName){ - List result = annotation.getAnnotationProperty(propertyName).getPropertyValues(); - for (int i=0;i<result.size();i++){ - String val = (String)result.get(i); - if (val.startsWith("%") && !val.startsWith("%%")){ //$NON-NLS-1$ //$NON-NLS-2$ - val = getNLSPropertyValue(val); - result.set(i, val); - //also update property annotation to avoid needing to go thru bundle next time - annotation.getAnnotationProperty(propertyName).getPropertyValues().set(i, val); - } - } - return result; - } - - //will return null if there is an IOException with ResourceBundle - private String getNLSPropertyValue(String val){ - String NOT_FOUND = Messages.CMAnnotationMap_key_not_found; - try{ - ResourceBundle resourceBundle_ = getResourceBundle(); - if (resourceBundle_ != null){ - String replVal = resourceBundle_.getString(val.substring(1)); - return replVal; - } - //return original string - return val; - } catch (IOException e) { - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationMap_IOException, new String[]{val})); - return null; - } catch (MissingResourceException e){ - //fall thru - JSFCommonPlugin.log(e, NLS.bind(Messages.CMAnnotationMap_MissingResource_exception, new String[]{val})); - } - return val.substring(1) + NOT_FOUND; - } - - /** - * Return the ICMAnnotationSourceFileInfo used to create this CMAnnotationMap - * @return ICMAnnotationSourceFileInfo - */ - public ICMAnnotationSourceFileInfo getFileInfo(){ - return fileInfo; - } - - /** - * @param val - * @return string value used for case sensitive or insensitive queries. - */ - public String getStringValueForCaseSensitivity(String val){ - return isCaseSensitive ? val : val.toLowerCase(); - } - - private ResourceBundle getResourceBundle() throws IOException{ - if (resourceBundle == null){ - resourceBundle = locator.getResourceBundle(); - } - return resourceBundle; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAttributeAnnotation.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAttributeAnnotation.java deleted file mode 100644 index fe28e9cbb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAttributeAnnotation.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -/** - * Represents an annotation on a content model attribute - * - * @author Gerry Kessler - Oracle - * - * @see CMElementAnnotation - * @deprecated see common.metadata package - */ -public class CMAttributeAnnotation extends CMAnnotation { - private String elementNodeSpec; - - /** - * Constructor - * @param elemNodeSpec - * @param name - */ - public CMAttributeAnnotation(String elemNodeSpec, String name) { - super(name); - elementNodeSpec = elemNodeSpec; - } - - public String toString(){ - StringBuffer buf = new StringBuffer("AttrAnnotation: "); //$NON-NLS-1$ - buf.append(getName()).append(": ").append(elementNodeSpec).append(": ").append(super.toString()); //$NON-NLS-1$ //$NON-NLS-2$ - return buf.toString(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMElementAnnotation.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMElementAnnotation.java deleted file mode 100644 index 72048fe30..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMElementAnnotation.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.util.Hashtable; -import java.util.Map; - -/** - * Represents an annotation on a content model element. - * The element annotation object holds a map it's attribute annotations. - * - * @author Gerry Kessler - Oracle - * - * @see CMAttributeAnnotation - * @deprecated see common.metadata package - */ -public class CMElementAnnotation extends CMAnnotation { - private final Hashtable attributes = new Hashtable(); - - /** - * Constructor - * @param name - */ - public CMElementAnnotation(String name) { - super(name); - } - - /** - * Return this element annotations attribute annotations. - * Will NOT be null but may be empty. - * @return Map - */ - public Map getAttributeAnnotations() { - return attributes; - } - - /** - * Add an attribute annotation to this element's attribute annotations map - * - * @param annotation - */ - public void addCMAttributeAnnotation(CMAttributeAnnotation annotation){ - attributes.put(annotation.getName(), annotation); - } - - public String toString(){ - StringBuffer buf = new StringBuffer("ElementAnnotation: "); //$NON-NLS-1$ - buf.append(getName()).append(": ").append(super.toString()); //$NON-NLS-1$ - return buf.toString(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java deleted file mode 100644 index b6f876b1c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; - -/** - * Default implementation of CMAnnotationSourceFileLocator that will locate annotations - * and resource bundles relative to the plugin that extends annotationFiles. - * - * @author Gerry Kessler - Oracle - * @deprecated see common.metadata package - */ -public class CMPluginRelativeSourceFileLocator extends CMAnnotationSourceFileLocator { - - /* - * Returns InputStream of annotation file from plugin relative location. - * - * @see org.eclipse.jst.jsf.contentmodel.annotations.internal.contentmodel.internal.annotation.AbstractCMSourceFileLocator#getAnnotationSourceInputStream() - */ - public InputStream getAnnotationSourceInputStream() throws IOException { - URL url = FileLocator.find(Platform.getBundle(fileInfo.getBundleId()), Path.fromOSString(fileInfo.getAnnotationFileLocation()), null); - if (url != null) { - return url.openStream(); - } - return null; - } - - /* - * Returns property resource bundle if it exists. May return null. - * This implementation assumes that the basename of the bundle is the same - * as the source file name and in the same directory. - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileLocator#getResourceBundle() - */ - public ResourceBundle getResourceBundle() throws IOException, MalformedURLException { - URL bundleURL = getAnnotationPropertiesFileBasenameURL(); - ResourceBundle resourceBundle = ResourceBundleHelper.getResourceBundle(getBaseNameURL(bundleURL)); - return resourceBundle; - } - - private URL getAnnotationPropertiesFileBasenameURL() { - IPath annotationPath = Path.fromOSString(fileInfo.getAnnotationFileLocation()); - IPath annotationFolder = annotationPath.removeLastSegments(1); - IPath propertiesLocation = annotationPath.removeFirstSegments(annotationPath.segmentCount() - 1).removeFileExtension(); - // append location of propertiles file - IPath propertiesFile = annotationFolder.append(propertiesLocation); - - // append .properties extension if needed - if (propertiesFile.getFileExtension() == null) - propertiesFile = propertiesFile.addFileExtension("properties"); //$NON-NLS-1$ - // create a URL out of the properties file location - return FileLocator.find(Platform.getBundle(fileInfo.getBundleId()), - propertiesFile, null); - } - - - private String getBaseNameURL(URL bundleURL) { - IPath url = new Path(bundleURL.toExternalForm()); - if (url.getFileExtension() != null) - url = url.removeFileExtension(); - return url.toString(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java deleted file mode 100644 index ac3482861..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; - - -/** - * Interface used to build internal data model of annotations. - * Decouples the data model from the parser so that model can be changed in the future. - * - * Not intended to be implemented by others. - * - * @author Gerry Kessler - Oracle - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationAdvisor - * @deprecated see common.metadata package - */ -public interface ICMAnnotationAdvisor { - /** - * Returns annotationFile extension information - * @return ICMAnnotationSourceFileInfo - */ - public ICMAnnotationSourceFileInfo getFileInfo(); - /** - * Set whether or not elements, attributes and property name querying is case sensitive or not. - * @param val - */ - public void setCaseSensitive(boolean val); - /** - * Method to be used by a ICMAnnotationFileParser to assign a property and a value - * to an element in a particular content model defined by the ICMAnnotationSourceFileInfo. - * - * @param elementName - * @param propertyName - * @param propertyValue - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo - */ - public void addElementAnnotation(String elementName, String propertyName, String propertyValue); - /** - * Method to be used by a ICMAnnotationFileParser to assign a property and a value - * to an attribute of an element in a particular content model defined by the ICMAnnotationSourceFileInfo. - * - * @param elementName - * @param attributeName - * @param propertyName - * @param propertyValue - * - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser - * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo - */ - public void addAttributeAnnotation(String elementName, String attributeName, String propertyName, String propertyValue); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/Messages.java deleted file mode 100644 index 58d1ab9d5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/Messages.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Gerry Kessler/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import org.eclipse.osgi.util.NLS; - -/** - * @deprecated see common.metadata package - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.contentmodel.annotation.internal.messages"; //$NON-NLS-1$ - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - /** - * see message.properties - */ - public static String CMAnnotationFileParserHelper_class_not_found; - - /** - * see message.properties - */ - public static String CMAnnotationFileParserHelper_illegal_access_exception; - - /** - * see message.properties - */ - public static String CMAnnotationFileParserHelper_instantiation_exception; - - /** - * see message.properties - */ - public static String CMAnnotationFileParserHelper_unable_to_find_bundleid; - - /** - * see message.properties - */ - public static String CMAnnotationFileParserHelper_unable_to_parse; - - /** - * see message.properties - */ - public static String CMAnnotationFileRegistry_load_error; - - /** - * see message.properties - */ - public static String CMAnnotationFileRegistryReader_problem; - - /** - * see message.properties - */ - public static String CMAnnotationMap_IOException; - - /** - * see message.properties - */ - public static String CMAnnotationMap_key_not_found; - - /** - * see message.properties - */ - public static String CMAnnotationMap_MissingResource_exception; - - private Messages() { - // no external instantiation - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ResourceBundleHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ResourceBundleHelper.java deleted file mode 100644 index 414074870..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ResourceBundleHelper.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * Gerry Kessler/Oracle - copied from org.eclipse.wst.sse.core.internal.encoding.util and modified - *******************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Locale; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.FileLocator; - -/** - * @deprecated see common.metadata package - * - */ -public class ResourceBundleHelper { - - /** - * @param resourceURI - * @return the resource bundle in resourceURI using the default locale - * @throws MalformedURLException - * @throws IOException - */ - public static ResourceBundle getResourceBundle(String resourceURI) throws MalformedURLException, IOException { - return getResourceBundle(resourceURI, Locale.getDefault()); - } - - /** - * @param resourceURI - * @param targetLocale - * @return the resource bundle in resourceURI using the target locale - * @throws MalformedURLException - * @throws IOException - */ - public static ResourceBundle getResourceBundle(String resourceURI, Locale targetLocale) throws MalformedURLException, IOException { - // try to load bundle from the location specified in the resourceURI - // we make the assumption that the resourceURI points to the local - // file system - - int index = resourceURI.lastIndexOf("/"); //$NON-NLS-1$ - if (index == -1) { - throw new IllegalArgumentException("Invalid resourceURI"); //$NON-NLS-1$ - } - - // Below we set 'resourceDirectory' so that it ends with a '/'. - // Here's an excerpt from the ClassLoader Javadoc ... - // Any URL that ends with a '/' is assumed to refer to a directory. - // Otherwise, the URL is assumed - // to refer to a JAR file which will be opened as needed. - // - String resourceDirectory = resourceURI.substring(0, index + 1); - String resourceBundleName = resourceURI.substring(index + 1); - - // create a class loader with a class path that points to the resource - // bundle's location - // - URL[] classpath = new URL[1]; - classpath[0] = FileLocator.resolve(new URL(resourceDirectory)); - ClassLoader resourceLoader = new URLClassLoader(classpath, null); - - return ResourceBundle.getBundle(resourceBundleName, targetLocale, resourceLoader); - } -} - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/messages.properties deleted file mode 100644 index ba366a442..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/messages.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -CMAnnotationFileRegistryReader_problem=Problem adding annotation file: bundle = {0}, uri = {1}, location = {2} -CMAnnotationFileParserHelper_unable_to_parse=Unable to parse: {0} with {1} -CMAnnotationFileParserHelper_unable_to_find_bundleid=Unable to find bundleId: {0} in {1} -CMAnnotationFileParserHelper_class_not_found=ClassNotFoundException: {0} in {1} -CMAnnotationFileParserHelper_instantiation_exception=InstantiationException: {0} in {1} -CMAnnotationMap_MissingResource_exception=MissingResourceException for NLSPropertyValue: {0} -CMAnnotationFileRegistry_load_error=Error loading grammar for: {0} -CMAnnotationMap_key_not_found=(key not found) -CMAnnotationMap_IOException=IOException for NLSPropertyValue: {0} -CMAnnotationFileParserHelper_illegal_access_exception=IllegalAccessException: {0} in {1} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/package-info.java deleted file mode 100644 index c47051c73..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Design-time metadata framework. - * <p><b>Deprecated - and no longer in use. Use common.metadata</b></p> - */ -package org.eclipse.jst.jsf.contentmodel.annotation; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java deleted file mode 100644 index 37e7c6c58..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java +++ /dev/null @@ -1,110 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; - -/** - * An abstract implementation of the IDelegatingFactory interface - * - * Clients may extend this class. - * - * @author cbateman - * - */ -public abstract class AbstractDelegatingFactory implements IDelegatingFactory { - - /* instance attributes */ - - /** - * the list of registered factory delegates - */ - protected final List<IAdaptable> _delegates; - - private final List<Class> _supportedDelegates; - - /** - * @param supportedDelegateTypes -- populates the list of classes used - * by the isValidDelegate contract - */ - protected AbstractDelegatingFactory(Class[] supportedDelegateTypes) - { - _delegates = new ArrayList<IAdaptable>(); - - final List<Class> supportedTypes = new ArrayList<Class>(); - supportedTypes.addAll(Arrays.asList(supportedDelegateTypes)); - _supportedDelegates = Collections.unmodifiableList(supportedTypes); - } - - /** - * @see org.eclipse.jst.jsf.context.IDelegatingFactory#addFactoryDelegate(org.eclipse.core.runtime.IAdaptable) - */ - public final void addFactoryDelegate(IAdaptable delegate) - { - synchronized(_delegates) - { - - if (!_delegates.contains(delegate) - && isValidDelegate(delegate)) - { - _delegates.add(delegate); - } - } - } - - /** - * @see org.eclipse.jst.jsf.context.IDelegatingFactory#removeFactoryDelegate(org.eclipse.core.runtime.IAdaptable) - */ - public final boolean removeFactoryDelegate(IAdaptable delegate) - { - synchronized(_delegates) - { - return _delegates.remove(delegate); - } - } - - /** - * @see org.eclipse.jst.jsf.context.IDelegatingFactory#getValidDelegateTypes() - */ - public final List<Class> getValidDelegateTypes() - { - return _supportedDelegates; - } - - /** - * @see org.eclipse.jst.jsf.context.IDelegatingFactory#isValidDelegate(org.eclipse.core.runtime.IAdaptable) - */ - public final boolean isValidDelegate(IAdaptable delegate) - { - for (final Iterator<Class> it = _supportedDelegates.iterator(); it.hasNext();) - { - final Class clazz = it.next(); - - // if the delegate supports one of the valid delegate classes - // via adaptation, then it is a valid delegate - if (delegate.getAdapter(clazz) != null) - { - return true; - } - } - - // if no found, delegate is not supported - return false; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java deleted file mode 100644 index 9dad3487d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context; - - -/** - * A convenience super-type for all context instances that implement - * IDocumentContext or one of its sub-types. - * - * - * @author cbateman - * - */ -public abstract class AbstractDocumentContext implements IDocumentContext { - - /** - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapterClass) - { - if (adapterClass.equals(IDocumentContext.class)) - { - return this; - } - else if (adapterClass.equals(IModelContext.class)) - { - return this; - } - - return null; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java deleted file mode 100644 index 6e91576ef..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context; - -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; - -/** - * Defines a type of factory that can have delegate factories to help it - * create an appropriate instance type. The general contract for implementors - * is: - * - * 1) You must follow the isValidDelegate contract. - * 2) You should try to create an instance yourself and only delegate - * if cannot do it yourself. Deviations from this rule must be - * clearly documented to ensure clients understand how the factory works. - * - * Clients may NOT implement this interface. - * Extend AbstractDelegatingFactory instead. - * - * @author cbateman - * - */ -public interface IDelegatingFactory -{ - /** -- Delegates */ - /** If this factory is asked to construct but does not know how to, - * it will ask each of its registered delegates to do so in the order - * they were added. - */ - - /** - * Adds delgate to the end of the list of factory delegates if the list - * does not already contain it. - * - * @param delegate - * @throws ClassCastException if delegate does not implement an expected - * interface. Each implementor can define what delegates are valid - * based on the isValidDelegate() and getValidDelegates contracts - */ - void addFactoryDelegate(IAdaptable delegate); - - - /** - * @param delegate - * @return true if delegate was removed, false if delegate wasn't in - * the list of delegates - */ - boolean removeFactoryDelegate(IAdaptable delegate); - - /** - * @return a list of Class objects that represent the interfaces - * that may be passed to addFactoryDelegate. Implementor should - * return at least one supported class. - */ - List<Class> getValidDelegateTypes(); - - - /** - * The return value of this method should conform to the following contract: - * - * Let v = getValidDelegates. Then isValidDelegate should return true - * only if the set of v contains a Class for which delegate.getAdapter(Class) - * returns a non-null value. - * - * @param delegate - * @return true if delegate is supported, false otherwise. - */ - boolean isValidDelegate(IAdaptable delegate); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java deleted file mode 100644 index fe7d03339..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context; - -/** - * Encapsulates runtime context in a JFace IDocument model - * - * Clients may NOT implement this interface directly but may sub-class - * Extend AbstractDocumentContext instead. - - * @author cbateman - * - */ -public interface IDocumentContext extends IModelContext -{ - // TODO: might make sense to have a getDocument() accessor here - // currently empty -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java deleted file mode 100644 index 1ace325cd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context; - -import org.eclipse.core.runtime.IAdaptable; - -/** - * Encapsulates the current runtime context in some model. - * - * This interface may be sub-classed but not implemented directly - */ -public interface IModelContext extends IAdaptable -{ - // current empty -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java deleted file mode 100644 index f31d0b2ff..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Model context framework. - */ -package org.eclipse.jst.jsf.context; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java deleted file mode 100644 index d7b8c7cd7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.resolver; - -import org.eclipse.jst.jsf.context.IModelContext; - -/** - * The super-class of all context resolver impls. - * - * @author cbateman - * - */ -public abstract class AbstractContextResolver implements IContextResolver { - - public abstract boolean canResolveContext(IModelContext modelContext); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java deleted file mode 100644 index 3571dc4d0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.resolver; - -import org.eclipse.jst.jsf.context.IModelContext; - -/** - * The parent of all IDocumentContextResolver implementations. - * - * @author cbateman - * - */ -public abstract class AbstractDocumentContextResolver implements - IDocumentContextResolver { - - public abstract boolean canResolveContext(IModelContext modelContext); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java deleted file mode 100644 index 4471cabf9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver; - -import org.eclipse.jst.jsf.context.IModelContext; - -/** - * Super type of all context resolvers. - * - * May be sub-classed but should not be implemented directly. - * Use AbstractContextResolver to implement. - * - * @author cbateman - * - */ -public interface IContextResolver -{ - /** - * @param modelContext - * @return true if this resolver can resolve context information - * based on this context - */ - boolean canResolveContext(IModelContext modelContext); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java deleted file mode 100644 index 0191c3f0b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver; - -/** - * The super-interface for all context resolvers that are related - * to IDocumentContext's. - * - * This interface may NOT be implemented by clients directly but may be sub-classed. - * Use AbstractDocumentContextResolver for implementation. - * - * @author cbateman - * - */ -public interface IDocumentContextResolver extends IContextResolver -{ - // currently empty -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java deleted file mode 100644 index 27cb48d37..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Context resolver framework. - */ -package org.eclipse.jst.jsf.context.resolver; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java deleted file mode 100644 index 4677bc851..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument; - -import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -/** - * Defines a type of context resolver used to resolve the current context - * in the XML DOM context. - * - * This interface may be sub-classed or implemented by clients - * - * @author cbateman - * - */ -public interface IDOMContextResolver extends IDocumentContextResolver -{ - /** - * @return the complete DOM Document for this context or null if it - * cannot be resolved. - */ - Document getDOMDocument(); - - /** - * @return the node which the current context is pointing to. - * If document context is on an attribute will return that attribute - */ - Node getNode(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java deleted file mode 100644 index 12e9987cc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument; - -import java.util.List; - -import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; - -/** - * Resolves meta-data for a particular context - * - * This interface may sub-classed or implemented by clients - * - * @author cbateman - * - */ -public interface IMetadataContextResolver extends IDocumentContextResolver -{ - /** - * @param key - * @return a list of one or more String values associated with key - * for the current context location. - */ - List getPropertyValue(String key); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java deleted file mode 100644 index 1727b2f39..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument; - -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl.StructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; - - -/** - * A factory for creating context resolvers that work with structured - * document contexts - * - * This factory may be used but not implemented or extended by clients. - * TODO: - * Note that getTextRegionResolver() will be moved to to an internal factory - * interface and should not be considered part of the provisional API - * - * @author cbateman - * - */ -public interface IStructuredDocumentContextResolverFactory -{ - - /** - * The global instance of the factory - */ - public static final IStructuredDocumentContextResolverFactory INSTANCE = StructuredDocumentContextResolverFactory.getInstance(); - - /** - * @param context - * @return a resolver capable of resolving information in context or null - * if one cannot be created. - */ - IDOMContextResolver getDOMContextResolver(IStructuredDocumentContext context); - - /** - * **Non-WTP Clients: this method should not be considered API** - * - * @param context - * @return a resolver capable of resolving information in the context or - * null if one cannot be created - */ - ITextRegionContextResolver getTextRegionResolver(IStructuredDocumentContext context); - - /** - * @param context - * @return a resolver capable of resolving information in the context or - * null if one cannot be created - */ - IWorkspaceContextResolver getWorkspaceContextResolver(IStructuredDocumentContext context); - - /** - * @param context - * @return a resolver capable of resolving information in the context - * or null one cannot be created - */ - ITaglibContextResolver getTaglibContextResolver(IStructuredDocumentContext context); - - /** - * @param context - * @return a resolver capable of resolving information in the context - * or null if one cannot be created - */ - IMetadataContextResolver getMetadataContextResolver(IStructuredDocumentContext context); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java deleted file mode 100644 index 34c4b6f6f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument; - -import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * Defines a context resolver that resolves tag library information - * for a particular context. - * - * This interface may be sub-classed or implemented by clients - * - * @author cbateman - * - */ -public interface ITaglibContextResolver extends IDocumentContextResolver -{ - /** - * @param node - * @return the URI corresponding to the taglib that defines the - * node in the context document or null if it cannot be found - */ - String getTagURIForNodeName(Node node); - - /** - * @param uri - * @return the tag prefix used in the context document for - * the provided uri or null if it cannot be found. - */ - String getTagPrefixForURI(String uri); - - /** - * A list all tags in the document context that are called - * tagName defined in the namespace indicated by uri - * - * @param uri - * @param tagName - * @return a (possibly empty) list of tags -- must never - * be null. Indicate none found with an empty list. - */ - NodeList getTagsByNamespaceURI(String uri, String tagName); - - /** - * @param node - * @return true if node has a tag library associated with it in this context - */ - public boolean hasTag(Node node); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java deleted file mode 100644 index 9a9f39994..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; - -/** - * A resolver to determine the current context within the Eclipse - * workspace. - * - * This interface may be sub-classed or implemented by clients - * - * @author cbateman - * - */ -public interface IWorkspaceContextResolver extends IDocumentContextResolver -{ - /** - * @return the project that contains the document context - * or null if it cannot be determined - */ - IProject getProject(); - - /** - * @return the resource that contains the document context - * or null if it cannot be determined. - * This should normally be an IFile. - */ - IResource getResource(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java deleted file mode 100644 index c344ac384..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal; - -import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; - -/** - * An additional factory interface for context resolvers. - * - * @author cbateman - * - */ -public interface IStructuredDocumentContextResolverFactory2 extends - IStructuredDocumentContextResolverFactory -{ - /** - * The global instance of the factory - */ - public static final IStructuredDocumentContextResolverFactory2 INSTANCE = - (IStructuredDocumentContextResolverFactory2) IStructuredDocumentContextResolverFactory.INSTANCE; - - /** - * Same as getTaglibContextResolver but checks delegate factory first. - * - * @param context - * @return a resolver capable of resolving information in the context - * or null one cannot be created - */ - ITaglibContextResolver getTaglibContextResolverFromDelegates(IStructuredDocumentContext context); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java deleted file mode 100644 index aca84351e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal; - -import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; - -/** - * Defines a resolver that can resolve context information in the - * structured document region context. - * - * Unless otherwise stated, the context region is the most specific - * region (leaf) in which the current context is contained. - * - * Note: this interface may use internal/provisional types. - * - * @author cbateman - * - */ -public interface ITextRegionContextResolver extends IDocumentContextResolver -{ - /** - * @return the text for the context region - */ - String getRegionText(); - - /** - * @return the document relative offset of the start of the region - * in which the context in is contained or -1 if the offset cannot be determined. - */ - int getStartOffset(); - - /** - * @return the document relative offset of the end of the region - * in which the context is contained or -1 if the offset cannot be determined - */ - int getEndOffset(); - - /** - * @return the length of the most specific region in which the context - * is contained or -1 if the length cannot be determined. - */ - int getLength(); - - /** - * @return the most specific TextRegion type for the current context - */ - String getRegionType(); - - /** - * @return the path to the most specific TextRegtion for the current context - * note that this does not include the actual region for the current region. - * That is returned by getRegionType(). - * - */ - String[] getRegionTypePath(); - - - /** - * The offset into the structured document will be set to be - * the start offset of the previous region - * - * @return a context for the previous sibling of this context's - * text region parent or null if no previous sibling exists - */ - IStructuredDocumentContext getPreviousContext(); - - /** - * The offset into the structured document will be set to be - * the start offset of the next region - * - * @return a context for the next sibling of this context's - * text region parent or null if no next sibling exists - */ - IStructuredDocumentContext getNextContext(); - - /** - * Relative path works backwards from the current context. So if the - * path to current context is /a/b/c/d/e then: - * - * matchesRelative({"e"}) == true - * matchesRelative({"d", "e"}) == true - * matchesRelative({"c", "d", "e"}) == true - * matchesRelative({"b", "c", "d", "e"}) == true - * matchesRelative({"a", "b", "c", "d", "e"}) == true - * - * because in every case the path matches working backward from the current - * context - * - * but - * - * matchesRelative({a}) == false because context/.. == e not a - * - * TODO: what does path = new String[0] mean? - * - * @param path - * @return true if the relative path matches the path to the current context - * working relative to the current context. - */ - boolean matchesRelative(String[] path); - - /** - * Absolute path works forward from the root of the document to the - * current context. So if the path to the current context is /a/b/c/d/e then: - * - * matchesAbsolute({"a", "b", "c", "d", "e"}) == true - * - * but - * - * matchesAbsolute({"b", "c", "d", "e"}) == true because starting from the root - * you cannot follow /b/c/d/e to the context. - * - * @param path - * @return true if the absolute path from the root of the document - * matches the current context - */ - boolean matchesAbsolute(String[] path); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java deleted file mode 100644 index fda4dbc56..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; - -/** - * Internal convenience class to simplify regularly repeated tasks - * @author cbateman - * - */ -public final class ResolverUtil -{ - /** - * This method will generally only work if the document is an - * IStructuredDocument. - * - * @param document - * @return the IFile corresponding to document or null if not applicable. - * - */ - public static IFile getFileForDocument(final IDocument document) - { - final IStructuredDocumentContext context = - IStructuredDocumentContextFactory.INSTANCE.getContext(document, - -1); - - if (context != null) - { - final IWorkspaceContextResolver wkResolver = - IStructuredDocumentContextResolverFactory.INSTANCE - .getWorkspaceContextResolver(context); - - if (wkResolver != null) - { - final IResource res = wkResolver.getResource(); - - if (res instanceof IFile) - { - return (IFile) res; - } - } - } - return null; - } - - private ResolverUtil() - { - // no instantiation - throw new UnsupportedOperationException(); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java deleted file mode 100644 index 76d75938c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import org.eclipse.jst.jsf.context.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -/** - * Resolves DOM-related information in the provided context - * - * @author cbateman - * - */ -class DOMContextResolver implements IDOMContextResolver -{ - private final IStructuredDocumentContext _context; - //private ITextRegionContextResolver _regionResolver; // null; lazy initialized if needed - - DOMContextResolver(IStructuredDocumentContext context) - { - _context = context; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver#getDOMDocument() - */ - public Document getDOMDocument() - { - return StructuredDocumentResolverUtil.getDOMDocument((IStructuredDocument)_context.getStructuredDocument()); - } - - public Node getNode() - { - IndexedRegion region = StructuredDocumentResolverUtil.getIndexedRegion((IStructuredDocument) _context.getStructuredDocument(), _context.getDocumentPosition()); - - if (region instanceof Node) - { - return (Node) region; - } - - return null; - } - - - public boolean canResolveContext(IModelContext modelContext) - { - return modelContext.getAdapter(IStructuredDocumentContext.class) != null; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java deleted file mode 100644 index 495589f86..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import java.util.Collections; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.common.metadata.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper; -import org.eclipse.jst.jsf.context.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * A default implementation of meta-data context resolver - * - * @author cbateman - * - */ -class MetadataContextResolver implements IMetadataContextResolver -{ - private final IStructuredDocumentContext _context; - - /** - * @param context - */ - public MetadataContextResolver(IStructuredDocumentContext context) - { - _context = context; - } - - public List getPropertyValue(final String key) - { - final DOMContextResolver domResolver = new DOMContextResolver(_context); - final WorkspaceContextResolver wsResolver = new WorkspaceContextResolver(_context); - final TaglibContextResolver tagResolver = - new TaglibContextResolver(_context); - - final Node curNode = domResolver.getNode(); - - if (curNode instanceof Attr) - { - final Attr attribute = (Attr) curNode; - final Element element = attribute.getOwnerElement(); - final String uri = tagResolver.getTagURIForNodeName(element); - final IProject project = wsResolver.getProject(); - - final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri); - Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName()+"/"+attribute.getLocalName(), key); //$NON-NLS-1$ - if( trait != null ) - { - return TraitValueHelper.getValueAsListOfStrings(trait); - } - - } - else if (curNode instanceof Element) - { - final Element element = (Element) curNode; - final String uri = tagResolver.getTagURIForNodeName(element); - final IProject project = wsResolver.getProject(); - - final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri); - Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName(), key); - if( trait != null ) - { - return TraitValueHelper.getValueAsListOfStrings(trait); - } - } - - return Collections.EMPTY_LIST; - } - - public boolean canResolveContext(IModelContext modelContext) { - return (modelContext.getAdapter(IStructuredDocumentContext.class) != null); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java deleted file mode 100644 index 2b0cf8ad3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java +++ /dev/null @@ -1,325 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.AbstractDelegatingFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.IStructuredDocumentContextResolverFactory2; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; - -/** - * Implements a factory for creating context resolvers for structured document - * contexts. - * - * @author cbateman - * - */ -public class StructuredDocumentContextResolverFactory extends -AbstractDelegatingFactory implements -IStructuredDocumentContextResolverFactory, IStructuredDocumentContextResolverFactory2 -{ - /* static attributes */ - private static StructuredDocumentContextResolverFactory INSTANCE; - - /** - * @return an instance (possibly shared) of the this factory - */ - public synchronized static StructuredDocumentContextResolverFactory getInstance() - { - if (INSTANCE == null) - { - INSTANCE = new StructuredDocumentContextResolverFactory(); - } - - return INSTANCE; - } - - /** - * Constructor - */ - protected StructuredDocumentContextResolverFactory() - { - super(new Class[] - { IStructuredDocumentContextResolverFactory.class }); - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getDOMContextResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext) - */ - public IDOMContextResolver getDOMContextResolver( - final IStructuredDocumentContext context) - { - IDOMContextResolver resolver = internalGetDOMResolver(context); - - if (resolver == null) - { - resolver = delegateGetDOMResolver(context); - } - - return resolver; - } - - private IDOMContextResolver internalGetDOMResolver( - final IStructuredDocumentContext context) - { - if (context.getStructuredDocument() instanceof IStructuredDocument) - { - return new DOMContextResolver(context); - } - - return null; - } - - private IDOMContextResolver delegateGetDOMResolver( - final IStructuredDocumentContext context) - { - synchronized (_delegates) - { - for (final IAdaptable adaptable : _delegates) - { - - final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) adaptable - .getAdapter(IStructuredDocumentContextResolverFactory.class); - - if (delegateFactory != null) - { - final IDOMContextResolver contextResolver = delegateFactory - .getDOMContextResolver(context); - - if (contextResolver != null) - { - return contextResolver; - } - } - } - - return null; - } - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getTextRegionResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext) - */ - public ITextRegionContextResolver getTextRegionResolver( - final IStructuredDocumentContext context) - { - ITextRegionContextResolver resolver = internalGetTextRegionResolver(context); - - if (resolver == null) - { - resolver = delegateGetTextRegionResolver(context); - } - - return resolver; - } - - private ITextRegionContextResolver internalGetTextRegionResolver( - final IStructuredDocumentContext context) - { - if (context.getStructuredDocument() instanceof IStructuredDocument) - { - return new TextRegionContextResolver(context); - } - - return null; - } - - private ITextRegionContextResolver delegateGetTextRegionResolver( - final IStructuredDocumentContext context) - { - synchronized (_delegates) - { - for (final Object element : _delegates) - { - final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element) - .getAdapter(IStructuredDocumentContextResolverFactory.class); - final ITextRegionContextResolver contextResolver = delegateFactory - .getTextRegionResolver(context); - - if (contextResolver != null) - { - return contextResolver; - } - } - - return null; - } - } - - public IWorkspaceContextResolver getWorkspaceContextResolver( - final IStructuredDocumentContext context) - { - IWorkspaceContextResolver resolver = internalGetWorkspaceContextResolver(context); - - if (resolver == null) - { - resolver = delegateGetWorkspaceContextResolver(context); - } - - return resolver; - - } - - private IWorkspaceContextResolver internalGetWorkspaceContextResolver( - final IStructuredDocumentContext context) - { - if (context.getStructuredDocument() instanceof IStructuredDocument) - { - return new WorkspaceContextResolver(context); - } - - return null; - } - - private IWorkspaceContextResolver delegateGetWorkspaceContextResolver( - final IStructuredDocumentContext context) - { - synchronized (_delegates) - { - for (final Object element : _delegates) - { - final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element) - .getAdapter(IStructuredDocumentContextResolverFactory.class); - final IWorkspaceContextResolver contextResolver = delegateFactory - .getWorkspaceContextResolver(context); - - if (contextResolver != null) - { - return contextResolver; - } - } - - return null; - } - } - - public ITaglibContextResolver getTaglibContextResolver( - final IStructuredDocumentContext context) - { - // check the delegats first - ITaglibContextResolver resolver = internalGetTaglibContextResolver(context); - - if (resolver == null) - { - resolver = delegateGetTaglibContextResolver(context); - } - - return resolver; - } - - public ITaglibContextResolver getTaglibContextResolverFromDelegates( - final IStructuredDocumentContext context) - { - // check the delegats first - ITaglibContextResolver resolver = delegateGetTaglibContextResolver(context); - - if (resolver == null) - { - resolver = internalGetTaglibContextResolver(context); - } - - return resolver; - } - - private ITaglibContextResolver internalGetTaglibContextResolver( - final IStructuredDocumentContext context) - { - if (context.getStructuredDocument() instanceof IStructuredDocument) - { - return new TaglibContextResolver(context); - } - - return null; - } - - private ITaglibContextResolver delegateGetTaglibContextResolver( - final IStructuredDocumentContext context) - { - synchronized (_delegates) - { - for (final IAdaptable adapter : _delegates) - { - final IStructuredDocumentContextResolverFactory delegateFactory = - (IStructuredDocumentContextResolverFactory) adapter - .getAdapter(IStructuredDocumentContextResolverFactory.class); - - if (delegateFactory != null) - { - final ITaglibContextResolver contextResolver = delegateFactory - .getTaglibContextResolver(context); - - if (contextResolver != null) - { - return contextResolver; - } - } - } - - return null; - } - } - - public IMetadataContextResolver getMetadataContextResolver( - final IStructuredDocumentContext context) - { - IMetadataContextResolver resolver = internalGetMetadataContextResolver(context); - - if (resolver == null) - { - resolver = delegateGetMetadataContextResolver(context); - } - - return resolver; - } - - private IMetadataContextResolver internalGetMetadataContextResolver( - final IStructuredDocumentContext context) - { - if (context.getStructuredDocument() instanceof IStructuredDocument) - { - return new MetadataContextResolver(context); - } - - return null; - } - - private IMetadataContextResolver delegateGetMetadataContextResolver( - final IStructuredDocumentContext context) - { - synchronized (_delegates) - { - for (final Object element : _delegates) - { - final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element) - .getAdapter(IStructuredDocumentContextResolverFactory.class); - final IMetadataContextResolver contextResolver = delegateFactory - .getMetadataContextResolver(context); - - if (contextResolver != null) - { - return contextResolver; - } - } - - return null; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java deleted file mode 100644 index 9a4a780ac..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - -/** - * @author cbateman - * - * Defines common utility methods for document resolvers - */ -final class StructuredDocumentResolverUtil -{ - static IDOMDocument getDOMDocument(IStructuredDocument document) - { - IStructuredModel model = getStructuredModel(document); - - try - { - if (model instanceof IDOMModel) - { - return ((IDOMModel)model).getDocument(); - } - } - finally - { - if (model != null) - { - model.releaseFromRead(); - } - } - - return null; - } - - static IndexedRegion getIndexedRegion(final IStructuredDocument document, final int documentOffset) - { - // C.B: most of this logic was copied from ContentAssistUtils.getNodeAt - // I chose to copy rather than just call that because ContentAssistUtils is - // internal - IStructuredModel model = getStructuredModel(document); - IndexedRegion region = null; - if (model != null) - { - try - { - int lastOffset = documentOffset; - region = model.getIndexedRegion(documentOffset); - while (region == null && lastOffset >= 0) { - lastOffset--; - region = model.getIndexedRegion(lastOffset); - } - - // now we assume we have an element. But our context may be - // on an attribute in that node, so we need to check - if (region instanceof IDOMElement) - { - IDOMElement domElement = (IDOMElement) region; - - NamedNodeMap attributes = domElement.getAttributes(); - - for (int i = 0; i < attributes.getLength(); i++) - { - Node attrNode = attributes.item(i); - - if (attrNode instanceof IDOMAttr) - { - IDOMAttr attr = (IDOMAttr) attrNode; - - if (documentOffset >= attr.getStartOffset() - && documentOffset < attr.getEndOffset()) - { - region = attr; - break; - } - } - } - } - } - finally - { - model.releaseFromRead(); - } - } - - return region; - } - - /** - * @param document - * @return a structured model or null if one cannot be opened for document. - * Note: the caller is responsible for releasing the instance of structured - * model that gets returned. - */ - private static IStructuredModel getStructuredModel(IStructuredDocument document) - { - IModelManager modelManager = StructuredModelManager.getModelManager(); - - if (modelManager != null) - { - return StructuredModelManager.getModelManager().getModelForRead(document); - } - - return null; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java deleted file mode 100644 index 16fb2fc9e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java +++ /dev/null @@ -1,162 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import java.util.Iterator; - -import org.eclipse.jst.jsf.common.internal.JSPUtil; -import org.eclipse.jst.jsf.context.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; -import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager; -import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.w3c.dom.Attr; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * TODO: this resolver only applies to structured documents that can have - * taglibs (I think only JSPs). Should we move a different package? - * Default taglib context resolver - * - * @author cbateman - * - */ -class TaglibContextResolver implements ITaglibContextResolver -{ - private final IStructuredDocumentContext _context; - - TaglibContextResolver(IStructuredDocumentContext context) - { - _context = context; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagPrefixForURI(java.lang.String) - */ - public String getTagPrefixForURI(String uri) - { - return null; - } - - public boolean hasTag(final Node node) - { - Node checkNode = node; - - if (node instanceof Attr) - { - checkNode = ((Attr)node).getOwnerElement(); - } - - return getTracker(checkNode) != null; - } - - private TaglibTracker getTracker(Node node) - { - final String prefix = node.getPrefix(); - - final TLDCMDocumentManager docMgr = - TaglibController.getTLDCMDocumentManager(_context.getStructuredDocument()); - - // if there's no prefix, there's no way to id the tag library - // TODO: is this always true? need to consult spec - // similar problem if couldn't load docMgr - if (prefix == null - || docMgr == null) - { - return null; - } - - for (final Iterator it = docMgr.getTaglibTrackers().iterator(); it.hasNext();) - { - final TaglibTracker tracker = (TaglibTracker) it.next(); - - if (prefix.equals(tracker.getPrefix())) - { - return tracker; - } - } - - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagURIForNodeName(org.w3c.dom.Node) - */ - public String getTagURIForNodeName(final Node node) - { - Node checkNode = node; - - if (node instanceof Attr) - { - checkNode = ((Attr)node).getOwnerElement(); - } - - final TaglibTracker tracker = getTracker(checkNode); - - if (tracker != null) - { - return tracker.getURI(); - } - - - return null; - } - - - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagsByNamespaceURI(java.lang.String, java.lang.String) - */ - public NodeList getTagsByNamespaceURI(String uri, String tagName) - { - //Document domDoc = new DOMContextResolver(_context).getDOMDocument(); - return null; - - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext) - */ - public boolean canResolveContext(IModelContext modelContext) - { - // must be a JSP page - Object adapter = modelContext.getAdapter(IStructuredDocumentContext.class); - - if (adapter instanceof IStructuredDocumentContext) - { - IStructuredDocumentContext context = - (IStructuredDocumentContext) adapter; - IStructuredModel smodel = null; - - try - { - smodel = StructuredModelManager.getModelManager().getModelForRead((IStructuredDocument)context.getStructuredDocument()); - return JSPUtil.isJSPContentType(smodel.getContentTypeIdentifier()); //$NON-NLS-1$ - } - finally - { - if (smodel != null) - { - smodel.releaseFromRead(); - } - } - } - - return false; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java deleted file mode 100644 index 9cf0f218b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java +++ /dev/null @@ -1,295 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jst.jsf.context.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; - -/*package*/ class TextRegionContextResolver implements ITextRegionContextResolver { - - private final IStructuredDocumentContext _context; - - /*package*/ TextRegionContextResolver(IStructuredDocumentContext context) - { - _context = context; - } - - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionText() - */ - public String getRegionText() - { - final ITextRegionCollection parent = getParentRegion(); - String text = null; - - if (parent != null) - { - ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - text = parent.getText(me); - } - - return text; - } - - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getEndOffset() - */ - public int getEndOffset() { - final ITextRegionCollection parent = getParentRegion(); - int endOffset = -1; - if (parent != null) - { - ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - endOffset = parent.getEndOffset(me); - } - - return endOffset; - } - - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getLength() - */ - public int getLength() { - final ITextRegionCollection parent = getParentRegion(); - int length = -1; - if (parent != null) - { - ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - length = me.getLength(); - } - - return length; - - } - - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getStartOffset() - */ - public int getStartOffset() - { - final ITextRegionCollection parent = getParentRegion(); - int startOffset = -1; - if (parent != null) - { - ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - startOffset = parent.getStartOffset(me); - } - - return startOffset; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionType() - */ - public String getRegionType() - { - final ITextRegionCollection parent = getParentRegion(); - String regionType = null; - - if (parent != null) - { - ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - - if (me != null) - { - regionType = me.getType(); - } - } - - return regionType; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionTypePath() - */ - public String[] getRegionTypePath() { - final ITextRegion[] path = createPathToContext(); - final String[] typePath = new String[path.length]; - - for (int i = 0; i < path.length; i++) - { - typePath[i] = path[i].getType(); - } - - return typePath; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getNextContext() - */ - public IStructuredDocumentContext getNextContext() - { - ITextRegionCollection parent = getParentRegion(); - IStructuredDocumentContext newContext = null; - - if (parent != null) - { - final ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - ITextRegionList regions = parent.getRegions(); - ITextRegion nextRegion = null; - for (final Iterator it = regions.iterator(); it.hasNext();) - { - if (it.next() == me - && it.hasNext()) - { - nextRegion = (ITextRegion) it.next(); - } - } - - if (nextRegion != null) - { - // use the first position offset in the next region - final int documentPosition = parent.getStartOffset(nextRegion); - newContext = - IStructuredDocumentContextFactory.INSTANCE.getContext(_context.getStructuredDocument(), documentPosition); - } - } - - return newContext; - } - - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getPreviousContext() - */ - public IStructuredDocumentContext getPreviousContext() - { - ITextRegionCollection parent = getParentRegion(); - IStructuredDocumentContext newContext = null; - - if (parent != null) - { - final ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition()); - ITextRegionList regions = parent.getRegions(); - final Iterator it = regions.iterator(); - ITextRegion prevRegion = null; - ITextRegion nextRegion = null; - - SEARCH_LOOP: while (it.hasNext()) - { - nextRegion = (ITextRegion) it.next(); - - if (nextRegion == me) - { - break SEARCH_LOOP; - } - - prevRegion = nextRegion; - } - - if (prevRegion != null) - { - // use the last position offset in the prev region - final int documentPosition = parent.getStartOffset(prevRegion); - newContext = - IStructuredDocumentContextFactory.INSTANCE.getContext(_context.getStructuredDocument(), documentPosition); - } - } - - return newContext; - } - - private ITextRegionCollection getParentRegion() - { - final ITextRegion[] path = createPathToContext(); - ITextRegionCollection parent = null; - - if (path.length > 0) - { - parent = (ITextRegionCollection) path[path.length-1]; - } - - return parent; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#matchesRelative(java.lang.String[]) - */ - public boolean matchesRelative(String[] path) { - final ITextRegion[] myPath = createPathToContext(); - return matchPath(myPath, path); - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#matchesAbsolute(java.lang.String[]) - */ - public boolean matchesAbsolute(String[] path) - { - final ITextRegion[] myPath = createPathToContext(); - // only works if myPath and path are the same length - return (myPath.length == path.length) - && matchPath(myPath, path); - } - - private boolean matchPath(ITextRegion[] myPath, String[] path) - { - boolean matches = false; - - // only makes sense if path is a containing subset of myPath - if (path.length <= myPath.length) - { - matches = true; - SEARCH_LOOP: - for (int i = 1; i <= path.length; i++) - { - if (!path[path.length-i].equals(myPath[myPath.length-i].getType())) - { - matches = false; - break SEARCH_LOOP; - } - } - } - - return matches; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext) - */ - public boolean canResolveContext(IModelContext modelContext) - { - return (modelContext.getAdapter(IStructuredDocumentContext.class) != null); - } - - private ITextRegion[] createPathToContext() - { - final List regionPath = new ArrayList(); - - final IStructuredDocument doc = (IStructuredDocument) _context.getStructuredDocument(); - - ITextRegion container = doc.getRegionAtCharacterOffset(_context.getDocumentPosition()); - - while(container != null - && container instanceof ITextRegionCollection) - { - regionPath.add(container); - container = ((ITextRegionCollection)container).getRegionAtCharacterOffset(_context.getDocumentPosition()); - } - - return (ITextRegion[]) regionPath.toArray(new ITextRegion[0]); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java deleted file mode 100644 index cb6363065..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java +++ /dev/null @@ -1,135 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jst.jsf.context.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; - -/** - * - * @author cbateman - * - */ -/*package*/ class WorkspaceContextResolver implements IWorkspaceContextResolver -{ - private final IStructuredDocumentContext _context; - - /*package*/WorkspaceContextResolver(IStructuredDocumentContext context) - { - _context = context; - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver#getProject() - */ - public IProject getProject() - { - // copied from ModelManagerImpl (with some rework by C.B.) - final String path = getPath(); - - if (path == null) - { - return null; - } - - // TOODO needs rework for linked resources - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IPath iPath = new Path(path); - if (iPath.isAbsolute()) - { - String projectName = iPath.segment(0); - - IProject projects[] = root.getProjects(); - - for (int i = 0; i < projects.length; i++) - { - IProject project = projects[i]; - - if (project.isOpen() - && projectName.equals(project.getFullPath().segment(0))) - { - return project; // - } - } - } - - return null; - } - - public IResource getResource() - { - IProject project = getProject(); - - if (project != null) - { - final String path = getPath(); - - if (path != null) - { - final IPath iPath = new Path(path); - if (iPath.isAbsolute()) - { - return project.getFile(iPath.removeFirstSegments(1)); - } - } - } - return null; - } - - private String getPath() - { - IStructuredModel model = null; - - try - { - model = StructuredModelManager.getModelManager().getExistingModelForRead(_context.getStructuredDocument()); - - if (model == null) - return null; - String path = model.getBaseLocation(); - if (path == null || path.length() == 0) - { - Object id = model.getId(); - if (id == null) - return null; - path = id.toString(); - } - - return path; - } - finally - { - if (model != null) - { - model.releaseFromRead(); - } - } - } - - /** - * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext) - */ - public boolean canResolveContext(IModelContext modelContext) - { - return (modelContext.getAdapter(IStructuredDocumentContext.class) != null); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java deleted file mode 100644 index 538982108..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Context resolvers for contexts based on SSE structured documents. - */ -package org.eclipse.jst.jsf.context.resolver.structureddocument; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java deleted file mode 100644 index b431d485f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.structureddocument; - -import org.eclipse.jst.jsf.context.AbstractDocumentContext; - -/** - * A convenience abstract super-class for context implementing - * the IStructuredDocumentContext interface - * - * Class may be sub-classed by clients - * - * @author cbateman - * - */ -public abstract class AbstractStructuredDocumentContext extends AbstractDocumentContext - implements IStructuredDocumentContext -{ - /** - * @see org.eclipse.jst.jsf.context.AbstractDocumentContext#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapterClass) - { - if (adapterClass.equals(IStructuredDocumentContext.class)) - { - return this; - } - - return super.getAdapter(adapterClass); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java deleted file mode 100644 index 054fc71db..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.structureddocument; - -import org.eclipse.jst.jsf.context.AbstractDelegatingFactory; - -/** - * Abstract implementation of IStructuredDocumentContextFactory that must be used - * by all implementers of new factories for document contexts. - * - * @author cbateman - * - */ -public abstract class AbstractStructuredDocumentContextFactory extends AbstractDelegatingFactory { - - /** - * @param supportedDelegateTypes - */ - protected AbstractStructuredDocumentContextFactory(Class[] supportedDelegateTypes) - { - super(supportedDelegateTypes); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java deleted file mode 100644 index 2cf532885..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.structureddocument; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jst.jsf.context.IDocumentContext; - -/** - * Encapsulates runtime context in an SSE IStructuredDocument - * @author cbateman - * - * Interface must NOT be implemented by clients. - * Implementers should sub-class AbstractStructuredDocumentContext - * - */ -public interface IStructuredDocumentContext extends IDocumentContext -{ - /** - * @return the text viewer whose context we are in - */ - IDocument getStructuredDocument(); - /** - * @return the document position within the text viewer's context - * where we are. - */ - int getDocumentPosition(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java deleted file mode 100644 index d9412dcc5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.structureddocument; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jst.jsf.context.structureddocument.internal.impl.StructuredDocumentContextFactory; -import org.w3c.dom.Node; - - -/** - * A factory method for constructing context objects related to - * SSE structured documents. - * - * May be sub-classed or implemented by clients - * - * @author cbateman - * - */ -public interface IStructuredDocumentContextFactory -{ - /** - * The default singleton instance of the factory - */ - public static final IStructuredDocumentContextFactory INSTANCE = - StructuredDocumentContextFactory.getInstance(); - - /** - * - * @param textViewer -- the text viewer where the context exists - * @param documentPosition -- the absolute position of the context relative to textViewer - * @return a context for a given text viewer and document position within the - * document model of that text viewer or null if one cannot be determined. - */ - IStructuredDocumentContext getContext(ITextViewer textViewer, int documentPosition); - - /** - * @param document -- the document - * @param documentPosition -- the absolute position of the context relative to the document - * @return a context for the document model or null if one cannot be determined - */ - IStructuredDocumentContext getContext(IDocument document, int documentPosition); - - /** - * @param document -- the document model - * @param node -- the DOM node within the document - * @return a context for the document model and dom node or null if one cannot - * be determined - */ - IStructuredDocumentContext getContext(IDocument document, Node node); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java deleted file mode 100644 index 6e777419d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.structureddocument; - -import org.eclipse.jst.jsf.context.structureddocument.internal.impl.StructuredDocumentContextFactory; -import org.w3c.dom.Element; - -/** - * A factory method for constructing context objects related to - * SSE structured documents. - * - * May be sub-classed or implemented by clients - * - */ -public interface IStructuredDocumentContextFactory2 extends - IStructuredDocumentContextFactory { - - /** - * The default singleton instance of the factory - */ - public static final IStructuredDocumentContextFactory2 INSTANCE = - StructuredDocumentContextFactory.getInstance(); - - /** - * @param element -- org.w3c.Element - * @return a context for the element or if null if one cannot be determined. - */ - IStructuredDocumentContext getContext(Element element); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java deleted file mode 100644 index f4526e78c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.structureddocument.internal.impl; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jst.jsf.context.structureddocument.AbstractStructuredDocumentContext; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; - -/*package*/ class DefaultStructuredDocumentContext extends AbstractStructuredDocumentContext -{ - private final IStructuredDocument _structuredDocument; - private final int _documentPosition; - - /*package*/ DefaultStructuredDocumentContext(IStructuredDocument structuredDocument, int documentPosition) - { - _structuredDocument = structuredDocument; - _documentPosition = documentPosition; - } - - public int getDocumentPosition() - { - return _documentPosition; - } - - public IDocument getStructuredDocument() - { - return _structuredDocument; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java deleted file mode 100644 index 89f24f622..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java +++ /dev/null @@ -1,270 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.structureddocument.internal.impl; - -import java.util.Iterator; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jst.jsf.context.structureddocument.AbstractStructuredDocumentContextFactory; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; -import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * @author cbateman - * - */ -public class StructuredDocumentContextFactory extends AbstractStructuredDocumentContextFactory - implements IStructuredDocumentContextFactory, IStructuredDocumentContextFactory2 -{ - /* static attributes */ - private static StructuredDocumentContextFactory INSTANCE; - - /** - * @param supportedDelegateTypes - */ - public StructuredDocumentContextFactory(Class[] supportedDelegateTypes) - { - super(supportedDelegateTypes); - } - - /** - * @return an instance (possibly shared) of the this factory - */ - public synchronized static StructuredDocumentContextFactory getInstance() - { - if (INSTANCE == null) - { - INSTANCE = new StructuredDocumentContextFactory(); - } - - return INSTANCE; - } - - - /** - * Construct the factory - */ - protected StructuredDocumentContextFactory() - { - super(new Class[] {IStructuredDocumentContextFactory.class}); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.ITextViewer, int) - */ - public final IStructuredDocumentContext getContext(ITextViewer textViewer, int documentPosition) - { - // first see if I know how to make one - IStructuredDocumentContext context = internalGetContext(textViewer, documentPosition); - - // if I don't know, ask my delegates - if (context == null) - { - context = delegateGetContext(textViewer, documentPosition); - } - - return context; - } - - private IStructuredDocumentContext internalGetContext(ITextViewer textViewer, int documentPosition) - { - if (textViewer instanceof StructuredTextViewer) - { - IDocument document = ((StructuredTextViewer)textViewer).getDocument(); - return internalGetContext(document, documentPosition); - } - - return null; - } - - private IStructuredDocumentContext internalGetContext(IDocument document, int documentPosition) - { - if (document instanceof IStructuredDocument) - { - return new DefaultStructuredDocumentContext((IStructuredDocument)document, documentPosition); - } - - return null; - } - - private IStructuredDocumentContext delegateGetContext(ITextViewer textViewer, int documentPosition) - { - synchronized(_delegates) - { - for (final Iterator it = _delegates.iterator(); it.hasNext();) - { - IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class); - IStructuredDocumentContext context = delegateFactory.getContext(textViewer, documentPosition); - - if (context != null) - { - return context; - } - } - - return null; - } - } - - /** - * @see org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.IDocument, int) - */ - public IStructuredDocumentContext getContext(IDocument document, int documentPosition) { - // first see if I know how to make one - IStructuredDocumentContext context = internalGetContext(document, documentPosition); - - // if I don't know, ask my delegates - if (context == null) - { - context = delegateGetContext(document, documentPosition); - } - - return context; - } - - private IStructuredDocumentContext delegateGetContext(IDocument document, int documentPosition) - { - synchronized(_delegates) - { - for (final Iterator it = _delegates.iterator(); it.hasNext();) - { - IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class); - IStructuredDocumentContext context = delegateFactory.getContext(document, documentPosition); - - if (context != null) - { - return context; - } - } - - return null; - } - } - - public IStructuredDocumentContext getContext(IDocument document, Node node) - { - // first see if I know how to make one - IStructuredDocumentContext context = internalGetContext(document, node); - - // if I don't know, ask my delegates - if (context == null) - { - context = delegateGetContext(document, node); - } - - return context; - - } - - - - private IStructuredDocumentContext internalGetContext(IDocument document, Node node) - { - if (document instanceof IStructuredDocument) - { - final IStructuredDocument sDoc = (IStructuredDocument) document; - if (node instanceof IndexedRegion) - { - final int position = ((IndexedRegion)node).getStartOffset(); - return new DefaultStructuredDocumentContext(sDoc, position); - } - else if (node instanceof IDOMAttr) - { - IDOMAttr attr = (IDOMAttr) node; - final int position = attr.getValueRegionStartOffset(); - return new DefaultStructuredDocumentContext(sDoc, position); - } - } - - return null; - } - - private IStructuredDocumentContext delegateGetContext(IDocument document, Node node) - { - synchronized(_delegates) - { - for (final Iterator it = _delegates.iterator(); it.hasNext();) - { - IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class); - IStructuredDocumentContext context = delegateFactory.getContext(document, node); - - if (context != null) - { - return context; - } - } - - return null; - } - } - - public IStructuredDocumentContext getContext(Element element) - { - // first see if I know how to make one - IStructuredDocumentContext context = internalGetContext(element); - - // if I don't know, ask my delegates - if (context == null) - { - context = delegateGetContext(element); - } - - return context; - - } - - private IStructuredDocumentContext internalGetContext(Element element) { - if (element instanceof IDOMNode){ - final IDOMNode node = (IDOMNode)element; - final IStructuredDocument sDoc = node.getStructuredDocument(); - final int position = node.getStartOffset(); - - return new DefaultStructuredDocumentContext(sDoc, position); - } - - return null; - } - - private IStructuredDocumentContext delegateGetContext(Element element) { - synchronized(_delegates) - { - for (final Iterator it = _delegates.iterator(); it.hasNext();) - { - IStructuredDocumentContextFactory2 delegateFactory = (IStructuredDocumentContextFactory2) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory2.class); - if (delegateFactory != null) - { - IStructuredDocumentContext context = delegateFactory.getContext(element); - - if (context != null) - { - return context; - } - } - } - - return null; - } - } - - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java deleted file mode 100644 index cc515346f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Model context for SSE structured documents. - */ -package org.eclipse.jst.jsf.context.structureddocument; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java deleted file mode 100644 index 902e20d89..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java +++ /dev/null @@ -1,236 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import org.eclipse.emf.common.util.AbstractEnumerator; - -/** - * <!-- begin-user-doc --> - * Enumerates the possible sources of an instance symbol - * at runtime. In the default implementation these can - * be: from the built-in variables, from the managed bean - * facility, and those defined in tags. This information - * is provided to allow the VariableResolver to resolve - * conflicts when instance symbols come from more than one - * source. - * - * <p><b>Provisional API - subject to change</b></p> - * - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getERuntimeSource() - * @model - * @generated - */ -public final class ERuntimeSource extends AbstractEnumerator { - /** - * @generated NOT - */ - private static final long serialVersionUID = 1L; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The '<em><b>BUILT IN SYMBOL</b></em>' literal value. - * <!-- begin-user-doc --> - * <p> - * If the meaning of '<em><b>BUILT IN SYMBOL</b></em>' literal object isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @see #BUILT_IN_SYMBOL_LITERAL - * @model - * @generated - * @ordered - */ - public static final int BUILT_IN_SYMBOL = 0; - - /** - * The '<em><b>MANAGED BEAN SYMBOL</b></em>' literal value. - * <!-- begin-user-doc --> - * <p> - * If the meaning of '<em><b>MANAGED BEAN SYMBOL</b></em>' literal object isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @see #MANAGED_BEAN_SYMBOL_LITERAL - * @model - * @generated - * @ordered - */ - public static final int MANAGED_BEAN_SYMBOL = 1; - - /** - * The '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal value. - * <!-- begin-user-doc --> - * <p> - * If the meaning of '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal object isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @see #TAG_INSTANTIATED_SYMBOL_LITERAL - * @model - * @generated - * @ordered - */ - public static final int TAG_INSTANTIATED_SYMBOL = 2; - - /** - * The '<em><b>OTHER</b></em>' literal value. - * <!-- begin-user-doc --> - * <p> - * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @see #OTHER_LITERAL - * @model - * @generated - * @ordered - */ - public static final int OTHER = 3; - - /** - * The '<em><b>BUILT IN SYMBOL</b></em>' literal object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #BUILT_IN_SYMBOL - * @generated - * @ordered - */ - public static final ERuntimeSource BUILT_IN_SYMBOL_LITERAL = new ERuntimeSource(BUILT_IN_SYMBOL, "BUILT_IN_SYMBOL", "BUILT_IN_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$ - - /** - * The '<em><b>MANAGED BEAN SYMBOL</b></em>' literal object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #MANAGED_BEAN_SYMBOL - * @generated - * @ordered - */ - public static final ERuntimeSource MANAGED_BEAN_SYMBOL_LITERAL = new ERuntimeSource(MANAGED_BEAN_SYMBOL, "MANAGED_BEAN_SYMBOL", "MANAGED_BEAN_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$ - - /** - * The '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #TAG_INSTANTIATED_SYMBOL - * @generated - * @ordered - */ - public static final ERuntimeSource TAG_INSTANTIATED_SYMBOL_LITERAL = new ERuntimeSource(TAG_INSTANTIATED_SYMBOL, "TAG_INSTANTIATED_SYMBOL", "TAG_INSTANTIATED_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$ - - /** - * The '<em><b>OTHER</b></em>' literal object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #OTHER - * @generated - * @ordered - */ - public static final ERuntimeSource OTHER_LITERAL = new ERuntimeSource(OTHER, "OTHER", "OTHER"); //$NON-NLS-1$ //$NON-NLS-2$ - - /** - * An array of all the '<em><b>ERuntime Source</b></em>' enumerators. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static final ERuntimeSource[] VALUES_ARRAY = - new ERuntimeSource[] { - BUILT_IN_SYMBOL_LITERAL, - MANAGED_BEAN_SYMBOL_LITERAL, - TAG_INSTANTIATED_SYMBOL_LITERAL, - OTHER_LITERAL, - }; - - /** - * A public read-only list of all the '<em><b>ERuntime Source</b></em>' enumerators. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); - - /** - * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified literal value. - * <!-- begin-user-doc --> - * @param literal - * @return the enumeration for a string literal representation - * <!-- end-user-doc --> - * @generated - */ - public static ERuntimeSource get(String literal) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - ERuntimeSource result = VALUES_ARRAY[i]; - if (result.toString().equals(literal)) { - return result; - } - } - return null; - } - - /** - * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified name. - * <!-- begin-user-doc --> - * @param name - * @return the enumeration for the name of the literal value - * <!-- end-user-doc --> - * @generated - */ - public static ERuntimeSource getByName(String name) { - for (int i = 0; i < VALUES_ARRAY.length; ++i) { - ERuntimeSource result = VALUES_ARRAY[i]; - if (result.getName().equals(name)) { - return result; - } - } - return null; - } - - /** - * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified integer value. - * <!-- begin-user-doc --> - * @param value - * @return the enumeration for it's integral value - * <!-- end-user-doc --> - * @generated - */ - public static ERuntimeSource get(int value) { - switch (value) { - case BUILT_IN_SYMBOL: return BUILT_IN_SYMBOL_LITERAL; - case MANAGED_BEAN_SYMBOL: return MANAGED_BEAN_SYMBOL_LITERAL; - case TAG_INSTANTIATED_SYMBOL: return TAG_INSTANTIATED_SYMBOL_LITERAL; - case OTHER: return OTHER_LITERAL; - } - return null; - } - - /** - * Only this class can construct instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private ERuntimeSource(int value, String name, String literal) { - super(value, name, literal); - } - -} //ERuntimeSource diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java deleted file mode 100644 index a1ddd3635..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java +++ /dev/null @@ -1,88 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.common.util.EList; - -/** - * <!-- begin-user-doc --> - * An instance of a java bean - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * @author cbateman - * @model - */ -public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail { - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Properties</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Properties</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Properties() - * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" changeable="false" volatile="true" - * @generated - */ - EList getProperties(); - - /** - * Returns the value of the '<em><b>Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Methods</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Methods</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Methods() - * @model type="org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol" changeable="false" volatile="true" - * @generated - */ - EList getMethods(); - - /** - * <!-- begin-user-doc --> - * This is a convenience method equivalent to to (IJavaTypeDescriptor2) getTypeDescriptor - * @return the type descriptor cast to a java descriptor - * <!-- end-user-doc --> - * @model kind="operation" - * @generated - */ - IJavaTypeDescriptor2 getJavaTypeDescriptor(); - - /** - * <!-- begin-user-doc --> - * Convenience method equivalent to setTypeDescriptor((IJavaTypeDescriptor2) typeDesc)s - * @param newTypeDescriptor - * <!-- end-user-doc --> - * @model - * @generated - */ - void setJavaTypeDescriptor(IJavaTypeDescriptor2 newTypeDescriptor); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java deleted file mode 100644 index 271a93613..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IBean Method Symbol</b></em>'. - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanMethodSymbol() - * @model - * @generated - */ -public interface IBeanMethodSymbol extends IDescribedInDetail, IMethodSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Owner</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Owner</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Owner</em>' reference. - * @see #setOwner(IJavaTypeDescriptor2) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanMethodSymbol_Owner() - * @model - * @generated - */ - IJavaTypeDescriptor2 getOwner(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Owner</em>' reference. - * @see #getOwner() - * @generated - */ - void setOwner(IJavaTypeDescriptor2 value); - -} // IBeanMethodSymbol diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java deleted file mode 100644 index 3fb6f880a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -/** - * - * <!-- begin-user-doc --> - * A property of a bean - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * @author cbateman - * @model - */ -public interface IBeanPropertySymbol extends IPropertySymbol, IDescribedInDetail { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * @return the bean that owns this property - * @model - */ - IJavaTypeDescriptor2 getOwner(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Owner</em>' reference. - * @see #getOwner() - * @generated - */ - void setOwner(IJavaTypeDescriptor2 value); - - /** - * @return true if the bean has getter for this property - * @model - */ - boolean isReadable(); - - /** - * @return true if the bean has a setter fot this property - * @model - */ - boolean isWritable(); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java deleted file mode 100644 index 7340267cf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IBounded Java Type Descriptor</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedJavaTypeDescriptor() - * @model - * @generated - */ -public interface IBoundedJavaTypeDescriptor extends IJavaTypeDescriptor2, IBoundedTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - -} // IBoundedJavaTypeDescriptor
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java deleted file mode 100644 index ebd153cfe..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IBounded List Type Descriptor</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedListTypeDescriptor() - * @model - * @generated - */ -public interface IBoundedListTypeDescriptor extends IListTypeDescriptor, IBoundedTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - -} // IBoundedListTypeDescriptor diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java deleted file mode 100644 index f54c12ecb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * Describes a IMapTypeDescriptor for which the possible keyed values are - * unbounded for some set of possible value types. For example, a managed - * bean that implements Map, is unconstrained for all values in Java 1.4 and - * for whatever the template value type is in Java5. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedMapTypeDescriptor() - * @model - * @generated - */ -public interface IBoundedMapTypeDescriptor extends IMapTypeDescriptor, IBoundedTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - -} // IBoundedMapTypeDescriptor
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java deleted file mode 100644 index ea92d5a61..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IBounded Type Descriptor</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedTypeDescriptor() - * @model interface="true" abstract="true" - * @generated - */ -public interface IBoundedTypeDescriptor extends ITypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * <!-- begin-user-doc --> - * @param typeSignature - * @return true if this type can have unbounded property key for the - * indicated type. For example, a Java 1.4 Map could potentially have - * a value of any time for a particular key, so this method would always return - * true. However a Java5 Map<String, String> would only return true if - * typeSignature is-a String. - * <!-- end-user-doc --> - * @model - * @generated - */ - boolean isUnboundedForType(String typeSignature); - - /** - * <!-- begin-user-doc --> - * @param name - * @param typeSignature - * @return a symbol corresponding to the property of this type desc - * with name called 'name' of type 'typeSignature'. Must return null if - * isPropNameUnconstrainedForType returns false for 'typeSignature'. - * Generally should return something meaningful (even if just an - * object) when isPropNameUnconstrainedForType returns true. - * <!-- end-user-doc --> - * @model - * @generated - */ - ISymbol getUnboundedProperty(Object name, String typeSignature); - -} // IBoundedTypeDescriptor
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java deleted file mode 100644 index 7cad1c9c8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IComponent Symbol</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIComponentSymbol() - * @model - * @generated - */ -public interface IComponentSymbol extends IInstanceSymbol, IDescribedInDetail { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - -} // IComponentSymbol diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java deleted file mode 100644 index 9fb281870..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - - -/** - * Tags a symbol that has a detailed, user-readable description - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface IDescribedInDetail { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc -->s - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * @return the detailed description - * @model - */ - String getDetailedDescription(); - - /** - * @param detailedDescription - * @model - */ - void setDetailedDescription(String detailedDescription); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java deleted file mode 100644 index d1e883dea..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -/** - * <!-- begin-user-doc --> - * A symbol that represents an instance of something, typically - * a variable. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @author cbateman - * @model - */ -public interface IInstanceSymbol extends IObjectSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * @return the type descriptor for this instance - * @model - */ - ITypeDescriptor getTypeDescriptor(); - /** - * Returns the value of the '<em><b>Type Resolved</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type Resolved</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type Resolved</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIInstanceSymbol_TypeResolved() - * @model changeable="false" volatile="true" - * @generated - */ - boolean isTypeResolved(); - - /** - * Returns the value of the '<em><b>Runtime Source</b></em>' attribute. - * The default value is <code>"TAG_INSTANTIATED_SYMBOL"</code>. - * The literals are from the enumeration {@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Runtime Source</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Runtime Source</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource - * @see #setRuntimeSource(ERuntimeSource) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIInstanceSymbol_RuntimeSource() - * @model default="TAG_INSTANTIATED_SYMBOL" - * @generated - */ - ERuntimeSource getRuntimeSource(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Runtime Source</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource - * @see #getRuntimeSource() - * @generated - */ - void setRuntimeSource(ERuntimeSource value); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java deleted file mode 100644 index fa167ada8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.jdt.core.IJavaElement; - -/** - * <!-- begin-user-doc --> - * Represents a symbol that has meaning within Java's context. This may - * be the name of a type, an instance, method etc. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @author cbateman - * @model - */ -public interface IJavaSymbol extends ISymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * A IJavaElement may not exist for a symbol if it is synthetic at - * design time but will be bound to a Java symbol at runtime. An - * example is a managed bean instance in JSF. JDT can provide no - * design-time meta-data for the symbol because it won't have - * a Java representation until the containing JSP is compiled. - * - * @return JDT's java element for this symbol or null if one doesn't - * exist. - * @model - */ - IJavaElement getJavaElement(); - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Java Element</em>' attribute. - * @see #getJavaElement() - * @generated - */ - void setJavaElement(IJavaElement value); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java deleted file mode 100644 index 191928973..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java +++ /dev/null @@ -1,144 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IType; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IJava Type Descriptor2</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2() - * @model - * @generated - */ -public interface IJavaTypeDescriptor2 extends ITypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type</em>' attribute. - * @see #setType(IType) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_Type() - * @model dataType="org.eclipse.jst.jsf.context.symbol.IType" - * @generated - */ - IType getType(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Type</em>' attribute. - * @see #getType() - * @generated - */ - void setType(IType value); - - /** - * Returns the value of the '<em><b>Bean Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Bean Properties</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Bean Properties</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanProperties() - * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true" - * @generated - */ - EList getBeanProperties(); - - /** - * Returns the value of the '<em><b>Bean Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Bean Methods</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Bean Methods</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanMethods() - * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true" - * @generated - */ - EList getBeanMethods(); - - /** - * Returns the value of the '<em><b>Array Count</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Array Count</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Array Count</em>' attribute. - * @see #setArrayCount(int) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_ArrayCount() - * @model - * @generated - */ - int getArrayCount(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}' attribute. - * <!-- begin-user-doc --> - * records the array nesting of the type. IType doesn't encapsulate - * array types. So if this type is an array then type will represent - * the base element and this value will be > 0. If not an array, then - * _arrayCount is always 0. - * <!-- end-user-doc --> - * @param value the new value of the '<em>Array Count</em>' attribute. - * @see #getArrayCount() - * @generated - */ - void setArrayCount(int value); - - /** - * <!-- begin-user-doc --> - * @param resolvedTypeSignature - * @return the resolved type or null. - * <!-- end-user-doc --> - * @model dataType="org.eclipse.jst.jsf.context.symbol.IType" - * @generated - */ - IType resolveType(String resolvedTypeSignature); - -} // IJavaTypeDescriptor2 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java deleted file mode 100644 index c4b458666..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.common.util.EList; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IList Type Descriptor</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIListTypeDescriptor() - * @model - * @generated - */ -public interface IListTypeDescriptor extends ITypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>List Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>List Source</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>List Source</em>' attribute. - * @see #setListSource(EList) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIListTypeDescriptor_ListSource() - * @model many="false" - * @generated - */ - EList getListSource(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>List Source</em>' attribute. - * @see #getListSource() - * @generated - */ - void setListSource(EList value); - -} // IListTypeDescriptor diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java deleted file mode 100644 index d991b7212..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java +++ /dev/null @@ -1,96 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - -import java.util.Map; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IMap Type Descriptor</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor() - * @model - * @generated - */ -public interface IMapTypeDescriptor extends ITypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Map Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Map Source</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Map Source</em>' attribute. - * @see #setMapSource(Map) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor_MapSource() - * @model - * @generated - */ - Map getMapSource(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Map Source</em>' attribute. - * @see #getMapSource() - * @generated - */ - void setMapSource(Map value); - - /** - * Returns the value of the '<em><b>Immutable</b></em>' attribute. - * The default value is <code>"true"</code>. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Immutable</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Immutable</em>' attribute. - * @see #setImmutable(boolean) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor_Immutable() - * @model default="true" - * @generated - */ - boolean isImmutable(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Immutable</em>' attribute. - * @see #isImmutable() - * @generated - */ - void setImmutable(boolean value); - -} // IMapTypeDescriptor diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java deleted file mode 100644 index 45ee82cee..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IMethod Symbol</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMethodSymbol() - * @model - * @generated - */ -public interface IMethodSymbol extends ISymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Signature</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Signature</em>' attribute. - * @see #setSignature(String) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMethodSymbol_Signature() - * @model - * @generated - */ - String getSignature(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Signature</em>' attribute. - * @see #getSignature() - * @generated - */ - void setSignature(String value); - -} // IMethodSymbol diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java deleted file mode 100644 index 34fee432e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.common.util.EList; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IObject Symbol</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol() - * @model interface="true" abstract="true" - * @generated - */ -public interface IObjectSymbol extends ISymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type Descriptor</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type Descriptor</em>' reference. - * @see #setTypeDescriptor(ITypeDescriptor) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_TypeDescriptor() - * @model - * @generated - */ - ITypeDescriptor getTypeDescriptor(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Type Descriptor</em>' reference. - * @see #getTypeDescriptor() - * @generated - */ - void setTypeDescriptor(ITypeDescriptor value); - - /** - * Returns the value of the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Readable</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Readable</em>' attribute. - * @see #setReadable(boolean) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_Readable() - * @model - * @generated - */ - boolean isReadable(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Readable</em>' attribute. - * @see #isReadable() - * @generated - */ - void setReadable(boolean value); - - /** - * Returns the value of the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Writable</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Writable</em>' attribute. - * @see #setWritable(boolean) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_Writable() - * @model - * @generated - */ - boolean isWritable(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Writable</em>' attribute. - * @see #isWritable() - * @generated - */ - void setWritable(boolean value); - - /** - * <!-- begin-user-doc --> - * @param typeSignature - * @return true if this object can be coerced (is an instanceof) the type - * specified in the fully qualified typeSignature - * <!-- end-user-doc --> - * @model - * @generated - */ - boolean supportsCoercion(String typeSignature); - - /** - * <!-- begin-user-doc --> - * @param typeSignature - * @return a type descriptor supporting a class cast of this object to - * the request typeSignature, or null if such a cast is not supported. - * Returns non-null iff supportsCoercion(typeSignature) == false - * <!-- end-user-doc --> - * @model - * @generated - */ - ITypeDescriptor coerce(String typeSignature); - - /** - * <!-- begin-user-doc --> - * @param methodName - * @param methodArguments - * @param symbolName - * @return a symbol resulting from calling the call or null if can't be determined. - * Generally, the symbolName should be used for the getName() value of the returned - * symbol, although implementers are not bound to this if a more meaningful value - * can be calculated. - * <!-- end-user-doc --> - * @model methodArgumentsType="org.eclipse.jst.jsf.common.internal.types.ValueType" methodArgumentsDataType="org.eclipse.jst.jsf.context.symbol.ValueType" methodArgumentsMany="true" - * @generated - */ - ISymbol call(String methodName, EList methodArguments, String symbolName); - -} // IObjectSymbol diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java deleted file mode 100644 index ea757eed5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>IProperty Symbol</b></em>'. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIPropertySymbol() - * @model - * @generated - */ -public interface IPropertySymbol extends IObjectSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Intermediate</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Intermediate</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Intermediate</em>' attribute. - * @see #setIntermediate(boolean) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIPropertySymbol_Intermediate() - * @model - * @generated - */ - boolean isIntermediate(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Intermediate</em>' attribute. - * @see #isIntermediate() - * @generated - */ - void setIntermediate(boolean value); - -} // IPropertySymbol diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java deleted file mode 100644 index 20a56c437..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * An entity that represents a meaningful named value in some context. - * Typically these represent programming language variables, properties and methods. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @author cbateman - * @model - */ -public interface ISymbol extends EObject { - /** - * Singleton for an empty array of ISymbols - */ - final ISymbol[] EMPTY_SYMBOL_ARRAY = new ISymbol[0]; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * @return the symbol's name - * @model - */ - String getName(); - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Name</em>' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java deleted file mode 100644 index 4be180ff8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java +++ /dev/null @@ -1,264 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IType; - -/** - * <!-- begin-user-doc --> - * A generic descriptor for symbol information - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @author cbateman - * @model - */ -public interface ITypeDescriptor extends EObject { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Returns the value of the '<em><b>Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Properties</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Properties</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Properties() - * @model type="org.eclipse.jst.jsf.context.symbol.IPropertySymbol" volatile="true" - * @generated - */ - EList getProperties(); - - /** - * Returns the value of the '<em><b>Type Signature</b></em>' attribute. - * The default value is <code>""</code>. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type Signature</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type Signature</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeSignature() - * @model default="" changeable="false" volatile="true" - * @generated - */ - String getTypeSignature(); - - /** - * Returns the value of the '<em><b>Super Type Signatures</b></em>' attribute list. - * The list contents are of type {@link java.lang.String}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Super Type Signatures</em>' attribute list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Super Type Signatures</em>' attribute list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_SuperTypeSignatures() - * @model type="java.lang.String" volatile="true" - * @generated - */ - EList getSuperTypeSignatures(); - - /** - * Returns the value of the '<em><b>Interface Type Signatures</b></em>' attribute list. - * The list contents are of type {@link java.lang.String}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Interface Type Signatures</em>' attribute list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Interface Type Signatures</em>' attribute list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_InterfaceTypeSignatures() - * @model type="java.lang.String" volatile="true" - * @generated - */ - EList getInterfaceTypeSignatures(); - - /** - * Returns the value of the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type Signature Delegate</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type Signature Delegate</em>' attribute. - * @see #setTypeSignatureDelegate(String) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeSignatureDelegate() - * @model - * @generated - */ - String getTypeSignatureDelegate(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Type Signature Delegate</em>' attribute. - * @see #getTypeSignatureDelegate() - * @generated - */ - void setTypeSignatureDelegate(String value); - - /** - * Returns the value of the '<em><b>Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Methods</em>' reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Methods</em>' reference list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Methods() - * @model type="org.eclipse.jst.jsf.context.symbol.IMethodSymbol" volatile="true" - * @generated - */ - EList getMethods(); - - /** - * Returns the value of the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * The list contents are of type {@link java.lang.String}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Type Parameter Signatures</em>' attribute list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Type Parameter Signatures</em>' attribute list. - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeParameterSignatures() - * @model type="java.lang.String" unique="false" transient="true" - * @generated - */ - EList getTypeParameterSignatures(); - - /** - * Returns the value of the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Jdt Context</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Jdt Context</em>' attribute. - * @see #setJdtContext(IJavaElement) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_JdtContext() - * @model dataType="org.eclipse.jst.jsf.context.symbol.IJavaElement" - * @generated - */ - IJavaElement getJdtContext(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext <em>Jdt Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Jdt Context</em>' attribute. - * @see #getJdtContext() - * @generated - */ - void setJdtContext(IJavaElement value); - - /** - * Returns the value of the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Enum Type</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Enum Type</em>' attribute. - * @see #setEnumType(boolean) - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_EnumType() - * @model - * @generated - */ - boolean isEnumType(); - - /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType <em>Enum Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Enum Type</em>' attribute. - * @see #isEnumType() - * @generated - */ - void setEnumType(boolean value); - - /** - * <!-- begin-user-doc --> - * @param typeSignature - * @return true if the type descriptor's underlying type would resolve true == (type instanceof typeSignature) - * - * <!-- end-user-doc --> - * @model - * @generated - */ - boolean instanceOf(String typeSignature); - - /** - * <!-- begin-user-doc --> - * @return true iff this type is an array of something - * <!-- end-user-doc --> - * @model kind="operation" - * @generated - */ - boolean isArray(); - - /** - * <!-- begin-user-doc --> - * @return a symbol representing an element of this array. May - * throw an exception or return null if isArray() == false - * <!-- end-user-doc --> - * @model kind="operation" - * @generated - */ - IObjectSymbol getArrayElement(); - - /** - * <!-- begin-user-doc --> - * @param resolvedTypeSignature - * @return the IType for resolvedTypeSignature or null if can't be resolved - * <!-- end-user-doc --> - * @model dataType="org.eclipse.jst.jsf.context.symbol.IType" - * @generated - */ - IType resolveType(String resolvedTypeSignature); - - /** - * <!-- begin-user-doc --> - * @param methodName - * @param methodArgs - * @param symbolName - * @return a symbol or null if not handling - * <!-- end-user-doc --> - * @model methodArgsType="java.lang.String" methodArgsMany="true" - * @generated - */ - ISymbol calculateSyntheticCall(String methodName, EList methodArgs, String symbolName); - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java deleted file mode 100644 index 60451c389..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java +++ /dev/null @@ -1,241 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthias Fuessel -- extracted from https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461 - * Cameron Bateman/Oracle - integrated. - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol; - -import java.util.Arrays; -import java.util.Collections; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.common.util.TypeUtil; - -/** - * Creates purpose-built symbols and descriptors fully initialized (unlike the - * EMF factory that simply creates empty instances. - * - * This class is for convenience only and should not do anything that clients - * could not do by hand (though with more work). - * - * Clients may use or subclass. - * - * @author cbateman - * - */ -public class InitializedSymbolFactory -{ - /** - * If fullyQualifiedClass can be resolved to an IType, then a bean instance - * symbol will be created. If the type cannot be resolved, then - * createUnknownInstanceSymbol is called with the type descriptor on the - * returned symbol forced to fullyQualifiedClass. - * - * @param project - * @param fullyQualifiedClass - * @param symbolName - * @param source - * @return a symbol - */ - public final ISymbol createBeanOrUnknownInstanceSymbol( - final IProject project, final String fullyQualifiedClass, - final String symbolName, final ERuntimeSource source) - { - final IJavaProject javaProject = JavaCore.create(project); - try - { - final IType type = javaProject.findType(fullyQualifiedClass); - - // TODO: this is a high-bred since it consists of a java instance - // but also has properties we can populate at designtime such as - // the maps. Need to add the second part - if (type != null) - { - final IJavaTypeDescriptor2 typeDesc = SymbolFactory.eINSTANCE - .createIJavaTypeDescriptor2(); - typeDesc.setType(type); - final IBeanInstanceSymbol facesContextVar = SymbolFactory.eINSTANCE - .createIBeanInstanceSymbol(); - facesContextVar.setTypeDescriptor(typeDesc); - facesContextVar.setName(symbolName); - facesContextVar.setRuntimeSource(source); - return facesContextVar; - } - } - catch (final JavaModelException jme) - { - // fall-through and fail with unresolved map - } - - final ISymbol symbol = createUnknownInstanceSymbol(symbolName, source); - ((IInstanceSymbol) symbol) - .getTypeDescriptor() - .setTypeSignatureDelegate( - Signature - .createTypeSignature(fullyQualifiedClass, true)); - - return symbol; - } - - /** - * @param symbolName - * @param source - * @return a symbol for a variable of unknown type - */ - public final IComponentSymbol createUnknownComponentSymbol( - final String symbolName, final ERuntimeSource source) - { - final IComponentSymbol symbol = SymbolFactory.eINSTANCE - .createIComponentSymbol(); - populateUnknownInstanceSymbol(symbol, symbolName, source); - return symbol; - } - - /** - * @param symbolName - * @param source - * @return the unknown instance symbol as an IInstanceSymbol - */ - public final IInstanceSymbol createUnknownInstanceSymbol( - final String symbolName, final ERuntimeSource source) - { - final IInstanceSymbol symbol = SymbolFactory.eINSTANCE - .createIInstanceSymbol(); - populateUnknownInstanceSymbol(symbol, symbolName, source); - return symbol; - } - - /** - * @param name - * may NOT be null. - * @param typeDesc - * may NOT be null. - * @param description - * may be null - * @return a component symbol using the java type descriptor - * @throws IllegalArgumentException - * if non-null argument is null - */ - public final IComponentSymbol createJavaComponentSymbol(final String name, - final IJavaTypeDescriptor2 typeDesc, final String description) - { - if (name == null || typeDesc == null) - { - throw new IllegalArgumentException( - "name and typeDesc must not be null"); - } - - final IComponentSymbol symbol = SymbolFactory.eINSTANCE - .createIComponentSymbol(); - symbol.setName(name); - symbol.setTypeDescriptor(typeDesc); - symbol.setRuntimeSource(ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL); - return symbol; - } - - /** - * @param name - * @param valueType - * @param description - * @param javaProject - * @return an IComponentSymbol that uses valueType to derive the type - * of its type descriptor - */ - public final IComponentSymbol createJavaComponentSymbol(final String name, - final ValueType valueType, final String description, - final IJavaProject javaProject) - { - final IJavaTypeDescriptor2 typeDesc = createTypeDescriptorFromSignature( - valueType.getSignature(), javaProject); - return createJavaComponentSymbol(name, typeDesc, description); - } - - private void populateUnknownInstanceSymbol(final IInstanceSymbol symbol, - final String symbolName, final ERuntimeSource source) - { - final IMapTypeDescriptor typeDesc = SymbolFactory.eINSTANCE - .createIBoundedMapTypeDescriptor(); - // empty map source - typeDesc.setMapSource(Collections.emptyMap()); - symbol.setName(symbolName); - symbol.setTypeDescriptor(typeDesc); - symbol.setRuntimeSource(source); - } - - /** - * @param type - * @return the signature of the element type of a collection/array, - * <code>null</code>, if untyped Collection or no container type - * at all. - */ - public final String getElementSignatureFromContainerType(ValueType type) - { - if (type.isArray()) - { - // TODO full signature - String signature = type.getSignature(); - int arrayCount = Signature.getArrayCount(signature); - String elementSig = Signature.getElementType(signature); - return Signature.createArraySignature(elementSig, arrayCount - 1); - } - if (type.isInstanceOf(TypeConstants.TYPE_COLLECTION)) - { - final String[] typeArguments = type.getTypeArguments(); - if (typeArguments.length > 0) - { - return typeArguments[0]; - } - } - return null; - } - - /** - * @param signature - * @param javaProject - * @return a java type descriptor based on the fully qualified type - * specified by signature using javaProject as the lookup classpath. - * If the IType for signature cannot be found, the descriptor's - * typeSignatureDelegate will be used. - */ - public final IJavaTypeDescriptor2 createTypeDescriptorFromSignature( - final String signature, final IJavaProject javaProject) - { - final String elementType = Signature.getElementType(signature); - - IJavaTypeDescriptor2 desc = SymbolFactory.eINSTANCE - .createIJavaTypeDescriptor2(); - final int arrayCount = Signature.getArrayCount(signature); - if (arrayCount > 0) - { - desc.setArrayCount(arrayCount); - } - - IType type = TypeUtil.resolveType(javaProject, elementType); - if (type != null) - { - desc.setType(type); - } - else - { - desc.setTypeSignatureDelegate(Signature.getTypeErasure(signature)); - } - desc.getTypeParameterSignatures().addAll( - Arrays.asList(Signature.getTypeArguments(signature))); - return desc; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java deleted file mode 100644 index 830b2965e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java +++ /dev/null @@ -1,177 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.ecore.EFactory; - -/** - * <!-- begin-user-doc --> - * The <b>Factory</b> for the model. - * It provides a create method for each non-abstract class of the model. - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage - * @generated - */ -public interface SymbolFactory extends EFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The singleton instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - SymbolFactory eINSTANCE = org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolFactoryImpl.init(); - - /** - * Returns a new object of class '<em>IBean Instance Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBean Instance Symbol</em>'. - * @generated - */ - IBeanInstanceSymbol createIBeanInstanceSymbol(); - - /** - * Returns a new object of class '<em>IBean Property Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBean Property Symbol</em>'. - * @generated - */ - IBeanPropertySymbol createIBeanPropertySymbol(); - - /** - * Returns a new object of class '<em>IInstance Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IInstance Symbol</em>'. - * @generated - */ - IInstanceSymbol createIInstanceSymbol(); - - /** - * Returns a new object of class '<em>IJava Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IJava Symbol</em>'. - * @generated - */ - IJavaSymbol createIJavaSymbol(); - - /** - * Returns a new object of class '<em>IJava Type Descriptor2</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IJava Type Descriptor2</em>'. - * @generated - */ - IJavaTypeDescriptor2 createIJavaTypeDescriptor2(); - - /** - * Returns a new object of class '<em>IBean Method Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBean Method Symbol</em>'. - * @generated - */ - IBeanMethodSymbol createIBeanMethodSymbol(); - - /** - * Returns a new object of class '<em>IComponent Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IComponent Symbol</em>'. - * @generated - */ - IComponentSymbol createIComponentSymbol(); - - /** - * Returns a new object of class '<em>IProperty Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IProperty Symbol</em>'. - * @generated - */ - IPropertySymbol createIPropertySymbol(); - - /** - * Returns a new object of class '<em>IMap Type Descriptor</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IMap Type Descriptor</em>'. - * @generated - */ - IMapTypeDescriptor createIMapTypeDescriptor(); - - /** - * Returns a new object of class '<em>IMethod Symbol</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IMethod Symbol</em>'. - * @generated - */ - IMethodSymbol createIMethodSymbol(); - - /** - * Returns a new object of class '<em>IBounded Map Type Descriptor</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBounded Map Type Descriptor</em>'. - * @generated - */ - IBoundedMapTypeDescriptor createIBoundedMapTypeDescriptor(); - - /** - * Returns a new object of class '<em>IBounded Java Type Descriptor</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBounded Java Type Descriptor</em>'. - * @generated - */ - IBoundedJavaTypeDescriptor createIBoundedJavaTypeDescriptor(); - - /** - * Returns a new object of class '<em>IList Type Descriptor</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IList Type Descriptor</em>'. - * @generated - */ - IListTypeDescriptor createIListTypeDescriptor(); - - /** - * Returns a new object of class '<em>IBounded List Type Descriptor</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>IBounded List Type Descriptor</em>'. - * @generated - */ - IBoundedListTypeDescriptor createIBoundedListTypeDescriptor(); - - /** - * Returns the package supported by this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the package supported by this factory. - * @generated - */ - SymbolPackage getSymbolPackage(); - -} //SymbolFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java deleted file mode 100644 index 89df71eb2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java +++ /dev/null @@ -1,2674 +0,0 @@ -/** - * Copyright 2006 Oracle - * - * $Id: SymbolPackage.java,v 1.9 2007/10/01 04:29:43 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EEnum; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -/** - * <!-- begin-user-doc --> - * The <b>Package</b> for the model. - * It contains accessors for the meta objects to represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * - * <p><b>Provisional API - subject to change</b></p> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.SymbolFactory - * @model kind="package" - * @generated - */ -public interface SymbolPackage extends EPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String copyright = "Copyright 2006 Oracle"; - - /** - * The package name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNAME = "symbol"; - - /** - * The package namespace URI. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_URI = "http:///org/eclipse/jst/jsf/context/symbol.ecore"; - - /** - * The package namespace name. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - String eNS_PREFIX = "org.eclipse.jst.jsf.context.symbol"; - - /** - * The singleton instance of the package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - SymbolPackage eINSTANCE = org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl.init(); - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.ISymbol - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol() - * @generated - */ - int ISYMBOL = 4; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ISYMBOL__NAME = 0; - - /** - * The number of structural features of the '<em>ISymbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ISYMBOL_FEATURE_COUNT = 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol() - * @generated - */ - int IOBJECT_SYMBOL = 13; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IOBJECT_SYMBOL__NAME = ISYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IOBJECT_SYMBOL__TYPE_DESCRIPTOR = ISYMBOL_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IOBJECT_SYMBOL__READABLE = ISYMBOL_FEATURE_COUNT + 1; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IOBJECT_SYMBOL__WRITABLE = ISYMBOL_FEATURE_COUNT + 2; - - /** - * The number of structural features of the '<em>IObject Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IOBJECT_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 3; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl <em>IInstance Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIInstanceSymbol() - * @generated - */ - int IINSTANCE_SYMBOL = 2; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__NAME = IOBJECT_SYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__TYPE_DESCRIPTOR = IOBJECT_SYMBOL__TYPE_DESCRIPTOR; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__READABLE = IOBJECT_SYMBOL__READABLE; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__WRITABLE = IOBJECT_SYMBOL__WRITABLE; - - /** - * The feature id for the '<em><b>Type Resolved</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__TYPE_RESOLVED = IOBJECT_SYMBOL_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Runtime Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL__RUNTIME_SOURCE = IOBJECT_SYMBOL_FEATURE_COUNT + 1; - - /** - * The number of structural features of the '<em>IInstance Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IINSTANCE_SYMBOL_FEATURE_COUNT = IOBJECT_SYMBOL_FEATURE_COUNT + 2; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl <em>IBean Instance Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanInstanceSymbol() - * @generated - */ - int IBEAN_INSTANCE_SYMBOL = 0; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__NAME = IINSTANCE_SYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__TYPE_DESCRIPTOR = IINSTANCE_SYMBOL__TYPE_DESCRIPTOR; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__READABLE = IINSTANCE_SYMBOL__READABLE; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__WRITABLE = IINSTANCE_SYMBOL__WRITABLE; - - /** - * The feature id for the '<em><b>Type Resolved</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__TYPE_RESOLVED = IINSTANCE_SYMBOL__TYPE_RESOLVED; - - /** - * The feature id for the '<em><b>Runtime Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__RUNTIME_SOURCE = IINSTANCE_SYMBOL__RUNTIME_SOURCE; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__PROPERTIES = IINSTANCE_SYMBOL_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL__METHODS = IINSTANCE_SYMBOL_FEATURE_COUNT + 1; - - /** - * The number of structural features of the '<em>IBean Instance Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_INSTANCE_SYMBOL_FEATURE_COUNT = IINSTANCE_SYMBOL_FEATURE_COUNT + 2; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl <em>IProperty Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIPropertySymbol() - * @generated - */ - int IPROPERTY_SYMBOL = 10; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL__NAME = IOBJECT_SYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL__TYPE_DESCRIPTOR = IOBJECT_SYMBOL__TYPE_DESCRIPTOR; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL__READABLE = IOBJECT_SYMBOL__READABLE; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL__WRITABLE = IOBJECT_SYMBOL__WRITABLE; - - /** - * The feature id for the '<em><b>Intermediate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL__INTERMEDIATE = IOBJECT_SYMBOL_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>IProperty Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IPROPERTY_SYMBOL_FEATURE_COUNT = IOBJECT_SYMBOL_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl <em>IBean Property Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanPropertySymbol() - * @generated - */ - int IBEAN_PROPERTY_SYMBOL = 1; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__NAME = IPROPERTY_SYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__TYPE_DESCRIPTOR = IPROPERTY_SYMBOL__TYPE_DESCRIPTOR; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__READABLE = IPROPERTY_SYMBOL__READABLE; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__WRITABLE = IPROPERTY_SYMBOL__WRITABLE; - - /** - * The feature id for the '<em><b>Intermediate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__INTERMEDIATE = IPROPERTY_SYMBOL__INTERMEDIATE; - - /** - * The feature id for the '<em><b>Owner</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL__OWNER = IPROPERTY_SYMBOL_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>IBean Property Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_PROPERTY_SYMBOL_FEATURE_COUNT = IPROPERTY_SYMBOL_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl <em>IJava Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaSymbol() - * @generated - */ - int IJAVA_SYMBOL = 3; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_SYMBOL__NAME = ISYMBOL__NAME; - - /** - * The feature id for the '<em><b>Java Element</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_SYMBOL__JAVA_ELEMENT = ISYMBOL_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>IJava Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl <em>IType Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getITypeDescriptor() - * @generated - */ - int ITYPE_DESCRIPTOR = 5; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__PROPERTIES = 0; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__TYPE_SIGNATURE = 1; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = 2; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = 3; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = 4; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__METHODS = 5; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = 6; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__JDT_CONTEXT = 7; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR__ENUM_TYPE = 8; - - /** - * The number of structural features of the '<em>IType Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ITYPE_DESCRIPTOR_FEATURE_COUNT = 9; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail() - * @generated - */ - int IDESCRIBED_IN_DETAIL = 6; - - /** - * The number of structural features of the '<em>IDescribed In Detail</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IDESCRIBED_IN_DETAIL_FEATURE_COUNT = 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl <em>IJava Type Descriptor2</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaTypeDescriptor2() - * @generated - */ - int IJAVA_TYPE_DESCRIPTOR2 = 7; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__METHODS = ITYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The feature id for the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__TYPE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Bean Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1; - - /** - * The feature id for the '<em><b>Bean Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS = ITYPE_DESCRIPTOR_FEATURE_COUNT + 2; - - /** - * The feature id for the '<em><b>Array Count</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 3; - - /** - * The number of structural features of the '<em>IJava Type Descriptor2</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IJAVA_TYPE_DESCRIPTOR2_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 4; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl <em>IBean Method Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanMethodSymbol() - * @generated - */ - int IBEAN_METHOD_SYMBOL = 8; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_METHOD_SYMBOL__NAME = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_METHOD_SYMBOL__SIGNATURE = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 1; - - /** - * The feature id for the '<em><b>Owner</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_METHOD_SYMBOL__OWNER = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 2; - - /** - * The number of structural features of the '<em>IBean Method Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBEAN_METHOD_SYMBOL_FEATURE_COUNT = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 3; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl <em>IComponent Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIComponentSymbol() - * @generated - */ - int ICOMPONENT_SYMBOL = 9; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__NAME = IINSTANCE_SYMBOL__NAME; - - /** - * The feature id for the '<em><b>Type Descriptor</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__TYPE_DESCRIPTOR = IINSTANCE_SYMBOL__TYPE_DESCRIPTOR; - - /** - * The feature id for the '<em><b>Readable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__READABLE = IINSTANCE_SYMBOL__READABLE; - - /** - * The feature id for the '<em><b>Writable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__WRITABLE = IINSTANCE_SYMBOL__WRITABLE; - - /** - * The feature id for the '<em><b>Type Resolved</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__TYPE_RESOLVED = IINSTANCE_SYMBOL__TYPE_RESOLVED; - - /** - * The feature id for the '<em><b>Runtime Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL__RUNTIME_SOURCE = IINSTANCE_SYMBOL__RUNTIME_SOURCE; - - /** - * The number of structural features of the '<em>IComponent Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ICOMPONENT_SYMBOL_FEATURE_COUNT = IINSTANCE_SYMBOL_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl <em>IMap Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMapTypeDescriptor() - * @generated - */ - int IMAP_TYPE_DESCRIPTOR = 11; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The feature id for the '<em><b>Map Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__MAP_SOURCE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The feature id for the '<em><b>Immutable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR__IMMUTABLE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1; - - /** - * The number of structural features of the '<em>IMap Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMAP_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 2; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl <em>IMethod Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMethodSymbol() - * @generated - */ - int IMETHOD_SYMBOL = 12; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMETHOD_SYMBOL__NAME = ISYMBOL__NAME; - - /** - * The feature id for the '<em><b>Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMETHOD_SYMBOL__SIGNATURE = ISYMBOL_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>IMethod Symbol</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IMETHOD_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor() - * @generated - */ - int IBOUNDED_TYPE_DESCRIPTOR = 14; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The number of structural features of the '<em>IBounded Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl <em>IBounded Map Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedMapTypeDescriptor() - * @generated - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR = 15; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__PROPERTIES = IMAP_TYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE = IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = IMAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = IMAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__METHODS = IMAP_TYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = IMAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__JDT_CONTEXT = IMAP_TYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__ENUM_TYPE = IMAP_TYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The feature id for the '<em><b>Map Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__MAP_SOURCE = IMAP_TYPE_DESCRIPTOR__MAP_SOURCE; - - /** - * The feature id for the '<em><b>Immutable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR__IMMUTABLE = IMAP_TYPE_DESCRIPTOR__IMMUTABLE; - - /** - * The number of structural features of the '<em>IBounded Map Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_MAP_TYPE_DESCRIPTOR_FEATURE_COUNT = IMAP_TYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl <em>IBounded Java Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedJavaTypeDescriptor() - * @generated - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR = 16; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__PROPERTIES = IJAVA_TYPE_DESCRIPTOR2__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_SIGNATURE = IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__METHODS = IJAVA_TYPE_DESCRIPTOR2__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__JDT_CONTEXT = IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__ENUM_TYPE = IJAVA_TYPE_DESCRIPTOR2__ENUM_TYPE; - - /** - * The feature id for the '<em><b>Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE = IJAVA_TYPE_DESCRIPTOR2__TYPE; - - /** - * The feature id for the '<em><b>Bean Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__BEAN_PROPERTIES = IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES; - - /** - * The feature id for the '<em><b>Bean Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__BEAN_METHODS = IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS; - - /** - * The feature id for the '<em><b>Array Count</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR__ARRAY_COUNT = IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT; - - /** - * The number of structural features of the '<em>IBounded Java Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_JAVA_TYPE_DESCRIPTOR_FEATURE_COUNT = IJAVA_TYPE_DESCRIPTOR2_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl <em>IList Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIListTypeDescriptor() - * @generated - */ - int ILIST_TYPE_DESCRIPTOR = 17; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The feature id for the '<em><b>List Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR__LIST_SOURCE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>IList Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int ILIST_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl <em>IBounded List Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedListTypeDescriptor() - * @generated - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR = 18; - - /** - * The feature id for the '<em><b>Properties</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__PROPERTIES = ILIST_TYPE_DESCRIPTOR__PROPERTIES; - - /** - * The feature id for the '<em><b>Type Signature</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE; - - /** - * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ILIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ILIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES; - - /** - * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE; - - /** - * The feature id for the '<em><b>Methods</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__METHODS = ILIST_TYPE_DESCRIPTOR__METHODS; - - /** - * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ILIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES; - - /** - * The feature id for the '<em><b>Jdt Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__JDT_CONTEXT = ILIST_TYPE_DESCRIPTOR__JDT_CONTEXT; - - /** - * The feature id for the '<em><b>Enum Type</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__ENUM_TYPE = ILIST_TYPE_DESCRIPTOR__ENUM_TYPE; - - /** - * The feature id for the '<em><b>List Source</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR__LIST_SOURCE = ILIST_TYPE_DESCRIPTOR__LIST_SOURCE; - - /** - * The number of structural features of the '<em>IBounded List Type Descriptor</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int IBOUNDED_LIST_TYPE_DESCRIPTOR_FEATURE_COUNT = ILIST_TYPE_DESCRIPTOR_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource() - * @generated - */ - int ERUNTIME_SOURCE = 19; - - /** - * The meta object id for the '<em>IType</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jdt.core.IType - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIType() - * @generated - */ - int ITYPE = 20; - - /** - * The meta object id for the '<em>IJava Element</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jdt.core.IJavaElement - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaElement() - * @generated - */ - int IJAVA_ELEMENT = 21; - - /** - * The meta object id for the '<em>Value Type</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.internal.types.ValueType - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getValueType() - * @generated - */ - int VALUE_TYPE = 22; - - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBean Instance Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol - * @generated - */ - EClass getIBeanInstanceSymbol(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties <em>Properties</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties() - * @see #getIBeanInstanceSymbol() - * @generated - */ - EReference getIBeanInstanceSymbol_Properties(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods <em>Methods</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods() - * @see #getIBeanInstanceSymbol() - * @generated - */ - EReference getIBeanInstanceSymbol_Methods(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBean Property Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol - * @generated - */ - EClass getIBeanPropertySymbol(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Owner</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner() - * @see #getIBeanPropertySymbol() - * @generated - */ - EReference getIBeanPropertySymbol_Owner(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IInstance Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol - * @generated - */ - EClass getIInstanceSymbol(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved <em>Type Resolved</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Type Resolved</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved() - * @see #getIInstanceSymbol() - * @generated - */ - EAttribute getIInstanceSymbol_TypeResolved(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Runtime Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource() - * @see #getIInstanceSymbol() - * @generated - */ - EAttribute getIInstanceSymbol_RuntimeSource(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IJava Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol - * @generated - */ - EClass getIJavaSymbol(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Java Element</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement() - * @see #getIJavaSymbol() - * @generated - */ - EAttribute getIJavaSymbol_JavaElement(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>ISymbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ISymbol - * @generated - */ - EClass getISymbol(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ISymbol#getName() - * @see #getISymbol() - * @generated - */ - EAttribute getISymbol_Name(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IType Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor - * @generated - */ - EClass getITypeDescriptor(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties <em>Properties</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties() - * @see #getITypeDescriptor() - * @generated - */ - EReference getITypeDescriptor_Properties(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature <em>Type Signature</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Type Signature</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_TypeSignature(); - - /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures <em>Super Type Signatures</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute list '<em>Super Type Signatures</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_SuperTypeSignatures(); - - /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute list '<em>Interface Type Signatures</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_InterfaceTypeSignatures(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Type Signature Delegate</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_TypeSignatureDelegate(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods <em>Methods</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods() - * @see #getITypeDescriptor() - * @generated - */ - EReference getITypeDescriptor_Methods(); - - /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeParameterSignatures <em>Type Parameter Signatures</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute list '<em>Type Parameter Signatures</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeParameterSignatures() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_TypeParameterSignatures(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext <em>Jdt Context</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Jdt Context</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_JdtContext(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType <em>Enum Type</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Enum Type</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType() - * @see #getITypeDescriptor() - * @generated - */ - EAttribute getITypeDescriptor_EnumType(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IDescribed In Detail</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail - * @generated - */ - EClass getIDescribedInDetail(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IJava Type Descriptor2</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 - * @generated - */ - EClass getIJavaTypeDescriptor2(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Type</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType() - * @see #getIJavaTypeDescriptor2() - * @generated - */ - EAttribute getIJavaTypeDescriptor2_Type(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Bean Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties() - * @see #getIJavaTypeDescriptor2() - * @generated - */ - EReference getIJavaTypeDescriptor2_BeanProperties(); - - /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Bean Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods() - * @see #getIJavaTypeDescriptor2() - * @generated - */ - EReference getIJavaTypeDescriptor2_BeanMethods(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Array Count</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount() - * @see #getIJavaTypeDescriptor2() - * @generated - */ - EAttribute getIJavaTypeDescriptor2_ArrayCount(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBean Method Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol - * @generated - */ - EClass getIBeanMethodSymbol(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Owner</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner() - * @see #getIBeanMethodSymbol() - * @generated - */ - EReference getIBeanMethodSymbol_Owner(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IComponent Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol - * @generated - */ - EClass getIComponentSymbol(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IProperty Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol - * @generated - */ - EClass getIPropertySymbol(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Intermediate</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate() - * @see #getIPropertySymbol() - * @generated - */ - EAttribute getIPropertySymbol_Intermediate(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IMap Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor - * @generated - */ - EClass getIMapTypeDescriptor(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Map Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource() - * @see #getIMapTypeDescriptor() - * @generated - */ - EAttribute getIMapTypeDescriptor_MapSource(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Immutable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable() - * @see #getIMapTypeDescriptor() - * @generated - */ - EAttribute getIMapTypeDescriptor_Immutable(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IMethod Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol - * @generated - */ - EClass getIMethodSymbol(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Signature</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature() - * @see #getIMethodSymbol() - * @generated - */ - EAttribute getIMethodSymbol_Signature(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IObject Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol - * @generated - */ - EClass getIObjectSymbol(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor() - * @see #getIObjectSymbol() - * @generated - */ - EReference getIObjectSymbol_TypeDescriptor(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Readable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable() - * @see #getIObjectSymbol() - * @generated - */ - EAttribute getIObjectSymbol_Readable(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Writable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable() - * @see #getIObjectSymbol() - * @generated - */ - EAttribute getIObjectSymbol_Writable(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBounded Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor - * @generated - */ - EClass getIBoundedTypeDescriptor(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBounded Map Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor - * @generated - */ - EClass getIBoundedMapTypeDescriptor(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBounded Java Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor - * @generated - */ - EClass getIBoundedJavaTypeDescriptor(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IList Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor - * @generated - */ - EClass getIListTypeDescriptor(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>List Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource() - * @see #getIListTypeDescriptor() - * @generated - */ - EAttribute getIListTypeDescriptor_ListSource(); - - /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>IBounded List Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor - * @generated - */ - EClass getIBoundedListTypeDescriptor(); - - /** - * Returns the meta object for enum '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for enum '<em>ERuntime Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource - * @generated - */ - EEnum getERuntimeSource(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jdt.core.IType <em>IType</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>IType</em>'. - * @see org.eclipse.jdt.core.IType - * @model instanceClass="org.eclipse.jdt.core.IType" - * @generated - */ - EDataType getIType(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jdt.core.IJavaElement <em>IJava Element</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>IJava Element</em>'. - * @see org.eclipse.jdt.core.IJavaElement - * @model instanceClass="org.eclipse.jdt.core.IJavaElement" - * @generated - */ - EDataType getIJavaElement(); - - /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.internal.types.ValueType <em>Value Type</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for data type '<em>Value Type</em>'. - * @see org.eclipse.jst.jsf.common.internal.types.ValueType - * @model instanceClass="org.eclipse.jst.jsf.common.internal.types.ValueType" - * @generated - */ - EDataType getValueType(); - - /** - * Returns the factory that creates the instances of the model. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the factory that creates the instances of the model. - * @generated - */ - SymbolFactory getSymbolFactory(); - - /** - * <!-- begin-user-doc --> - * Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - interface Literals { - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl <em>IBean Instance Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanInstanceSymbol() - * @generated - */ - EClass IBEAN_INSTANCE_SYMBOL = eINSTANCE.getIBeanInstanceSymbol(); - - /** - * The meta object literal for the '<em><b>Properties</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IBEAN_INSTANCE_SYMBOL__PROPERTIES = eINSTANCE.getIBeanInstanceSymbol_Properties(); - - /** - * The meta object literal for the '<em><b>Methods</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IBEAN_INSTANCE_SYMBOL__METHODS = eINSTANCE.getIBeanInstanceSymbol_Methods(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl <em>IBean Property Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanPropertySymbol() - * @generated - */ - EClass IBEAN_PROPERTY_SYMBOL = eINSTANCE.getIBeanPropertySymbol(); - - /** - * The meta object literal for the '<em><b>Owner</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IBEAN_PROPERTY_SYMBOL__OWNER = eINSTANCE.getIBeanPropertySymbol_Owner(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl <em>IInstance Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIInstanceSymbol() - * @generated - */ - EClass IINSTANCE_SYMBOL = eINSTANCE.getIInstanceSymbol(); - - /** - * The meta object literal for the '<em><b>Type Resolved</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IINSTANCE_SYMBOL__TYPE_RESOLVED = eINSTANCE.getIInstanceSymbol_TypeResolved(); - - /** - * The meta object literal for the '<em><b>Runtime Source</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IINSTANCE_SYMBOL__RUNTIME_SOURCE = eINSTANCE.getIInstanceSymbol_RuntimeSource(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl <em>IJava Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaSymbol() - * @generated - */ - EClass IJAVA_SYMBOL = eINSTANCE.getIJavaSymbol(); - - /** - * The meta object literal for the '<em><b>Java Element</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IJAVA_SYMBOL__JAVA_ELEMENT = eINSTANCE.getIJavaSymbol_JavaElement(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.ISymbol - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol() - * @generated - */ - EClass ISYMBOL = eINSTANCE.getISymbol(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ISYMBOL__NAME = eINSTANCE.getISymbol_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl <em>IType Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getITypeDescriptor() - * @generated - */ - EClass ITYPE_DESCRIPTOR = eINSTANCE.getITypeDescriptor(); - - /** - * The meta object literal for the '<em><b>Properties</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ITYPE_DESCRIPTOR__PROPERTIES = eINSTANCE.getITypeDescriptor_Properties(); - - /** - * The meta object literal for the '<em><b>Type Signature</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__TYPE_SIGNATURE = eINSTANCE.getITypeDescriptor_TypeSignature(); - - /** - * The meta object literal for the '<em><b>Super Type Signatures</b></em>' attribute list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = eINSTANCE.getITypeDescriptor_SuperTypeSignatures(); - - /** - * The meta object literal for the '<em><b>Interface Type Signatures</b></em>' attribute list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = eINSTANCE.getITypeDescriptor_InterfaceTypeSignatures(); - - /** - * The meta object literal for the '<em><b>Type Signature Delegate</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = eINSTANCE.getITypeDescriptor_TypeSignatureDelegate(); - - /** - * The meta object literal for the '<em><b>Methods</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference ITYPE_DESCRIPTOR__METHODS = eINSTANCE.getITypeDescriptor_Methods(); - - /** - * The meta object literal for the '<em><b>Type Parameter Signatures</b></em>' attribute list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = eINSTANCE.getITypeDescriptor_TypeParameterSignatures(); - - /** - * The meta object literal for the '<em><b>Jdt Context</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__JDT_CONTEXT = eINSTANCE.getITypeDescriptor_JdtContext(); - - /** - * The meta object literal for the '<em><b>Enum Type</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ITYPE_DESCRIPTOR__ENUM_TYPE = eINSTANCE.getITypeDescriptor_EnumType(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail() - * @generated - */ - EClass IDESCRIBED_IN_DETAIL = eINSTANCE.getIDescribedInDetail(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl <em>IJava Type Descriptor2</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaTypeDescriptor2() - * @generated - */ - EClass IJAVA_TYPE_DESCRIPTOR2 = eINSTANCE.getIJavaTypeDescriptor2(); - - /** - * The meta object literal for the '<em><b>Type</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IJAVA_TYPE_DESCRIPTOR2__TYPE = eINSTANCE.getIJavaTypeDescriptor2_Type(); - - /** - * The meta object literal for the '<em><b>Bean Properties</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES = eINSTANCE.getIJavaTypeDescriptor2_BeanProperties(); - - /** - * The meta object literal for the '<em><b>Bean Methods</b></em>' reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS = eINSTANCE.getIJavaTypeDescriptor2_BeanMethods(); - - /** - * The meta object literal for the '<em><b>Array Count</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT = eINSTANCE.getIJavaTypeDescriptor2_ArrayCount(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl <em>IBean Method Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanMethodSymbol() - * @generated - */ - EClass IBEAN_METHOD_SYMBOL = eINSTANCE.getIBeanMethodSymbol(); - - /** - * The meta object literal for the '<em><b>Owner</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IBEAN_METHOD_SYMBOL__OWNER = eINSTANCE.getIBeanMethodSymbol_Owner(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl <em>IComponent Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIComponentSymbol() - * @generated - */ - EClass ICOMPONENT_SYMBOL = eINSTANCE.getIComponentSymbol(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl <em>IProperty Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIPropertySymbol() - * @generated - */ - EClass IPROPERTY_SYMBOL = eINSTANCE.getIPropertySymbol(); - - /** - * The meta object literal for the '<em><b>Intermediate</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IPROPERTY_SYMBOL__INTERMEDIATE = eINSTANCE.getIPropertySymbol_Intermediate(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl <em>IMap Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMapTypeDescriptor() - * @generated - */ - EClass IMAP_TYPE_DESCRIPTOR = eINSTANCE.getIMapTypeDescriptor(); - - /** - * The meta object literal for the '<em><b>Map Source</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IMAP_TYPE_DESCRIPTOR__MAP_SOURCE = eINSTANCE.getIMapTypeDescriptor_MapSource(); - - /** - * The meta object literal for the '<em><b>Immutable</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IMAP_TYPE_DESCRIPTOR__IMMUTABLE = eINSTANCE.getIMapTypeDescriptor_Immutable(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl <em>IMethod Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMethodSymbol() - * @generated - */ - EClass IMETHOD_SYMBOL = eINSTANCE.getIMethodSymbol(); - - /** - * The meta object literal for the '<em><b>Signature</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IMETHOD_SYMBOL__SIGNATURE = eINSTANCE.getIMethodSymbol_Signature(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol() - * @generated - */ - EClass IOBJECT_SYMBOL = eINSTANCE.getIObjectSymbol(); - - /** - * The meta object literal for the '<em><b>Type Descriptor</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference IOBJECT_SYMBOL__TYPE_DESCRIPTOR = eINSTANCE.getIObjectSymbol_TypeDescriptor(); - - /** - * The meta object literal for the '<em><b>Readable</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IOBJECT_SYMBOL__READABLE = eINSTANCE.getIObjectSymbol_Readable(); - - /** - * The meta object literal for the '<em><b>Writable</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute IOBJECT_SYMBOL__WRITABLE = eINSTANCE.getIObjectSymbol_Writable(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor() - * @generated - */ - EClass IBOUNDED_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedTypeDescriptor(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl <em>IBounded Map Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedMapTypeDescriptor() - * @generated - */ - EClass IBOUNDED_MAP_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedMapTypeDescriptor(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl <em>IBounded Java Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedJavaTypeDescriptor() - * @generated - */ - EClass IBOUNDED_JAVA_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedJavaTypeDescriptor(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl <em>IList Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIListTypeDescriptor() - * @generated - */ - EClass ILIST_TYPE_DESCRIPTOR = eINSTANCE.getIListTypeDescriptor(); - - /** - * The meta object literal for the '<em><b>List Source</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute ILIST_TYPE_DESCRIPTOR__LIST_SOURCE = eINSTANCE.getIListTypeDescriptor_ListSource(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl <em>IBounded List Type Descriptor</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedListTypeDescriptor() - * @generated - */ - EClass IBOUNDED_LIST_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedListTypeDescriptor(); - - /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource() - * @generated - */ - EEnum ERUNTIME_SOURCE = eINSTANCE.getERuntimeSource(); - - /** - * The meta object literal for the '<em>IType</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jdt.core.IType - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIType() - * @generated - */ - EDataType ITYPE = eINSTANCE.getIType(); - - /** - * The meta object literal for the '<em>IJava Element</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jdt.core.IJavaElement - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaElement() - * @generated - */ - EDataType IJAVA_ELEMENT = eINSTANCE.getIJavaElement(); - - /** - * The meta object literal for the '<em>Value Type</em>' data type. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.internal.types.ValueType - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getValueType() - * @generated - */ - EDataType VALUE_TYPE = eINSTANCE.getValueType(); - - } - -} //SymbolPackage diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java deleted file mode 100644 index 4124126d6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java +++ /dev/null @@ -1,248 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.HashMap; - -import org.eclipse.emf.common.util.BasicEList; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBean Instance Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getProperties <em>Properties</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getMethods <em>Methods</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IBeanInstanceSymbolImpl extends IInstanceSymbolImpl implements IBeanInstanceSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * A detailed description (human readable) about this instance symbol - */ - protected String _detailedDescription = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanInstanceSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the EClass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the list of bean properties - * <!-- end-user-doc --> - * @generated NOT - */ - public EList getProperties() - { - return getJavaTypeDescriptor().getBeanProperties(); - } - - /** - * <!-- begin-user-doc --> - * @return the list of methods - * <!-- end-user-doc --> - * @generated NOT - */ - public EList getMethods() { - return getJavaTypeDescriptor().getBeanMethods(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public IJavaTypeDescriptor2 getJavaTypeDescriptor() { - return (IJavaTypeDescriptor2) getTypeDescriptor(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public void setJavaTypeDescriptor(IJavaTypeDescriptor2 newTypeDescriptor) { - setTypeDescriptor(newTypeDescriptor); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the object related to featureID - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES: - return getProperties(); - case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS: - return getMethods(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return whether the corresponding feature is set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES: - return !getProperties().isEmpty(); - case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS: - return !getMethods().isEmpty(); - } - return super.eIsSet(featureID); - } - - public String getDetailedDescription() - { - return _detailedDescription; - } - - public void setDetailedDescription(String detailedDescription) - { - this._detailedDescription = detailedDescription; - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved() - * @generated NOT - */ - // @Override - public boolean isTypeResolved() - { - return getJavaTypeDescriptor() != null; - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#setTypeDescriptor(org.eclipse.jst.jsf.context.symbol.ITypeDescriptor) - * @generated NOT - */ - public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) - { - if (newTypeDescriptor instanceof IJavaTypeDescriptor2) - { - super.setTypeDescriptor(newTypeDescriptor); - } - else - { - throw new IllegalArgumentException("Bean instance symbol requires a IJavaTypeDescriptor2"); //$NON-NLS-1$ - } - } - - public boolean isReadable() - { - // beans always readable - return true; - } - - public boolean isWritable() - { - // beans not writable - return false; - } - - public void setReadable(boolean value) { - // do nothing - } - - public void setWritable(boolean value) { - // do nothing - } - - /* - * @generated NOT - */ - public ITypeDescriptor coerce(String typeSignature) - { - if (supportsCoercion(typeSignature)) - { - if (TypeConstants.TYPE_MAP.equals(typeSignature)) - { - IBoundedMapTypeDescriptor mapDesc = - SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor(); - // bean maps are generally writable - mapDesc.setImmutable(true); - mapDesc.setMapSource(new HashMap()); // give it an empty map - return mapDesc; - } - else if (TypeConstants.TYPE_LIST.equals(typeSignature)) - { - IBoundedListTypeDescriptor listDesc = - SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor(); - - // bean maps are generally writable - listDesc.setListSource(new BasicEList()); // give it an empty list - return listDesc; - } - } - - return null; - } - - /** (non-Javadoc) - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String) - * - * @generated NOT - */ - public ISymbol call(String methodName, EList methodArguments, - String symbolName) - { - return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor()); - } - -} //IBeanInstanceSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java deleted file mode 100644 index 76505d083..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java +++ /dev/null @@ -1,376 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBean Method Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getSignature <em>Signature</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getOwner <em>Owner</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IBeanMethodSymbolImpl extends EObjectImpl implements IBeanMethodSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSignature() - * @generated - * @ordered - */ - protected static final String SIGNATURE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSignature() - * @generated - * @ordered - */ - protected String signature = SIGNATURE_EDEFAULT; - - /** - * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getOwner() - * @generated - * @ordered - */ - protected IJavaTypeDescriptor2 owner = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanMethodSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static eclass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBEAN_METHOD_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the name of the method symbol - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * @param newName - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * @return the signature in JVM/JDT form - * <!-- end-user-doc --> - * @generated - */ - public String getSignature() { - return signature; - } - - /** - * <!-- begin-user-doc --> - * @param newSignature - * <!-- end-user-doc --> - * @generated - */ - public void setSignature(String newSignature) { - String oldSignature = signature; - signature = newSignature; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE, oldSignature, signature)); - } - - /** - * <!-- begin-user-doc --> - * @return the java type descriptor that owns this symbol - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2 getOwner() { - if (owner != null && owner.eIsProxy()) { - InternalEObject oldOwner = (InternalEObject)owner; - owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner); - if (owner != oldOwner) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner)); - } - } - return owner; - } - - /** - * <!-- begin-user-doc --> - * @return the java type descriptor that derives this symbol - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2 basicGetOwner() { - return owner; - } - - /** - * <!-- begin-user-doc --> - * @param newOwner - * <!-- end-user-doc --> - * @generated - */ - public void setOwner(IJavaTypeDescriptor2 newOwner) { - IJavaTypeDescriptor2 oldOwner = owner; - owner = newOwner; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner)); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the feature object for featureID - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: - return getName(); - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: - return getSignature(); - case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER: - if (resolve) return getOwner(); - return basicGetOwner(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: - setName((String)newValue); - return; - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: - setSignature((String)newValue); - return; - case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER: - setOwner((IJavaTypeDescriptor2)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: - setName(NAME_EDEFAULT); - return; - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: - setSignature(SIGNATURE_EDEFAULT); - return; - case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER: - setOwner((IJavaTypeDescriptor2)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if the feature has been set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: - return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature); - case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER: - return owner != null; - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param derivedFeatureID - * @param baseClass - * @return the feature id - * <!-- end-user-doc --> - * @generated - */ - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { - if (baseClass == ISymbol.class) { - switch (derivedFeatureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: return SymbolPackage.ISYMBOL__NAME; - default: return -1; - } - } - if (baseClass == IMethodSymbol.class) { - switch (derivedFeatureID) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: return SymbolPackage.IMETHOD_SYMBOL__SIGNATURE; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * <!-- begin-user-doc --> - * @param baseFeatureID - * @param baseClass - * @return the feature id - * <!-- end-user-doc --> - * @generated - */ - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { - if (baseClass == ISymbol.class) { - switch (baseFeatureID) { - case SymbolPackage.ISYMBOL__NAME: return SymbolPackage.IBEAN_METHOD_SYMBOL__NAME; - default: return -1; - } - } - if (baseClass == IMethodSymbol.class) { - switch (baseFeatureID) { - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: return SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - - /** - * <!-- begin-user-doc --> - * @return the default string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", signature: "); //$NON-NLS-1$ - result.append(signature); - result.append(')'); - return result.toString(); - } - - public String getDetailedDescription() { - StringBuffer descBuffer = new StringBuffer("<p><b>Signature:</b> "); - descBuffer.append(Signature.toString(signature, getName(), null, false, true)).append("</p>"); - IMethod method = JavaUtil.findCorrespondingMethod(this); - if (method != null) { - String javadoc = JavaUtil.getMethodJavadoc(method); - if (javadoc != null) { - descBuffer.append("<p>").append(javadoc).append("</p>"); - } - } - return descBuffer.toString(); - } - - public void setDetailedDescription(String detailedDescription) { - throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$ - } - - -} //IBeanMethodSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java deleted file mode 100644 index e80a12342..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java +++ /dev/null @@ -1,354 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.HashMap; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.util.JDTBeanProperty; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBean Property Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl#getOwner <em>Owner</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IBeanPropertySymbolImpl extends IPropertySymbolImpl implements IBeanPropertySymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") //$NON-NLS-1$ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - - /** - * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getOwner() - * @generated - * @ordered - */ - protected IJavaTypeDescriptor2 owner = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanPropertySymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static class - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the owner's type descriptor - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2 getOwner() { - if (owner != null && owner.eIsProxy()) { - InternalEObject oldOwner = (InternalEObject)owner; - owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner); - if (owner != oldOwner) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner)); - } - } - return owner; - } - - /** - * <!-- begin-user-doc --> - * @return the java type descriptor for this instance - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2 basicGetOwner() { - return owner; - } - - /** - * <!-- begin-user-doc --> - * @param newOwner - * <!-- end-user-doc --> - * @generated - */ - public void setOwner(IJavaTypeDescriptor2 newOwner) { - IJavaTypeDescriptor2 oldOwner = owner; - owner = newOwner; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner)); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the value for the featureID - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER: - if (resolve) return getOwner(); - return basicGetOwner(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER: - setOwner((IJavaTypeDescriptor2)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER: - setOwner((IJavaTypeDescriptor2)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if the feature is set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER: - return owner != null; - } - return super.eIsSet(featureID); - } - - public String getDetailedDescription() - { - return createDetailedDescription(); - } - - public void setDetailedDescription(String detailedDescription) - { - throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$ - } - - /** - * @generated NOT - */ - public ITypeDescriptor coerce(final String typeSignature) - { - // ensure that we have an erased version - final String erasedTypeSignature = Signature.getTypeErasure(typeSignature); - - if (supportsCoercion(typeSignature)) - { - if (TypeConstants.TYPE_MAP.equals(erasedTypeSignature)) - { - IBoundedMapTypeDescriptor mapDesc = - SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor(); - // bean maps are generally writable - mapDesc.setImmutable(true); - mapDesc.setMapSource(new HashMap()); // give it an empty map - return mapDesc; - } - else if (TypeConstants.TYPE_LIST.equals(erasedTypeSignature)) - { - IBoundedListTypeDescriptor listDesc = - SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor(); - listDesc.setJdtContext(deriveBestJdtContext()); - - // bean maps are generally writable - return listDesc; - } - } - - return null; - - } - - /** - * @return the derived jdt element - * @generated NOT - */ - private IJavaElement deriveBestJdtContext() - { - IJavaElement contextElement = null; - if (getTypeDescriptor() instanceof IJavaTypeDescriptor2) - { - contextElement = - ((IJavaTypeDescriptor2)getTypeDescriptor()).getType(); - } - - if (contextElement == null) - { - contextElement = getTypeDescriptor().getJdtContext(); - } - - return contextElement; - } - - /** (non-Javadoc) - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String) - * - * @generated NOT - */ - public ISymbol call(String methodName, EList methodArguments, - String symbolName) - { - return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor()); - } - - -// private List convertArgsToSignatures(List methodArgs) -// { -// List args = new ArrayList(); -// -// for (final Iterator it = methodArgs.iterator(); it.hasNext();) -// { -// Object arg = it.next(); -// String className = arg.getClass().getName(); -// String resolvedName = Signature.createTypeSignature(className, true); -// args.add(resolvedName); -// } -// -// return args; -// } - - /** - * @generated NOT - */ - public boolean supportsCoercion(String typeSignature) { - // first check that our type descriptor even thinks it is - // an instanceof this type - if (getTypeDescriptor().instanceOf(typeSignature)) - { - // for java bean instances, we need to minimally support - // Map, List and Array to conform to the basic spec - // for JSF EL - if (TypeConstants.TYPE_MAP.equals(Signature.getTypeErasure(typeSignature))) - { - return true; - } - else if (TypeConstants.TYPE_LIST.equals(Signature.getTypeErasure(typeSignature))) - { - return true; - } - } - - // otherwise, not supported - return false; - } - - /** - * @return the detail description - * @generated NOT - */ - private String createDetailedDescription() - { - StringBuffer additionalInfo = new StringBuffer("<p><b>"); //$NON-NLS-1$ - ITypeDescriptor typeDescriptor_ = getTypeDescriptor(); - if (typeDescriptor_ != null) { - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Type")); //$NON-NLS-1$ - additionalInfo.append("</b>"); //$NON-NLS-1$ - additionalInfo.append(Signature.toString(typeDescriptor_.getTypeSignature())); - } - additionalInfo.append("</p>"); //$NON-NLS-1$ - additionalInfo.append("<p><b>"); //$NON-NLS-1$ - - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Access")); //$NON-NLS-1$ - additionalInfo.append("</b>"); //$NON-NLS-1$ - if (isReadable() && isWritable()) { - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.read_write")); //$NON-NLS-1$ - } else if (isReadable()) { - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.readonly")); //$NON-NLS-1$ - } else if (isWritable()) { - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.writeonly")); //$NON-NLS-1$ - } else { - additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.none")); //$NON-NLS-1$ - } - additionalInfo.append("</p>"); //$NON-NLS-1$ - JDTBeanProperty property = JavaUtil.findCorrespondingJDTProperty(this); - if (property != null) { - String javaDoc = null; - if (property.getGetter() != null) { - javaDoc = JavaUtil.getMethodJavadoc(property.getGetter()); - } - if (javaDoc == null && property.getSetter() != null) { - javaDoc = JavaUtil.getMethodJavadoc(property.getSetter()); - } - if (javaDoc != null) { - additionalInfo.append("<p>").append(javaDoc).append("</p>"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - return additionalInfo.toString(); - } - -} //IBeanPropertySymbolImpl - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java deleted file mode 100644 index af1f404e6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.8 2007/10/01 04:29:44 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBounded Java Type Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class IBoundedJavaTypeDescriptorImpl extends IJavaTypeDescriptor2Impl implements IBoundedJavaTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedJavaTypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBOUNDED_JAVA_TYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean isUnboundedForType(String typeSignature) { - // TODO: for now, return true if the type is a resolved object - // need to add support for template checking (Java5) and - // decide what to do with unresolved (Q) type signatures - return typeSignature != null - && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol getUnboundedProperty(Object name, String typeSignature) { - ISymbol retValue = null; - - if (isUnboundedForType(typeSignature)) - { - IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol(); - // TODO: there is a possible problem here for non-string keyed maps - propSymbol.setName(name.toString()); - propSymbol.setReadable(true); - IBoundedJavaTypeDescriptor typeDesc = - SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor(); - - typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT); - propSymbol.setTypeDescriptor(typeDesc); - retValue = propSymbol; - } - - return retValue; - } - - public ISymbol calculateSyntheticCall(String methodName, EList methodArgs, - String symbolName) - { - return getUnboundedProperty(symbolName, TypeConstants.TYPE_JAVAOBJECT); - } -} //IBoundedJavaTypeDescriptorImpl
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java deleted file mode 100644 index e6cb34b8a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java +++ /dev/null @@ -1,259 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IBoundedListTypeDescriptorImpl.java,v 1.6 2007/10/01 04:29:44 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBounded List Type Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl implements IBoundedListTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedListTypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBOUNDED_LIST_TYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean isUnboundedForType(String typeSignature) - { - // type signature must be a boxed integer - // TODO: at this level, do we need to deal with coercion to - // other integer types? list.get() takes an integer... - return typeSignature != null && TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol getUnboundedProperty(Object name, String typeSignature) { - ISymbol retValue = null; - - if (isUnboundedForType(typeSignature) - && name instanceof Number) - { - // get integer value - int offset = ((Number)name).intValue(); - - // first see if we have it in our map source - // TODO: retValue = getFromMap(name.toString()); - - if (retValue == null) - { - IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol(); - // TODO: there is a possible problem here for non-string keyed maps - propSymbol.setName(name.toString()); - propSymbol.setReadable(true); - propSymbol.setTypeDescriptor(getBoundsTypeDescriptor(offset)); - retValue = propSymbol; - } - } - - return retValue; - } - - /** - * <!-- begin-user-doc --> - * @param methodName - * @param methodArguments - * @param symbolName - * @return a symbol representing the return value of the method - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol call(String methodName, EList methodArguments, String symbolName) - { - ISymbol result = null; - final IType type = resolveType(getTypeSignature()); - - if (type != null) - { - final JDTBeanIntrospector introspector = - new JDTBeanIntrospector(type); - - final IMethod callMethod = - matchMethod(methodName, methodArguments, introspector.getAllMethods()); - - if (callMethod != null) - { - try - { - // resolve the method's return type; don't erase parameters - final String retTypeSignature = - TypeUtil.resolveTypeSignature - (type, callMethod.getReturnType(), false) ; - - final IPropertySymbol propSymbol = - SymbolFactory.eINSTANCE.createIPropertySymbol(); - - // TODO: there is a possible problem here for non-string keyed maps - propSymbol.setName(symbolName); - propSymbol.setReadable(true); - IJavaTypeDescriptor2 typeDesc = - SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2(); - - typeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature)); - - // may be null - typeDesc.setType(resolveType(retTypeSignature)); - typeDesc.setTypeSignatureDelegate(retTypeSignature); - propSymbol.setTypeDescriptor(typeDesc); - result = propSymbol; - } - catch (JavaModelException e) - { - JSFCommonPlugin.log(e); - // fall-through and return null result - } - } - } - - return result; - } - - private IMethod matchMethod(String name, List methodArguments, IMethod[] allMethods) - { - final List argSigs = convertArgsToSignatures(methodArguments); - IMethod matchedMethod = null; - - for (int i = 0; i < allMethods.length; i++) - { - final IMethod method = allMethods[i]; - - // check for names and argument count match - if (method.getParameterTypes().length == argSigs.size() - && method.getElementName().equals(name)) - { - String[] methods = method.getParameterTypes(); - // need to verify argument matches - boolean isMatched = true; - CHECK_ARGUMENTS: for (int j = 0; j < methods.length; j++) - { - if (!methods[j].equals(argSigs.get(j))) - { - // not a match - isMatched = false; - break CHECK_ARGUMENTS; - } - } - - if (isMatched) - { - return method; - } - } - } - - return matchedMethod; - } - - private List convertArgsToSignatures(List methodArgs) - { - List args = new ArrayList(); - - for (final Iterator it = methodArgs.iterator(); it.hasNext();) - { - Object arg = it.next(); - String className = arg.getClass().getName(); - String resolvedName = Signature.createTypeSignature(className, true); - args.add(resolvedName); - } - - return args; - } - - /** - * @return the ITypeDescriptor for this List's element type (bound type). - * Defaults to java.lang.Object if no bounds or can't resolve bounds - * - * @generated NOT - */ - private ITypeDescriptor getBoundsTypeDescriptor(int offset) - { - IJavaTypeDescriptor2 typeDesc = null; - - List typeParameters = getTypeParameterSignatures(); - - // if no bounds at all, then default to bounded java object - if (typeParameters.size() == 0) - { - typeDesc = - SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor(); - - typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT); - } - else - { - // TODO: there should only be exactly one on a list... - final String elementType = (String) typeParameters.get(0); - - typeDesc = - SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2(); - - typeDesc.setArrayCount(Signature.getArrayCount(elementType)); - - // may be null - typeDesc.setType(resolveType(elementType)); - typeDesc.setTypeSignatureDelegate(elementType); - } - - return typeDesc; - } -} //IBoundedListTypeDescriptorImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java deleted file mode 100644 index 198999511..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.7 2007/10/01 04:29:44 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.Iterator; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IBounded Map Type Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class IBoundedMapTypeDescriptorImpl extends IMapTypeDescriptorImpl implements IBoundedMapTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedMapTypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IBOUNDED_MAP_TYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean isUnboundedForType(String typeSignature) { - // TODO: for now, return true if the type is a resolved object - // need to add support for template checking (Java5) and - // decide what to do with unresolved (Q) type signatures - return typeSignature != null - && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol getUnboundedProperty(Object name, String typeSignature) { - ISymbol retValue = null; - - if (isUnboundedForType(typeSignature)) - { - // first see if we have it in our map source - retValue = getFromMap(name.toString()); - - if (retValue == null) - { - IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol(); - // TODO: there is a possible problem here for non-string keyed maps - propSymbol.setName(name.toString()); - propSymbol.setReadable(true); - IBoundedJavaTypeDescriptor typeDesc = - SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor(); - - typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT); - propSymbol.setTypeDescriptor(typeDesc); - retValue = propSymbol; - } - } - - return retValue; - - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#calculateSyntheticCall(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String) - * @generated NOT - */ - public ISymbol calculateSyntheticCall(String methodName, EList methodArgs, - String symbolName) { - if ("get".equals(methodName) //$NON-NLS-1$ - && methodArgs.size() == 1) - { - return getUnboundedProperty(symbolName, ((ValueType) methodArgs.get(0)).getSignature()); - } - - // default is return null - return null; - } - - - /** - * @generated NOT - */ - private ISymbol getFromMap(final String name) - { - for (final Iterator it = getProperties().iterator(); it.hasNext();) - { - ISymbol symbol = (ISymbol) it.next(); - - if (symbol.getName().equals(name)) - { - return symbol; - } - } - - return null; - } - -} //IBoundedMapTypeDescriptorImpl
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java deleted file mode 100644 index 15a592ef9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IComponent Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * </p> - * - * @generated - */ -public class IComponentSymbolImpl extends IInstanceSymbolImpl implements IComponentSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * A human readable description of this symbol - */ - protected String _detailedDescription = null; - - /** - * true if this component symbol is readable - */ - protected boolean _isReadable = READABLE_EDEFAULT; - - /** - * true if this component symbol is writable - */ - protected boolean _isWritable = WRITABLE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IComponentSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static class - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.ICOMPONENT_SYMBOL; - } - - public String getDetailedDescription() { - return _detailedDescription; - } - - public void setDetailedDescription(String detailedDescription) { - _detailedDescription = detailedDescription; - } - - /** - * @generated NOT - */ - public ITypeDescriptor coerce(String typeSignature) { - // TODO: - return getTypeDescriptor(); - } - - /** - * @generated NOT - */ - public boolean supportsCoercion(String typeSignature) { - // TODO: - if (getTypeDescriptor().instanceOf(typeSignature)) - { - return true; - } - return false; - } -} //IComponentSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java deleted file mode 100644 index bc868c512..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java +++ /dev/null @@ -1,499 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IInstance Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isReadable <em>Readable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isWritable <em>Writable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved <em>Type Resolved</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getRuntimeSource <em>Runtime Source</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IInstanceSymbolImpl extends EObjectImpl implements IInstanceSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeDescriptor() - * @generated - * @ordered - */ - protected ITypeDescriptor typeDescriptor = null; - - /** - * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isReadable() - * @generated NOT - * @ordered - */ - protected static final boolean READABLE_EDEFAULT = true; - - /** - * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isReadable() - * @generated - * @ordered - */ - protected boolean readable = READABLE_EDEFAULT; - - /** - * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isWritable() - * @generated - * @ordered - */ - protected static final boolean WRITABLE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isWritable() - * @generated - * @ordered - */ - protected boolean writable = WRITABLE_EDEFAULT; - - /** - * The default value of the '{@link #isTypeResolved() <em>Type Resolved</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isTypeResolved() - * @generated - * @ordered - */ - protected static final boolean TYPE_RESOLVED_EDEFAULT = false; - - /** - * The default value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getRuntimeSource() - * @generated - * @ordered - */ - protected static final ERuntimeSource RUNTIME_SOURCE_EDEFAULT = ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL; - - /** - * The cached value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getRuntimeSource() - * @generated - * @ordered - */ - protected ERuntimeSource runtimeSource = RUNTIME_SOURCE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IInstanceSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static class - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IINSTANCE_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the symbol name - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * @param newName - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * @return the type descriptor for this instance - * <!-- end-user-doc --> - * @generated - */ - public ITypeDescriptor getTypeDescriptor() { - if (typeDescriptor != null && typeDescriptor.eIsProxy()) { - InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor; - typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor); - if (typeDescriptor != oldTypeDescriptor) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor)); - } - } - return typeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @return the instance type - * <!-- end-user-doc --> - * @generated - */ - public ITypeDescriptor basicGetTypeDescriptor() { - return typeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @param newTypeDescriptor - * <!-- end-user-doc --> - * @generated - */ - public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) { - ITypeDescriptor oldTypeDescriptor = typeDescriptor; - typeDescriptor = newTypeDescriptor; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor)); - } - - /** - * <!-- begin-user-doc --> - * @return true if instance symbol is readable - * <!-- end-user-doc --> - * @generated - */ - public boolean isReadable() { - return readable; - } - - /** - * <!-- begin-user-doc --> - * @param newReadable - * <!-- end-user-doc --> - * @generated - */ - public void setReadable(boolean newReadable) { - boolean oldReadable = readable; - readable = newReadable; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__READABLE, oldReadable, readable)); - } - - /** - * <!-- begin-user-doc --> - * @return true if instance is writable. - * - * Normally, instances should not be - * considered writable, since the VariableResolver has no setter, however - * this is included to allow for unforeseen cases that may require an - * instance symbol to appear to be writable - * <!-- end-user-doc --> - * @generated - */ - public boolean isWritable() { - return writable; - } - - /** - * <!-- begin-user-doc --> - * @param newWritable - * <!-- end-user-doc --> - * @generated - */ - public void setWritable(boolean newWritable) { - boolean oldWritable = writable; - writable = newWritable; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__WRITABLE, oldWritable, writable)); - } - - /** - * <!-- begin-user-doc --> - * @return true if the type descriptor has been resolved for this symbol - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean isTypeResolved() - { - return getTypeDescriptor() != null; - } - - /** - * <!-- begin-user-doc --> - * @return return the symbol's runtime source - * <!-- end-user-doc --> - * @generated - */ - public ERuntimeSource getRuntimeSource() { - return runtimeSource; - } - - /** - * <!-- begin-user-doc --> - * @param newRuntimeSource - * <!-- end-user-doc --> - * @generated - */ - public void setRuntimeSource(ERuntimeSource newRuntimeSource) { - ERuntimeSource oldRuntimeSource = runtimeSource; - runtimeSource = newRuntimeSource == null ? RUNTIME_SOURCE_EDEFAULT : newRuntimeSource; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE, oldRuntimeSource, runtimeSource)); - } - - /** - * @generated NOT - */ - public boolean supportsCoercion(String typeSignature) - { - // first check that our type descriptor even thinks it is - // an instanceof this type - if (getTypeDescriptor().instanceOf(typeSignature)) - { - // for java bean instances, we need to minimally support - // Map, List and Array to conform to the basic spec - // for JSF EL - if (TypeConstants.TYPE_MAP.equals(typeSignature)) - { - return true; - } - else if (TypeConstants.TYPE_LIST.equals(typeSignature) - /*TODO: || isArray*/) - { - return true; - } - } - - // otherwise, not supported - return false; - } - - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ITypeDescriptor coerce(String typeSignature) { - // TODO: - return getTypeDescriptor(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol call(String methodName, EList methodArguments, String symbolName) { - return Util.call(methodName,methodArguments,symbolName,getTypeDescriptor()); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the value for the featureID - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IINSTANCE_SYMBOL__NAME: - return getName(); - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR: - if (resolve) return getTypeDescriptor(); - return basicGetTypeDescriptor(); - case SymbolPackage.IINSTANCE_SYMBOL__READABLE: - return isReadable() ? Boolean.TRUE : Boolean.FALSE; - case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE: - return isWritable() ? Boolean.TRUE : Boolean.FALSE; - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED: - return isTypeResolved() ? Boolean.TRUE : Boolean.FALSE; - case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE: - return getRuntimeSource(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IINSTANCE_SYMBOL__NAME: - setName((String)newValue); - return; - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR: - setTypeDescriptor((ITypeDescriptor)newValue); - return; - case SymbolPackage.IINSTANCE_SYMBOL__READABLE: - setReadable(((Boolean)newValue).booleanValue()); - return; - case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE: - setWritable(((Boolean)newValue).booleanValue()); - return; - case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE: - setRuntimeSource((ERuntimeSource)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IINSTANCE_SYMBOL__NAME: - setName(NAME_EDEFAULT); - return; - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR: - setTypeDescriptor((ITypeDescriptor)null); - return; - case SymbolPackage.IINSTANCE_SYMBOL__READABLE: - setReadable(READABLE_EDEFAULT); - return; - case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE: - setWritable(WRITABLE_EDEFAULT); - return; - case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE: - setRuntimeSource(RUNTIME_SOURCE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if the feature has been set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IINSTANCE_SYMBOL__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR: - return typeDescriptor != null; - case SymbolPackage.IINSTANCE_SYMBOL__READABLE: - return readable != READABLE_EDEFAULT; - case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE: - return writable != WRITABLE_EDEFAULT; - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED: - return isTypeResolved() != TYPE_RESOLVED_EDEFAULT; - case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE: - return runtimeSource != RUNTIME_SOURCE_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", readable: "); //$NON-NLS-1$ - result.append(readable); - result.append(", writable: "); //$NON-NLS-1$ - result.append(writable); - result.append(", runtimeSource: "); //$NON-NLS-1$ - result.append(runtimeSource); - result.append(')'); - return result.toString(); - } - -} //IInstanceSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java deleted file mode 100644 index 32d8de6b8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java +++ /dev/null @@ -1,241 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IJava Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getJavaElement <em>Java Element</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IJavaSymbolImpl extends EObjectImpl implements IJavaSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJavaElement() - * @generated - * @ordered - */ - protected static final IJavaElement JAVA_ELEMENT_EDEFAULT = null; - - /** - * The cached value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJavaElement() - * @generated - * @ordered - */ - protected IJavaElement javaElement = JAVA_ELEMENT_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IJavaSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static eclass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IJAVA_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the symbol name - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * @param newName - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * @return the IJavaElement associated with this symbol - * <!-- end-user-doc --> - * @generated - */ - public IJavaElement getJavaElement() { - return javaElement; - } - - /** - * <!-- begin-user-doc --> - * @param newJavaElement - * <!-- end-user-doc --> - * @generated - */ - public void setJavaElement(IJavaElement newJavaElement) { - IJavaElement oldJavaElement = javaElement; - javaElement = newJavaElement; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT, oldJavaElement, javaElement)); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the feature - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IJAVA_SYMBOL__NAME: - return getName(); - case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT: - return getJavaElement(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IJAVA_SYMBOL__NAME: - setName((String)newValue); - return; - case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT: - setJavaElement((IJavaElement)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IJAVA_SYMBOL__NAME: - setName(NAME_EDEFAULT); - return; - case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT: - setJavaElement(JAVA_ELEMENT_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if featureID's feature has been set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IJAVA_SYMBOL__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT: - return JAVA_ELEMENT_EDEFAULT == null ? javaElement != null : !JAVA_ELEMENT_EDEFAULT.equals(javaElement); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the default string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", javaElement: "); //$NON-NLS-1$ - result.append(javaElement); - result.append(')'); - return result.toString(); - } - -} //IJavaSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java deleted file mode 100644 index dde647c91..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java +++ /dev/null @@ -1,676 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.BasicEList; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jdt.core.Flags; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.internal.types.TypeInfoCache; -import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.util.JDTBeanProperty; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IJava Type Descriptor2</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanProperties <em>Bean Properties</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanMethods <em>Bean Methods</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getArrayCount <em>Array Count</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IJavaTypeDescriptor2Impl extends ITypeDescriptorImpl implements IJavaTypeDescriptor2 { - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getType() <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getType() - * @generated - * @ordered - */ - protected static final IType TYPE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getType() <em>Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getType() - * @generated - * @ordered - */ - protected IType type = TYPE_EDEFAULT; - - /** - * The default value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getArrayCount() - * @generated - * @ordered - */ - protected static final int ARRAY_COUNT_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute. - * <!-- begin-user-doc --> - * records the array nesting of the type. IType doesn't encapsulate - * array types. So if this type is an array then type will represent - * the base element and this value will be > 0. If not an array, then - * _arrayCount is always 0. - * <!-- end-user-doc --> - * @see #getArrayCount() - * @generated - * @ordered - */ - protected int arrayCount = ARRAY_COUNT_EDEFAULT; - - /** - * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJdtContext() - * @generated - * @ordered - */ - @SuppressWarnings("hiding") - protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null; - - /** - * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJdtContext() - * @generated - * @ordered - */ - @SuppressWarnings("hiding") - protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IJavaTypeDescriptor2Impl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static class - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2; - } - - /** - * <!-- begin-user-doc --> - * @return the JDT type descriptor; if type is an array then this type - * represent's the array base type only - * <!-- end-user-doc --> - * @generated - */ - public IType getType() { - return type; - } - - /** - * <!-- begin-user-doc --> - * @param newType - * <!-- end-user-doc --> - * @generated - */ - public void setType(IType newType) { - IType oldType = type; - type = newType; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE, oldType, type)); - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures() - * @generated NOT - */ - public EList getInterfaceTypeSignatures() - { - EList interfaces = new BasicEList(); - - IType type_ = getType(); - - if (type_ != null) - { - final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance(); - IType[] interfaceTypes = typeInfoCache.getCachedInterfaceTypes(type_); - if (interfaceTypes == null) { - interfaceTypes = typeInfoCache.cacheInterfaceTypesFor(type_); - } - copySignatures(interfaces, interfaceTypes); - } - - return interfaces; - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures() - * @generated NOT - */ - public EList getSuperTypeSignatures() - { - EList interfaces = new BasicEList(); - - IType type_ = getType(); - - if (type_ != null) - { - final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance(); - IType[] interfaceTypes = typeInfoCache.getCachedSupertypes(type_); - - if (interfaceTypes == null) - { - interfaceTypes = typeInfoCache.cacheSupertypesFor(type_); - } - copySignatures(interfaces, interfaceTypes); - } - - return interfaces; - } - - - private void copySignatures(List list, IType[] types) - { - for (int i = 0; i < types.length; i++) - { - final IType type_ = types[i]; - final String signature = TypeUtil.getSignature(type_); - - if (signature != null) - { - list.add(signature); - } - } - } - - public EList getProperties() - { - return getBeanProperties(); - } - - - public EList getMethods() - { - return getBeanMethods(); - } - - /** - * <!-- begin-user-doc --> - * @return the bean props for this java type - * <!-- end-user-doc --> - * @generated NOT - */ - public EList getBeanProperties() - { - TypeInfoCache typeInfoCache = TypeInfoCache.getInstance(); - IBeanPropertySymbol[] properties = typeInfoCache.getCachedPropertySymbols(type); - Collection propertyColl; - if (properties == null) { - propertyColl = getPropertiesInternal(); - properties = (IBeanPropertySymbol[]) propertyColl.toArray(new IBeanPropertySymbol[propertyColl.size()]); - typeInfoCache.cachePropertySymbols(type, properties); - } - else - { - propertyColl = new ArrayList(properties.length); - Collections.addAll(propertyColl, (Object[])properties); - } - BasicEList list = new BasicEList(propertyColl); - return list; - } - - /** - * <!-- begin-user-doc --> - * @return the bean methods for this type - * <!-- end-user-doc --> - * @generated NOT - */ - public EList getBeanMethods() { - TypeInfoCache typeInfoCache = TypeInfoCache.getInstance(); - IBeanMethodSymbol[] methods = typeInfoCache.getCachedMethodSymbols(type); - Collection methodColl; - if (methods == null) - { - methodColl = getMethodsInternal(); - methods = (IBeanMethodSymbol[]) methodColl.toArray(new IBeanMethodSymbol[methodColl.size()]); - typeInfoCache.cacheMethodSymbols(type, methods); - } else { - methodColl = new ArrayList(methods.length); - Collections.addAll(methodColl, (Object[])methods); - } - BasicEList list = new BasicEList(methodColl); - return list; - } - - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public int getArrayCount() { - return arrayCount; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setArrayCount(int newArrayCount) { - int oldArrayCount = arrayCount; - arrayCount = newArrayCount; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT, oldArrayCount, arrayCount)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IJavaElement getJdtContext() { - return jdtContext; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setJdtContext(IJavaElement newJdtContext) { - IJavaElement oldJdtContext = jdtContext; - jdtContext = newJdtContext; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT, oldJdtContext, jdtContext)); - } - - /** - * <!-- begin-user-doc --> - * - * Tries to load an IType for a fully resolved (i.e. starts with L not Q) - * type signature using the current jdtContext. - * - * @return the resolved IType or null if none could be resolved. - * - * <!-- end-user-doc --> - * @generated NOT - */ - public IType resolveType(String resolvedTypeSignature) - { - IType resolvedType = null; - - // we need to obtain an IJavaProject within which to resolve - // the type. - IJavaProject project = null; - - // first, see if we have an IType - if (getType() != null) - { - // optimize: if the type sig is my type sig, then return getType() - if (resolvedTypeSignature.equals(getTypeSignature())) - { - resolvedType = getType(); - } - else - { - project = getType().getJavaProject(); - - if (project != null) - { - resolvedType = TypeUtil.resolveType(project, resolvedTypeSignature); - } - } - } - - // if not, see if a jdtContext hint has been set - if (resolvedType == null && getJdtContext() != null) - { - resolvedType = super.resolveType(resolvedTypeSignature); - } - - return resolvedType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE: - return getType(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES: - return getBeanProperties(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS: - return getBeanMethods(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT: - return Integer.valueOf(getArrayCount()); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE: - setType((IType)newValue); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES: - getBeanProperties().clear(); - getBeanProperties().addAll((Collection)newValue); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS: - getBeanMethods().clear(); - getBeanMethods().addAll((Collection)newValue); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT: - setArrayCount(((Integer)newValue).intValue()); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE: - setType(TYPE_EDEFAULT); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES: - getBeanProperties().clear(); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS: - getBeanMethods().clear(); - return; - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT: - setArrayCount(ARRAY_COUNT_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE: - return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES: - return !getBeanProperties().isEmpty(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS: - return !getBeanMethods().isEmpty(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT: - return arrayCount != ARRAY_COUNT_EDEFAULT; - } - return super.eIsSet(featureID); - } - - public boolean isArray() - { - return getArrayCount() > 0; - } - - /** - * @generated NOT - */ - public IObjectSymbol getArrayElement() - { - if (isArray()) - { - final String typeSignature = getTypeSignature(); - final int arrayCount_ = Signature.getArrayCount(typeSignature); - final String baseType = Signature.getElementType(typeSignature); - final String elementTypeSignature = Signature.createArraySignature(baseType, arrayCount_-1); - - final IJavaTypeDescriptor2 elementTypeDesc = - SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2(); - final String fullyQualifiedElementType = TypeUtil.getFullyQualifiedName(baseType); - - IType elementType = null; - - try - { - IType myType = getType(); - if (myType != null) - { - elementType = getType().getJavaProject() - .findType(fullyQualifiedElementType); - } - } - catch (JavaModelException e) - { - // suppress - } - - if (elementType != null) - { - elementTypeDesc.setType(elementType); - } - else - { - elementTypeDesc.setTypeSignatureDelegate(elementTypeSignature); - } - - elementTypeDesc.setArrayCount(Signature.getArrayCount(elementTypeSignature)); - - IPropertySymbol newPropertySymbol = - SymbolFactory.eINSTANCE.createIPropertySymbol(); - newPropertySymbol.setTypeDescriptor(elementTypeDesc); - newPropertySymbol.setWritable(true); - newPropertySymbol.setReadable(true); - newPropertySymbol.setName(fullyQualifiedElementType); - return newPropertySymbol; - } - - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature() - * @generated NOT - */ - public String getTypeSignature() - { - if (getType() == null) - { - if (eIsSet(SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE)) - { - return getTypeSignatureDelegate(); - } - - return null; - } - - // make sure to array type nesting if using IType - return Signature.createArraySignature( - TypeUtil.getSignature(getType()), getArrayCount()); - } - - private Collection getPropertiesInternal() - { - // if I'm an array then I have no bean properties - if (isArray()) - { - return Collections.EMPTY_LIST; - } - - final JDTBeanIntrospector introspector = - new JDTBeanIntrospector(getType()); - - final Map<String, JDTBeanProperty> properties = introspector.getProperties(); - - final Collection calculatedProps = new ArrayList(properties.size()); - - for (final Iterator<Map.Entry<String, JDTBeanProperty>> it = properties.entrySet().iterator(); it.hasNext();) - { - Map.Entry<String, JDTBeanProperty> entry = it.next(); - final String propertyName = entry.getKey(); - final JDTBeanProperty property = entry.getValue(); - - final IBeanPropertySymbol workingCopy = - SymbolFactory.eINSTANCE.createIBeanPropertySymbol(); - workingCopy.setName(propertyName); - workingCopy.setOwner(this); - - final IJavaTypeDescriptor2 workingCopyDesc = - SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2(); - workingCopy.setTypeDescriptor(workingCopyDesc); - workingCopy.setReadable(property.isReadable()); - workingCopy.setWritable(property.isWritable()); - - workingCopyDesc.setArrayCount(property.getArrayCount()); - workingCopyDesc.getTypeParameterSignatures().addAll(property.getTypeParameterSignatures()); - workingCopyDesc.setEnumType(property.isEnumType()); - - final IType newType = property.getType(); - final String signature = property.getTypeSignature(); - - if (newType != null) - { - workingCopyDesc.setType(newType); - } - else - { - workingCopyDesc.setTypeSignatureDelegate(signature); - } - - calculatedProps.add(workingCopy); - } - - return calculatedProps; - } - - private Collection getMethodsInternal() - { - JDTBeanIntrospector introspector = - new JDTBeanIntrospector(getType()); - - IMethod[] methods = introspector.getAllMethods(); - - List methodSymbols = new ArrayList(); - - for (int i = 0; i < methods.length; i++) - { - IMethod method = methods[i]; - - try - { - // to be a bean method, it must not a constructor, must be public - // and must not be static - if (!method.isConstructor() - && Flags.isPublic(method.getFlags()) - && !Flags.isStatic(method.getFlags())) - { - String methodName = method.getElementName(); - IBeanMethodSymbol workingCopy = SymbolFactory.eINSTANCE.createIBeanMethodSymbol(); - workingCopy.setName(methodName); - workingCopy.setOwner(this); - workingCopy.setSignature(TypeUtil. - resolveMethodSignature - (getType(), - method.getSignature())); - methodSymbols.add(workingCopy); - } - } - catch (JavaModelException jme) - { - // error reading meta-data. Skip to next one - JSFCommonPlugin.log(jme); - } - } - - return methodSymbols; - } - - - /** - * <!-- begin-user-doc --> - * @return the default string rep - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (type: "); //$NON-NLS-1$ - result.append(type); - result.append(", arrayCount: "); //$NON-NLS-1$ - result.append(arrayCount); - result.append(')'); - return result.toString(); - } - -} //IJavaTypeDescriptor2Impl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java deleted file mode 100644 index 7046cee25..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IListTypeDescriptorImpl.java,v 1.5 2007/10/01 04:29:44 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ECollections; -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IList Type Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl#getListSource <em>List Source</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IListTypeDescriptorImpl extends ITypeDescriptorImpl implements IListTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getListSource() <em>List Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getListSource() - * @generated - * @ordered - */ - protected static final EList LIST_SOURCE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getListSource() <em>List Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getListSource() - * @generated - * @ordered - */ - protected EList listSource = LIST_SOURCE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IListTypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getListSource() { - return listSource; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setListSource(EList newListSource) { - EList oldListSource = listSource; - listSource = newListSource; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE, oldListSource, listSource)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE: - return getListSource(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE: - setListSource((EList)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE: - setListSource(LIST_SOURCE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE: - return LIST_SOURCE_EDEFAULT == null ? listSource != null : !LIST_SOURCE_EDEFAULT.equals(listSource); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (listSource: "); //$NON-NLS-1$ - result.append(listSource); - result.append(')'); - return result.toString(); - } - - /* - * @generated NOT - */ - public EList getInterfaceTypeSignatures() { - return ECollections.EMPTY_ELIST; - } - - public EList getMethods() - { - // TODO: should this return the methods on a List? - return ECollections.EMPTY_ELIST; - } - - public EList getProperties() - { - // TODO: a list has no properties as such. What to do here? - return ECollections.EMPTY_ELIST; - } - - /** - * @generated NOT - */ - public EList getSuperTypeSignatures() { - return ECollections.EMPTY_ELIST; - } - - /** - * @generated NOT - */ - public String getTypeSignature() - { - return TypeConstants.TYPE_LIST; - } - -} //IListTypeDescriptorImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java deleted file mode 100644 index a5de57969..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -/** - * Information about the map source used by the IMapTypeDescriptor - * - */ -public interface IMapSourceInfo -{ - - /** - * @param key - * @return true if the map source has changed since key was last set - */ - boolean hasChanged(final Object key); - - /** - * The key is used in the standard HashMap way. - * - * @param key - * @return the cached value for the key. - */ - Object getCachedValue(final Object key); - /** - * Add cached value for key. - * - * @param key - * @param value - */ - void putCachedValue(final Object key, final Object value); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java deleted file mode 100644 index 161102b8a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java +++ /dev/null @@ -1,464 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.BasicEList; -import org.eclipse.emf.common.util.ECollections; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IMap Type Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#getMapSource <em>Map Source</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#isImmutable <em>Immutable</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IMapTypeDescriptorImpl extends ITypeDescriptorImpl implements IMapTypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getMapSource() <em>Map Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getMapSource() - * @generated - * @ordered - */ - protected static final Map MAP_SOURCE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getMapSource() <em>Map Source</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getMapSource() - * @generated - * @ordered - */ - protected Map mapSource = MAP_SOURCE_EDEFAULT; - - /** - * The default value of the '{@link #isImmutable() <em>Immutable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isImmutable() - * @generated - * @ordered - */ - protected static final boolean IMMUTABLE_EDEFAULT = true; - - private static final Object MAP_TYPE_DESCRIPTOR_PROP_KEY = new Object(); - - /** - * The cached value of the '{@link #isImmutable() <em>Immutable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isImmutable() - * @generated - * @ordered - */ - protected boolean immutable = IMMUTABLE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IMapTypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static eClass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * @return the map source - * <!-- end-user-doc --> - * @generated - */ - public Map getMapSource() { - return mapSource; - } - - /** - * <!-- begin-user-doc --> - * @param newMapSource - * <!-- end-user-doc --> - * @generated - */ - public void setMapSource(Map newMapSource) { - Map oldMapSource = mapSource; - mapSource = newMapSource; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE, oldMapSource, mapSource)); - } - - /** - * <!-- begin-user-doc --> - * @return true if this map is immutable as defined in the java.util.Map - * interface. - * <!-- end-user-doc --> - * @generated - */ - public boolean isImmutable() { - return immutable; - } - - /** - * <!-- begin-user-doc --> - * @param newImmutable - * <!-- end-user-doc --> - * @generated - */ - public void setImmutable(boolean newImmutable) { - boolean oldImmutable = immutable; - immutable = newImmutable; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE, oldImmutable, immutable)); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature() - * @generated NOT - */ - public String getTypeSignature() - { - // if the delegate has been set, use it - if (eIsSet(SymbolPackage.IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE)) - { - return getTypeSignatureDelegate(); - } - - // otherwise use Map - return TypeConstants.TYPE_MAP; - } - - public EList getInterfaceTypeSignatures() { - return ECollections.EMPTY_ELIST; - } - - public EList getSuperTypeSignatures() { - return ECollections.EMPTY_ELIST; - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties() - */ - public EList getProperties() - { - final BasicEList list = new BasicEList(); - final Map source = getMapSource(); - if (source instanceof IMapSourceInfo) - { - if (!((IMapSourceInfo) source).hasChanged(MAP_TYPE_DESCRIPTOR_PROP_KEY)) - { - EList cachedList = (EList) ((IMapSourceInfo)source).getCachedValue(MAP_TYPE_DESCRIPTOR_PROP_KEY); - - if (cachedList != null) - { - return cachedList; - } - } - } - final Map segmentMap = processSegments(source); - list.addAll(segmentMap.values()); - - if (source instanceof IMapSourceInfo) - { - ((IMapSourceInfo)source).putCachedValue(MAP_TYPE_DESCRIPTOR_PROP_KEY, list); - } - return list; - } - - public EList getMethods() - { - // TODO: should this return the methods on a Map? - return ECollections.EMPTY_ELIST; - } - - /** - * @generated NOT - */ - public IObjectSymbol getArrayElement() - { - return null; - } - - /** - * @generated NOT - */ - public boolean isArray() - { - // a map is never an array - return false; - } - - private Map processSegments(final Map source) - { - final Map segmentMap = new HashMap(); - final Set<Map.Entry<String, Object>> entrySet = source.entrySet(); - for (final Map.Entry<String, Object> entry : entrySet) - { - - final String key = entry.getKey(); - final String segments[] = fastTokenSplit(key); - if (segments.length == 0) - { - continue; - } - IPropertySymbol property = (IPropertySymbol) segmentMap - .get(segments[0]); - - if (property == null) - { - final Object propValue = entry.getValue(); - property = SymbolFactory.eINSTANCE.createIPropertySymbol(); - property.setName(segments[0]); - ITypeDescriptor typeDesc = null; - - // TODO: need wrapper object to rationalize - if (propValue != null) - { - if (propValue instanceof IType) - { - typeDesc = SymbolFactory.eINSTANCE - .createIJavaTypeDescriptor2(); - ((IJavaTypeDescriptor2) typeDesc) - .setType((IType) propValue); - } else if (propValue instanceof IInstanceSymbol) - { - typeDesc = ((IInstanceSymbol) propValue) - .getTypeDescriptor(); - } else if (propValue instanceof IPropertySymbol) - { - typeDesc = ((IPropertySymbol) propValue) - .getTypeDescriptor(); - } else - { - final String className = propValue.getClass().getName(); - final String typeSignature = Signature - .createTypeSignature(className, true); - typeDesc = SymbolFactory.eINSTANCE - .createIMapTypeDescriptor(); - ((IMapTypeDescriptor) typeDesc) - .setMapSource(new HashMap()); - ((IMapTypeDescriptor) typeDesc) - .setTypeSignatureDelegate(typeSignature); - // inherit this descriptor's mutability - ((IMapTypeDescriptor) typeDesc) - .setImmutable(isImmutable()); - property.setIntermediate(true); // set the property as - // intermediate until we - // find out different - } - - property.setTypeDescriptor(typeDesc); - property.setReadable(true); - // is only writable if map is not immutable - property.setWritable(!isImmutable()); - } - - segmentMap.put(segments[0], property); - } - - final ITypeDescriptor typeDesc = property.getTypeDescriptor(); - - if (typeDesc instanceof IMapTypeDescriptor) - { - if (segments.length == 1) - { - // TODO: not always allowed - // ((IMapTypeDescriptor)typeDesc).getMapSource().put(null, - // source.get(key)); - // property is more than simply intermediate - property.setIntermediate(false); - } else - { - ((IMapTypeDescriptor) typeDesc).getMapSource().put( - key.substring(key.indexOf('.') + 1), - entry.getValue()); - } - } - } - - return segmentMap; - } - - /** - * Based on measurements, this beats Pattern.split by 15-30% even with - * a pre-compiled pattern. - * - * @param splitValue - * @return the array of strings split by the '.' token - */ - private static String[] fastTokenSplit(final String splitValue) - { - if (splitValue == null || splitValue.length() == 0) - { - return new String[0]; - } - if (splitValue.indexOf('.') > -1) - { - return tokenizerSplit(splitValue); - } - return new String[] {splitValue}; - } - - private static String[] tokenizerSplit(final String splitValue) - { - StringTokenizer stringTokenizer = new StringTokenizer(splitValue, "."); - // initialize to a large size, since we're just going to truncate - // it once at the end and want to reduce the chance of resize during - // the loop. - final List<String> splitValues = new ArrayList<String>(32); - - while (stringTokenizer.hasMoreTokens()) - { - splitValues.add(stringTokenizer.nextToken()); - } - - return splitValues.toArray(new String[0]); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the object for the feature id - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE: - return getMapSource(); - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE: - return isImmutable() ? Boolean.TRUE : Boolean.FALSE; - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE: - setMapSource((Map)newValue); - return; - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE: - setImmutable(((Boolean)newValue).booleanValue()); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE: - setMapSource(MAP_SOURCE_EDEFAULT); - return; - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE: - setImmutable(IMMUTABLE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if is set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE: - return MAP_SOURCE_EDEFAULT == null ? mapSource != null : !MAP_SOURCE_EDEFAULT.equals(mapSource); - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE: - return immutable != IMMUTABLE_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (mapSource: "); //$NON-NLS-1$ - result.append(mapSource); - result.append(", immutable: "); //$NON-NLS-1$ - result.append(immutable); - result.append(')'); - return result.toString(); - } - -} //IMapTypeDescriptorImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java deleted file mode 100644 index 2e9a75ed6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java +++ /dev/null @@ -1,239 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IMethod Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getSignature <em>Signature</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IMethodSymbolImpl extends EObjectImpl implements IMethodSymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSignature() - * @generated - * @ordered - */ - protected static final String SIGNATURE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSignature() - * @generated - * @ordered - */ - protected String signature = SIGNATURE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IMethodSymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static eclass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IMETHOD_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return the method name - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * @param newName - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * @return the method signature in JVM/JDT form - * <!-- end-user-doc --> - * @generated - */ - public String getSignature() { - return signature; - } - - /** - * <!-- begin-user-doc --> - * @param newSignature - * <!-- end-user-doc --> - * @generated - */ - public void setSignature(String newSignature) { - String oldSignature = signature; - signature = newSignature; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__SIGNATURE, oldSignature, signature)); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the property as a feature object - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IMETHOD_SYMBOL__NAME: - return getName(); - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: - return getSignature(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IMETHOD_SYMBOL__NAME: - setName((String)newValue); - return; - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: - setSignature((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IMETHOD_SYMBOL__NAME: - setName(NAME_EDEFAULT); - return; - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: - setSignature(SIGNATURE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if the feature has been set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IMETHOD_SYMBOL__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: - return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the raw string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", signature: "); //$NON-NLS-1$ - result.append(signature); - result.append(')'); - return result.toString(); - } - -} //IMethodSymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java deleted file mode 100644 index 64d314e7e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java +++ /dev/null @@ -1,469 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IProperty Symbol</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isReadable <em>Readable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isWritable <em>Writable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isIntermediate <em>Intermediate</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class IPropertySymbolImpl extends EObjectImpl implements IPropertySymbol { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeDescriptor() - * @generated - * @ordered - */ - protected ITypeDescriptor typeDescriptor = null; - - - /** - * Set to true if this property symbol is readable - */ - protected boolean isReadable = READABLE_EDEFAULT; - - /** - * Set to true if this property symbol is writable - */ - protected boolean isWritable = WRITABLE_EDEFAULT; - - /** - * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isReadable() - * @generated - * @ordered - */ - protected static final boolean READABLE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isReadable() - * @generated - * @ordered - */ - protected boolean readable = READABLE_EDEFAULT; - - /** - * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isWritable() - * @generated - * @ordered - */ - protected static final boolean WRITABLE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isWritable() - * @generated - * @ordered - */ - protected boolean writable = WRITABLE_EDEFAULT; - - /** - * The default value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isIntermediate() - * @generated - * @ordered - */ - protected static final boolean INTERMEDIATE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isIntermediate() - * @generated - * @ordered - */ - protected boolean intermediate = INTERMEDIATE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IPropertySymbolImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static eClass - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.IPROPERTY_SYMBOL; - } - - /** - * <!-- begin-user-doc --> - * @return return the property name - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * @param newName the new name of the property - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * @return the property's type descriptor ?? can be null ?? - * <!-- end-user-doc --> - * @generated - */ - public ITypeDescriptor getTypeDescriptor() { - if (typeDescriptor != null && typeDescriptor.eIsProxy()) { - InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor; - typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor); - if (typeDescriptor != oldTypeDescriptor) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor)); - } - } - return typeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @return the type descriptor - * <!-- end-user-doc --> - * @generated - */ - public ITypeDescriptor basicGetTypeDescriptor() { - return typeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @param newTypeDescriptor - * <!-- end-user-doc --> - * @generated - */ - public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) { - ITypeDescriptor oldTypeDescriptor = typeDescriptor; - typeDescriptor = newTypeDescriptor; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor)); - } - - /** - * <!-- begin-user-doc --> - * @return true if property is readable - * <!-- end-user-doc --> - * @generated - */ - public boolean isReadable() { - return readable; - } - - /** - * <!-- begin-user-doc --> - * @param newReadable - * <!-- end-user-doc --> - * @generated - */ - public void setReadable(boolean newReadable) { - boolean oldReadable = readable; - readable = newReadable; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__READABLE, oldReadable, readable)); - } - - /** - * <!-- begin-user-doc --> - * @return true if property is writable - * <!-- end-user-doc --> - * @generated - */ - public boolean isWritable() { - return writable; - } - - /** - * <!-- begin-user-doc --> - * @param newWritable - * <!-- end-user-doc --> - * @generated - */ - public void setWritable(boolean newWritable) { - boolean oldWritable = writable; - writable = newWritable; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__WRITABLE, oldWritable, writable)); - } - - /** - * <!-- begin-user-doc --> - * @return true if this property is intermediate and has no value of it's own - * besides as a path to it's own properties. This is used to support the - * situation in JSF where a map-based property can have dots in it (i.e. - * a loadBundle key my.property) and so creates a (discouraged) ambiguous - * situation where a property like #{x.y.z) really corresponds to a key - * "y.z" in a property file pointed to by "x" instead of there being an - * actual y property on x that has value in and of itself (in this case - * "#{x.y}" is invalid even though "#{x.y.z}" is valid). - * <!-- end-user-doc --> - * @generated - */ - public boolean isIntermediate() { - return intermediate; - } - - /** - * <!-- begin-user-doc --> - * @param newIntermediate - * <!-- end-user-doc --> - * @generated - */ - public void setIntermediate(boolean newIntermediate) { - boolean oldIntermediate = intermediate; - intermediate = newIntermediate; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE, oldIntermediate, intermediate)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean supportsCoercion(String typeSignature) { - // TODO: for now, not supported on generic properties - return false; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ITypeDescriptor coerce(String typeSignature) - { - // TODO: for now, no generic property type coercion - return getTypeDescriptor(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ISymbol call(String methodName, EList methodArguments, String symbolName) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return the eObject for the featureID - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.IPROPERTY_SYMBOL__NAME: - return getName(); - case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR: - if (resolve) return getTypeDescriptor(); - return basicGetTypeDescriptor(); - case SymbolPackage.IPROPERTY_SYMBOL__READABLE: - return isReadable() ? Boolean.TRUE : Boolean.FALSE; - case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE: - return isWritable() ? Boolean.TRUE : Boolean.FALSE; - case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE: - return isIntermediate() ? Boolean.TRUE : Boolean.FALSE; - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID -- set the feature - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.IPROPERTY_SYMBOL__NAME: - setName((String)newValue); - return; - case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR: - setTypeDescriptor((ITypeDescriptor)newValue); - return; - case SymbolPackage.IPROPERTY_SYMBOL__READABLE: - setReadable(((Boolean)newValue).booleanValue()); - return; - case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE: - setWritable(((Boolean)newValue).booleanValue()); - return; - case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE: - setIntermediate(((Boolean)newValue).booleanValue()); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID -- unset the feature - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.IPROPERTY_SYMBOL__NAME: - setName(NAME_EDEFAULT); - return; - case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR: - setTypeDescriptor((ITypeDescriptor)null); - return; - case SymbolPackage.IPROPERTY_SYMBOL__READABLE: - setReadable(READABLE_EDEFAULT); - return; - case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE: - setWritable(WRITABLE_EDEFAULT); - return; - case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE: - setIntermediate(INTERMEDIATE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if is set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.IPROPERTY_SYMBOL__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR: - return typeDescriptor != null; - case SymbolPackage.IPROPERTY_SYMBOL__READABLE: - return readable != READABLE_EDEFAULT; - case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE: - return writable != WRITABLE_EDEFAULT; - case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE: - return intermediate != INTERMEDIATE_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the string representation - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ - result.append(name); - result.append(", readable: "); //$NON-NLS-1$ - result.append(readable); - result.append(", writable: "); //$NON-NLS-1$ - result.append(writable); - result.append(", intermediate: "); //$NON-NLS-1$ - result.append(intermediate); - result.append(')'); - return result.toString(); - } - -} //IPropertySymbolImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java deleted file mode 100644 index b23a30329..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java +++ /dev/null @@ -1,521 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.Collection; -import java.util.Iterator; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.emf.ecore.util.EDataTypeEList; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>IType Descriptor</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties <em>Properties</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature <em>Type Signature</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures <em>Super Type Signatures</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignatureDelegate <em>Type Signature Delegate</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getMethods <em>Methods</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public abstract class ITypeDescriptorImpl extends EObjectImpl implements ITypeDescriptor { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getTypeSignature() <em>Type Signature</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeSignature() - * @generated - * @ordered - */ - protected static final String TYPE_SIGNATURE_EDEFAULT = ""; //$NON-NLS-1$ - - /** - * The default value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeSignatureDelegate() - * @generated - * @ordered - */ - protected static final String TYPE_SIGNATURE_DELEGATE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeSignatureDelegate() - * @generated - * @ordered - */ - protected String typeSignatureDelegate = TYPE_SIGNATURE_DELEGATE_EDEFAULT; - - /** - * The cached value of the '{@link #getTypeParameterSignatures() <em>Type Parameter Signatures</em>}' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTypeParameterSignatures() - * @generated - * @ordered - */ - protected EList typeParameterSignatures; - - /** - * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJdtContext() - * @generated - * @ordered - */ - protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null; - - /** - * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getJdtContext() - * @generated - * @ordered - */ - protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT; - - /** - * The default value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isEnumType() - * @generated - * @ordered - */ - protected static final boolean ENUM_TYPE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isEnumType() - * @generated - * @ordered - */ - protected boolean enumType = ENUM_TYPE_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ITypeDescriptorImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @return the static class - * <!-- end-user-doc --> - * @generated - */ - protected EClass eStaticClass() { - return SymbolPackage.Literals.ITYPE_DESCRIPTOR; - } - - /** - * <!-- begin-user-doc --> - * @return get properties for this type - * <!-- end-user-doc --> - * @generated NOT - */ - public abstract EList getProperties(); - - /** - * <!-- begin-user-doc --> - * @return the type signature in JVM/JDT signature form - * <!-- end-user-doc --> - * @generated NOT - */ - public abstract String getTypeSignature(); - - /** - * <!-- begin-user-doc --> - * @return the list of super types - * <!-- end-user-doc --> - * @generated NOT - */ - public abstract EList getSuperTypeSignatures(); - - /** - * <!-- begin-user-doc --> - * @return the list of implemented interfaces - * <!-- end-user-doc --> - * @generated NOT - */ - public abstract EList getInterfaceTypeSignatures(); - - /** - * <!-- begin-user-doc --> - * @return the type signature delegate. The descriptor may choose to use - * this delegate it if it is set and it cannot derive this information - * from other properties - * <!-- end-user-doc --> - * @generated - */ - public String getTypeSignatureDelegate() { - return typeSignatureDelegate; - } - - /** - * <!-- begin-user-doc --> - * @param newTypeSignatureDelegate - * <!-- end-user-doc --> - * @generated - */ - public void setTypeSignatureDelegate(String newTypeSignatureDelegate) { - String oldTypeSignatureDelegate = typeSignatureDelegate; - typeSignatureDelegate = newTypeSignatureDelegate; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE, oldTypeSignatureDelegate, typeSignatureDelegate)); - } - - /** - * <!-- begin-user-doc --> - * @return the methods for this type or empty list if none exist - * <!-- end-user-doc --> - * @generated NOT - */ - public abstract EList getMethods(); - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList getTypeParameterSignatures() { - if (typeParameterSignatures == null) { - typeParameterSignatures = new EDataTypeEList(String.class, this, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES); - } - return typeParameterSignatures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IJavaElement getJdtContext() { - return jdtContext; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setJdtContext(IJavaElement newJdtContext) { - IJavaElement oldJdtContext = jdtContext; - jdtContext = newJdtContext; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__JDT_CONTEXT, oldJdtContext, jdtContext)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean isEnumType() { - return enumType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setEnumType(boolean newEnumType) { - boolean oldEnumType = enumType; - enumType = newEnumType; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__ENUM_TYPE, oldEnumType, enumType)); - } - - /** - * <!-- begin-user-doc --> - * Note about generics: - * - * This call mimics the runtime instanceOf to the degree possible. - * Therefore, any type parameters (<...>) in typeSignature will be - * deleted using Signature.getTypeErasure() since this data won't be - * available at runtime. - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean instanceOf(final String typeSignature) - { - final String typeErasedSignature = Signature.getTypeErasure(typeSignature); - - if (Signature.getTypeErasure(getTypeSignature()) != null - && Signature.getTypeErasure(getTypeSignature()).equals(typeErasedSignature)) - { - return true; - } - - for (final Iterator it = getSuperTypeSignatures().iterator(); it.hasNext();) - { - final String superType = (String) it.next(); - - if (Signature.getTypeErasure(superType).equals(typeErasedSignature)) - { - return true; - } - } - - for (final Iterator it = getInterfaceTypeSignatures().iterator(); it.hasNext();) - { - final String superType = (String) it.next(); - - if (Signature.getTypeErasure(superType).equals(typeErasedSignature)) - { - return true; - } - } - - return false; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public boolean isArray() - { - return Signature.getArrayCount(getTypeSignature()) > 0; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public IObjectSymbol getArrayElement() - { - if (isArray()) - { - // sub-class of ITypeDescriptor must implement this if they which to provide - // array element support - throw new UnsupportedOperationException("Base type descriptor does not support this function"); //$NON-NLS-1$ - } - - // shouldn't be called if not an array - return null; - } - - /** - /** - * <!-- begin-user-doc --> - * - * Tries to load an IType for a fully resolved (i.e. starts with L not Q) - * type signature using the current jdtContext. - * - * @return the resolved IType or null if none could be resolved. - * - * <!-- end-user-doc --> - * @generated NOT - */ - public IType resolveType(String resolvedTypeSignature) - { - // we need to obtain an IJavaProject within which to resolve - // the type. - IJavaProject project = null; - - // see if a jdtContext hint has been set - if (getJdtContext() != null) - { - project = getJdtContext().getJavaProject(); - } - - if (project != null) - { - return TypeUtil.resolveType(project, resolvedTypeSignature); - } - - return null; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated NOT - */ - public ISymbol calculateSyntheticCall(String methodName, EList methodArgs, String symbolName) { - // sub-classes need only implement if they have something meaningful - // the want to do here - // by default return null to indicate this type descriptor doesn't - // wish to handle calls - return null; - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param resolve - * @param coreType - * @return get the feature - * <!-- end-user-doc --> - * @generated - */ - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES: - return getProperties(); - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE: - return getTypeSignature(); - case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES: - return getSuperTypeSignatures(); - case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES: - return getInterfaceTypeSignatures(); - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE: - return getTypeSignatureDelegate(); - case SymbolPackage.ITYPE_DESCRIPTOR__METHODS: - return getMethods(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @param newValue - * <!-- end-user-doc --> - * @generated - */ - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES: - getProperties().clear(); - getProperties().addAll((Collection)newValue); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES: - getSuperTypeSignatures().clear(); - getSuperTypeSignatures().addAll((Collection)newValue); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES: - getInterfaceTypeSignatures().clear(); - getInterfaceTypeSignatures().addAll((Collection)newValue); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE: - setTypeSignatureDelegate((String)newValue); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__METHODS: - getMethods().clear(); - getMethods().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * <!-- end-user-doc --> - * @generated - */ - public void eUnset(int featureID) { - switch (featureID) { - case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES: - getProperties().clear(); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES: - getSuperTypeSignatures().clear(); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES: - getInterfaceTypeSignatures().clear(); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE: - setTypeSignatureDelegate(TYPE_SIGNATURE_DELEGATE_EDEFAULT); - return; - case SymbolPackage.ITYPE_DESCRIPTOR__METHODS: - getMethods().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * @param featureID - * @return true if feature has been set - * <!-- end-user-doc --> - * @generated - */ - public boolean eIsSet(int featureID) { - switch (featureID) { - case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES: - return !getProperties().isEmpty(); - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE: - return TYPE_SIGNATURE_EDEFAULT == null ? getTypeSignature() != null : !TYPE_SIGNATURE_EDEFAULT.equals(getTypeSignature()); - case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES: - return !getSuperTypeSignatures().isEmpty(); - case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES: - return !getInterfaceTypeSignatures().isEmpty(); - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE: - return TYPE_SIGNATURE_DELEGATE_EDEFAULT == null ? typeSignatureDelegate != null : !TYPE_SIGNATURE_DELEGATE_EDEFAULT.equals(typeSignatureDelegate); - case SymbolPackage.ITYPE_DESCRIPTOR__METHODS: - return !getMethods().isEmpty(); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * @return the debug string format of the type signature - * <!-- end-user-doc --> - * @generated - */ - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (typeSignatureDelegate: "); //$NON-NLS-1$ - result.append(typeSignatureDelegate); - result.append(')'); - return result.toString(); - } -} //ITypeDescriptorImpl - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java deleted file mode 100644 index d6353752c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java +++ /dev/null @@ -1,104 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.io.IOException; -import java.io.Reader; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.ui.JavadocContentAccess; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.util.JDTBeanProperty; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; - -/** - * Utility class for accessing jdt elements for jsf el symbols - */ -public class JavaUtil { - - private JavaUtil() { - // utility class - } - - /** - * @param method - * @return the javadoc text for the given method. Will return null if no javadoc is found - */ - public static String getMethodJavadoc(final IMethod method) { - try { - final Reader contentReader = JavadocContentAccess.getHTMLContentReader(method, true, true); - if (contentReader != null) { - return read(contentReader); - } - } catch (final JavaModelException e) { - JSFCommonPlugin.log(IStatus.WARNING, "error reading javadoc for method '" + method.getElementName() + "'.", e); //$NON-NLS-1$ //$NON-NLS-2$ - } - return null; - } - - private static String read(final Reader rd) { - final StringBuffer buffer= new StringBuffer(); - final char[] readBuffer= new char[2048]; - - try { - int n= rd.read(readBuffer); - while (n > 0) { - buffer.append(readBuffer, 0, n); - n= rd.read(readBuffer); - } - return buffer.toString(); - } catch (final IOException x) { - // should not happen, but otherwise simply ignore - } - - return null; - } - - /** - * @param symbol - the method symbol to look for - * @return the IMethod for the given method symbol. Will return <code>null</code>, if none is found. - */ - public static IMethod findCorrespondingMethod(final IBeanMethodSymbol symbol) { - final IType type = symbol.getOwner().getType(); - final JDTBeanIntrospector introspector = new JDTBeanIntrospector(type); - final IMethod[] methods = introspector.getAllMethods(); - for (final IMethod method : methods) { - if (method.getElementName().equals(symbol.getName())) { - try { - final String currentMethodsSignature = TypeUtil.resolveMethodSignature(method.getDeclaringType(), - method.getSignature()); - if (currentMethodsSignature.equals(symbol.getSignature())) { - return method; - } - } catch (final JavaModelException e) { - JSFCommonPlugin.log(IStatus.WARNING, "error determining for method '" //$NON-NLS-1$ - + method.getElementName() + "'.", e); //$NON-NLS-1$ - } - } - } - return null; - } - - /** - * @param propertySymbol - the property symbol to look for - * @return a JDTBeanProperty for the given property symbol - */ - public static JDTBeanProperty findCorrespondingJDTProperty(final IBeanPropertySymbol propertySymbol) { - final JDTBeanIntrospector introspector = new JDTBeanIntrospector(propertySymbol.getOwner().getType()); - return introspector.getProperties().get(propertySymbol.getName()); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java deleted file mode 100644 index f731e4b5b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/*package*/ class Messages -{ - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.context.symbol.internal.impl.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() - { - // no external instantiation - } - - public static String getString(String key) - { - try - { - return RESOURCE_BUNDLE.getString(key); - } - catch (MissingResourceException e) - { - return '!' + key + '!'; - } - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java deleted file mode 100644 index 75c59b868..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java +++ /dev/null @@ -1,426 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.impl.EFactoryImpl; -import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IType; -import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Factory</b>. - * <!-- end-user-doc --> - * @generated - */ -public class SymbolFactoryImpl extends EFactoryImpl implements SymbolFactory { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * Creates the default factory implementation. - * <!-- begin-user-doc --> - * @return the SymbolFactory - * <!-- end-user-doc --> - * @generated - */ - public static SymbolFactory init() { - try { - SymbolFactory theSymbolFactory = (SymbolFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/jsf/context/symbol.ecore"); //$NON-NLS-1$ - if (theSymbolFactory != null) { - return theSymbolFactory; - } - } - catch (Exception exception) { - EcorePlugin.INSTANCE.log(exception); - } - return new SymbolFactoryImpl(); - } - - /** - * Creates an instance of the factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public SymbolFactoryImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * @param eClass - * @return the model instace for the model class - * <!-- end-user-doc --> - * @generated - */ - public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) { - case SymbolPackage.IBEAN_INSTANCE_SYMBOL: return createIBeanInstanceSymbol(); - case SymbolPackage.IBEAN_PROPERTY_SYMBOL: return createIBeanPropertySymbol(); - case SymbolPackage.IINSTANCE_SYMBOL: return createIInstanceSymbol(); - case SymbolPackage.IJAVA_SYMBOL: return createIJavaSymbol(); - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: return createIJavaTypeDescriptor2(); - case SymbolPackage.IBEAN_METHOD_SYMBOL: return createIBeanMethodSymbol(); - case SymbolPackage.ICOMPONENT_SYMBOL: return createIComponentSymbol(); - case SymbolPackage.IPROPERTY_SYMBOL: return createIPropertySymbol(); - case SymbolPackage.IMAP_TYPE_DESCRIPTOR: return createIMapTypeDescriptor(); - case SymbolPackage.IMETHOD_SYMBOL: return createIMethodSymbol(); - case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: return createIBoundedMapTypeDescriptor(); - case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: return createIBoundedJavaTypeDescriptor(); - case SymbolPackage.ILIST_TYPE_DESCRIPTOR: return createIListTypeDescriptor(); - case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: return createIBoundedListTypeDescriptor(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param initialValue - * @return an object constructed from the initialValue string - * <!-- end-user-doc --> - * @generated - */ - public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) { - case SymbolPackage.ERUNTIME_SOURCE: - return createERuntimeSourceFromString(eDataType, initialValue); - case SymbolPackage.ITYPE: - return createITypeFromString(eDataType, initialValue); - case SymbolPackage.IJAVA_ELEMENT: - return createIJavaElementFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param instanceValue - * @return the string equivelent of eDataType for the instance - * <!-- end-user-doc --> - * @generated - */ - public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) { - case SymbolPackage.ERUNTIME_SOURCE: - return convertERuntimeSourceToString(eDataType, instanceValue); - case SymbolPackage.ITYPE: - return convertITypeToString(eDataType, instanceValue); - case SymbolPackage.IJAVA_ELEMENT: - return convertIJavaElementToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * <!-- begin-user-doc --> - * @return a new bean instance symbol - * <!-- end-user-doc --> - * @generated - */ - public IBeanInstanceSymbol createIBeanInstanceSymbol() { - IBeanInstanceSymbolImpl iBeanInstanceSymbol = new IBeanInstanceSymbolImpl(); - return iBeanInstanceSymbol; - } - - /** - * <!-- begin-user-doc --> - * @return a new bean property symbol - * <!-- end-user-doc --> - * @generated - */ - public IBeanPropertySymbol createIBeanPropertySymbol() { - IBeanPropertySymbolImpl iBeanPropertySymbol = new IBeanPropertySymbolImpl(); - return iBeanPropertySymbol; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IInstanceSymbol createIInstanceSymbol() { - IInstanceSymbolImpl iInstanceSymbol = new IInstanceSymbolImpl(); - return iInstanceSymbol; - } - - /** - * <!-- begin-user-doc --> - * @return a new java symbol - * <!-- end-user-doc --> - * @generated - */ - public IJavaSymbol createIJavaSymbol() { - IJavaSymbolImpl iJavaSymbol = new IJavaSymbolImpl(); - return iJavaSymbol; - } - - /** - * <!-- begin-user-doc --> - * @return a new java type descriptor - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2 createIJavaTypeDescriptor2() { - IJavaTypeDescriptor2Impl iJavaTypeDescriptor2 = new IJavaTypeDescriptor2Impl(); - return iJavaTypeDescriptor2; - } - - /** - * <!-- begin-user-doc --> - * @return a new bean method symbol - * <!-- end-user-doc --> - * @generated - */ - public IBeanMethodSymbol createIBeanMethodSymbol() { - IBeanMethodSymbolImpl iBeanMethodSymbol = new IBeanMethodSymbolImpl(); - return iBeanMethodSymbol; - } - - /** - * <!-- begin-user-doc --> - * @return a new component derived symbol - * <!-- end-user-doc --> - * @generated - */ - public IComponentSymbol createIComponentSymbol() { - IComponentSymbolImpl iComponentSymbol = new IComponentSymbolImpl(); - return iComponentSymbol; - } - - /** - * <!-- begin-user-doc --> - * @return a new property symbol - * <!-- end-user-doc --> - * @generated - */ - public IPropertySymbol createIPropertySymbol() { - IPropertySymbolImpl iPropertySymbol = new IPropertySymbolImpl(); - return iPropertySymbol; - } - - /** - * <!-- begin-user-doc --> - * @return create map type descriptor - * <!-- end-user-doc --> - * @generated - */ - public IMapTypeDescriptor createIMapTypeDescriptor() { - IMapTypeDescriptorImpl iMapTypeDescriptor = new IMapTypeDescriptorImpl(); - return iMapTypeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @return the method symbol - * <!-- end-user-doc --> - * @generated - */ - public IMethodSymbol createIMethodSymbol() { - IMethodSymbolImpl iMethodSymbol = new IMethodSymbolImpl(); - return iMethodSymbol; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IBoundedMapTypeDescriptor createIBoundedMapTypeDescriptor() { - IBoundedMapTypeDescriptorImpl iBoundedMapTypeDescriptor = new IBoundedMapTypeDescriptorImpl(); - return iBoundedMapTypeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IBoundedJavaTypeDescriptor createIBoundedJavaTypeDescriptor() { - IBoundedJavaTypeDescriptorImpl iBoundedJavaTypeDescriptor = new IBoundedJavaTypeDescriptorImpl(); - return iBoundedJavaTypeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IListTypeDescriptor createIListTypeDescriptor() { - IListTypeDescriptorImpl iListTypeDescriptor = new IListTypeDescriptorImpl(); - return iListTypeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public IBoundedListTypeDescriptor createIBoundedListTypeDescriptor() { - IBoundedListTypeDescriptorImpl iBoundedListTypeDescriptor = new IBoundedListTypeDescriptorImpl(); - return iBoundedListTypeDescriptor; - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param initialValue - * @return - * <!-- end-user-doc --> - * @generated - */ - public ERuntimeSource createERuntimeSourceFromString(EDataType eDataType, String initialValue) { - ERuntimeSource result = ERuntimeSource.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; - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param instanceValue - * @return the converted runtime source - * <!-- end-user-doc --> - * @generated - */ - public String convertERuntimeSourceToString(EDataType eDataType, Object instanceValue) { - return instanceValue == null ? null : instanceValue.toString(); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param initialValue - * @return - * <!-- end-user-doc --> - * @generated - */ - public IType createITypeFromString(EDataType eDataType, String initialValue) { - return (IType)super.createFromString(eDataType, initialValue); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param instanceValue - * @return the converted string - * <!-- end-user-doc --> - * @generated - */ - public String convertITypeToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param initialValue - * @return return the java element - * <!-- end-user-doc --> - * @generated - */ - public IJavaElement createIJavaElementFromString(EDataType eDataType, String initialValue) { - return (IJavaElement)super.createFromString(eDataType, initialValue); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param instanceValue - * @return the converted string - * <!-- end-user-doc --> - * @generated - */ - public String convertIJavaElementToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param initialValue - * @return the value type for the data type - * <!-- end-user-doc --> - * @generated - */ - public ValueType createValueTypeFromString(EDataType eDataType, String initialValue) { - return (ValueType)super.createFromString(eDataType, initialValue); - } - - /** - * <!-- begin-user-doc --> - * @param eDataType - * @param instanceValue - * @return the string for the value type - * <!-- end-user-doc --> - * @generated - */ - public String convertValueTypeToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - - /** - * <!-- begin-user-doc --> - * @return the symbol package - * <!-- end-user-doc --> - * @generated - */ - public SymbolPackage getSymbolPackage() { - return (SymbolPackage)getEPackage(); - } - - /** - * <!-- begin-user-doc --> - * @return get the symbol package - * <!-- end-user-doc --> - * @deprecated - * @generated - */ - public static SymbolPackage getPackage() { - return SymbolPackage.eINSTANCE; - } - -} //SymbolFactoryImpl - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java deleted file mode 100644 index 707b17673..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java +++ /dev/null @@ -1,1032 +0,0 @@ -/** - * Copyright 2006 Oracle - * - * $Id: SymbolPackageImpl.java,v 1.7 2007/09/24 23:25:39 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; -import org.eclipse.emf.ecore.EEnum; -import org.eclipse.emf.ecore.EOperation; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; - -import org.eclipse.emf.ecore.impl.EPackageImpl; - -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IType; - -import org.eclipse.jst.jsf.common.internal.types.ValueType; - -import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * <!-- begin-user-doc --> - * An implementation of the model <b>Package</b>. - * <!-- end-user-doc --> - * @generated - */ -public class SymbolPackageImpl extends EPackageImpl implements SymbolPackage { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBeanInstanceSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBeanPropertySymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iInstanceSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iJavaSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iDescribedInDetailEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iJavaTypeDescriptor2EClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBeanMethodSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iComponentSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iPropertySymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iMapTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iMethodSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iObjectSymbolEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBoundedTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBoundedMapTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBoundedJavaTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iListTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass iBoundedListTypeDescriptorEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EEnum eRuntimeSourceEEnum = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType iTypeEDataType = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType iJavaElementEDataType = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EDataType valueTypeEDataType = null; - - /** - * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - * <p>Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#eNS_URI - * @see #init() - * @generated - */ - private SymbolPackageImpl() { - super(eNS_URI, SymbolFactory.eINSTANCE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the <b>Package</b> for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - * <p>Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - * <p>Invocation of this method will not affect any packages that have - * already been initialized. - * <!-- begin-user-doc --> - * @return the symbols package - * <!-- end-user-doc --> - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static SymbolPackage init() { - if (isInited) return (SymbolPackage)EPackage.Registry.INSTANCE.getEPackage(SymbolPackage.eNS_URI); - - // Obtain or create and register package - SymbolPackageImpl theSymbolPackage = (SymbolPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SymbolPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SymbolPackageImpl()); - - isInited = true; - - // Create package meta-data objects - theSymbolPackage.createPackageContents(); - - // Initialize created meta-data - theSymbolPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theSymbolPackage.freeze(); - - return theSymbolPackage; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBeanInstanceSymbol() { - return iBeanInstanceSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIBeanInstanceSymbol_Properties() { - return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIBeanInstanceSymbol_Methods() { - return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBeanPropertySymbol() { - return iBeanPropertySymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIBeanPropertySymbol_Owner() { - return (EReference)iBeanPropertySymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIInstanceSymbol() { - return iInstanceSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIInstanceSymbol_TypeResolved() { - return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIInstanceSymbol_RuntimeSource() { - return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIJavaSymbol() { - return iJavaSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIJavaSymbol_JavaElement() { - return (EAttribute)iJavaSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getISymbol() { - return iSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getISymbol_Name() { - return (EAttribute)iSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getITypeDescriptor() { - return iTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getITypeDescriptor_Properties() { - return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_TypeSignature() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_SuperTypeSignatures() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_InterfaceTypeSignatures() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(3); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_TypeSignatureDelegate() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(4); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getITypeDescriptor_Methods() { - return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(5); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_TypeParameterSignatures() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(6); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_JdtContext() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(7); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getITypeDescriptor_EnumType() { - return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(8); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIDescribedInDetail() { - return iDescribedInDetailEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIJavaTypeDescriptor2() { - return iJavaTypeDescriptor2EClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIJavaTypeDescriptor2_Type() { - return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIJavaTypeDescriptor2_BeanProperties() { - return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIJavaTypeDescriptor2_BeanMethods() { - return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIJavaTypeDescriptor2_ArrayCount() { - return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(3); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBeanMethodSymbol() { - return iBeanMethodSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIBeanMethodSymbol_Owner() { - return (EReference)iBeanMethodSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIComponentSymbol() { - return iComponentSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIPropertySymbol() { - return iPropertySymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIPropertySymbol_Intermediate() { - return (EAttribute)iPropertySymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIMapTypeDescriptor() { - return iMapTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIMapTypeDescriptor_MapSource() { - return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIMapTypeDescriptor_Immutable() { - return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIMethodSymbol() { - return iMethodSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIMethodSymbol_Signature() { - return (EAttribute)iMethodSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIObjectSymbol() { - return iObjectSymbolEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EReference getIObjectSymbol_TypeDescriptor() { - return (EReference)iObjectSymbolEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIObjectSymbol_Readable() { - return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIObjectSymbol_Writable() { - return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(2); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBoundedTypeDescriptor() { - return iBoundedTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBoundedMapTypeDescriptor() { - return iBoundedMapTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBoundedJavaTypeDescriptor() { - return iBoundedJavaTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIListTypeDescriptor() { - return iListTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EAttribute getIListTypeDescriptor_ListSource() { - return (EAttribute)iListTypeDescriptorEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EClass getIBoundedListTypeDescriptor() { - return iBoundedListTypeDescriptorEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EEnum getERuntimeSource() { - return eRuntimeSourceEEnum; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getIType() { - return iTypeEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getIJavaElement() { - return iJavaElementEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EDataType getValueType() { - return valueTypeEDataType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public SymbolFactory getSymbolFactory() { - return (SymbolFactory)getEFactoryInstance(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - iBeanInstanceSymbolEClass = createEClass(IBEAN_INSTANCE_SYMBOL); - createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__PROPERTIES); - createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__METHODS); - - iBeanPropertySymbolEClass = createEClass(IBEAN_PROPERTY_SYMBOL); - createEReference(iBeanPropertySymbolEClass, IBEAN_PROPERTY_SYMBOL__OWNER); - - iInstanceSymbolEClass = createEClass(IINSTANCE_SYMBOL); - createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__TYPE_RESOLVED); - createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__RUNTIME_SOURCE); - - iJavaSymbolEClass = createEClass(IJAVA_SYMBOL); - createEAttribute(iJavaSymbolEClass, IJAVA_SYMBOL__JAVA_ELEMENT); - - iSymbolEClass = createEClass(ISYMBOL); - createEAttribute(iSymbolEClass, ISYMBOL__NAME); - - iTypeDescriptorEClass = createEClass(ITYPE_DESCRIPTOR); - createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__PROPERTIES); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE); - createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__METHODS); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__JDT_CONTEXT); - createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__ENUM_TYPE); - - iDescribedInDetailEClass = createEClass(IDESCRIBED_IN_DETAIL); - - iJavaTypeDescriptor2EClass = createEClass(IJAVA_TYPE_DESCRIPTOR2); - createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__TYPE); - createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES); - createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS); - createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT); - - iBeanMethodSymbolEClass = createEClass(IBEAN_METHOD_SYMBOL); - createEReference(iBeanMethodSymbolEClass, IBEAN_METHOD_SYMBOL__OWNER); - - iComponentSymbolEClass = createEClass(ICOMPONENT_SYMBOL); - - iPropertySymbolEClass = createEClass(IPROPERTY_SYMBOL); - createEAttribute(iPropertySymbolEClass, IPROPERTY_SYMBOL__INTERMEDIATE); - - iMapTypeDescriptorEClass = createEClass(IMAP_TYPE_DESCRIPTOR); - createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__MAP_SOURCE); - createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__IMMUTABLE); - - iMethodSymbolEClass = createEClass(IMETHOD_SYMBOL); - createEAttribute(iMethodSymbolEClass, IMETHOD_SYMBOL__SIGNATURE); - - iObjectSymbolEClass = createEClass(IOBJECT_SYMBOL); - createEReference(iObjectSymbolEClass, IOBJECT_SYMBOL__TYPE_DESCRIPTOR); - createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__READABLE); - createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__WRITABLE); - - iBoundedTypeDescriptorEClass = createEClass(IBOUNDED_TYPE_DESCRIPTOR); - - iBoundedMapTypeDescriptorEClass = createEClass(IBOUNDED_MAP_TYPE_DESCRIPTOR); - - iBoundedJavaTypeDescriptorEClass = createEClass(IBOUNDED_JAVA_TYPE_DESCRIPTOR); - - iListTypeDescriptorEClass = createEClass(ILIST_TYPE_DESCRIPTOR); - createEAttribute(iListTypeDescriptorEClass, ILIST_TYPE_DESCRIPTOR__LIST_SOURCE); - - iBoundedListTypeDescriptorEClass = createEClass(IBOUNDED_LIST_TYPE_DESCRIPTOR); - - // Create enums - eRuntimeSourceEEnum = createEEnum(ERUNTIME_SOURCE); - - // Create data types - iTypeEDataType = createEDataType(ITYPE); - iJavaElementEDataType = createEDataType(IJAVA_ELEMENT); - valueTypeEDataType = createEDataType(VALUE_TYPE); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Add supertypes to classes - iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol()); - iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail()); - iBeanPropertySymbolEClass.getESuperTypes().add(this.getIPropertySymbol()); - iBeanPropertySymbolEClass.getESuperTypes().add(this.getIDescribedInDetail()); - iInstanceSymbolEClass.getESuperTypes().add(this.getIObjectSymbol()); - iJavaSymbolEClass.getESuperTypes().add(this.getISymbol()); - iJavaTypeDescriptor2EClass.getESuperTypes().add(this.getITypeDescriptor()); - iBeanMethodSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail()); - iBeanMethodSymbolEClass.getESuperTypes().add(this.getIMethodSymbol()); - iComponentSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol()); - iComponentSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail()); - iPropertySymbolEClass.getESuperTypes().add(this.getIObjectSymbol()); - iMapTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor()); - iMethodSymbolEClass.getESuperTypes().add(this.getISymbol()); - iObjectSymbolEClass.getESuperTypes().add(this.getISymbol()); - iBoundedTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor()); - iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIMapTypeDescriptor()); - iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor()); - iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIJavaTypeDescriptor2()); - iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor()); - iListTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor()); - iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIListTypeDescriptor()); - iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor()); - - // Initialize classes and features; add operations and parameters - initEClass(iBeanInstanceSymbolEClass, IBeanInstanceSymbol.class, "IBeanInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIBeanInstanceSymbol_Properties(), this.getIBeanPropertySymbol(), null, "properties", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getIBeanInstanceSymbol_Methods(), this.getIBeanMethodSymbol(), null, "methods", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - addEOperation(iBeanInstanceSymbolEClass, this.getIJavaTypeDescriptor2(), "getJavaTypeDescriptor", 0, 1); - - EOperation op = addEOperation(iBeanInstanceSymbolEClass, null, "setJavaTypeDescriptor"); - addEParameter(op, this.getIJavaTypeDescriptor2(), "newTypeDescriptor", 0, 1); - - initEClass(iBeanPropertySymbolEClass, IBeanPropertySymbol.class, "IBeanPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIBeanPropertySymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iInstanceSymbolEClass, IInstanceSymbol.class, "IInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIInstanceSymbol_TypeResolved(), ecorePackage.getEBoolean(), "typeResolved", null, 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIInstanceSymbol_RuntimeSource(), this.getERuntimeSource(), "runtimeSource", "TAG_INSTANTIATED_SYMBOL", 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iJavaSymbolEClass, IJavaSymbol.class, "IJavaSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIJavaSymbol_JavaElement(), this.getIJavaElement(), "javaElement", null, 0, 1, IJavaSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iSymbolEClass, ISymbol.class, "ISymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getISymbol_Name(), ecorePackage.getEString(), "name", null, 0, 1, ISymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iTypeDescriptorEClass, ITypeDescriptor.class, "ITypeDescriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getITypeDescriptor_Properties(), this.getIPropertySymbol(), null, "properties", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_TypeSignature(), ecorePackage.getEString(), "typeSignature", "", 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_SuperTypeSignatures(), ecorePackage.getEString(), "superTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_InterfaceTypeSignatures(), ecorePackage.getEString(), "interfaceTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_TypeSignatureDelegate(), ecorePackage.getEString(), "typeSignatureDelegate", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getITypeDescriptor_Methods(), this.getIMethodSymbol(), null, "methods", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_TypeParameterSignatures(), ecorePackage.getEString(), "typeParameterSignatures", null, 0, -1, ITypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_JdtContext(), this.getIJavaElement(), "jdtContext", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getITypeDescriptor_EnumType(), ecorePackage.getEBoolean(), "enumType", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - op = addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "instanceOf", 0, 1); - addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); - - addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "isArray", 0, 1); - - addEOperation(iTypeDescriptorEClass, this.getIObjectSymbol(), "getArrayElement", 0, 1); - - op = addEOperation(iTypeDescriptorEClass, this.getIType(), "resolveType", 0, 1); - addEParameter(op, ecorePackage.getEString(), "resolvedTypeSignature", 0, 1); - - op = addEOperation(iTypeDescriptorEClass, this.getISymbol(), "calculateSyntheticCall", 0, 1); - addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1); - addEParameter(op, this.getValueType(), "methodArgs", 0, -1); - addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1); - - initEClass(iDescribedInDetailEClass, IDescribedInDetail.class, "IDescribedInDetail", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(iJavaTypeDescriptor2EClass, IJavaTypeDescriptor2.class, "IJavaTypeDescriptor2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIJavaTypeDescriptor2_Type(), this.getIType(), "type", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getIJavaTypeDescriptor2_BeanProperties(), this.getIBeanPropertySymbol(), null, "beanProperties", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getIJavaTypeDescriptor2_BeanMethods(), this.getIBeanPropertySymbol(), null, "beanMethods", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIJavaTypeDescriptor2_ArrayCount(), ecorePackage.getEInt(), "arrayCount", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iBeanMethodSymbolEClass, IBeanMethodSymbol.class, "IBeanMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIBeanMethodSymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iComponentSymbolEClass, IComponentSymbol.class, "IComponentSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(iPropertySymbolEClass, IPropertySymbol.class, "IPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIPropertySymbol_Intermediate(), ecorePackage.getEBoolean(), "intermediate", null, 0, 1, IPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iMapTypeDescriptorEClass, IMapTypeDescriptor.class, "IMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIMapTypeDescriptor_MapSource(), ecorePackage.getEMap(), "mapSource", null, 0, 1, IMapTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIMapTypeDescriptor_Immutable(), ecorePackage.getEBoolean(), "immutable", "true", 0, 1, IMapTypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iMethodSymbolEClass, IMethodSymbol.class, "IMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIMethodSymbol_Signature(), ecorePackage.getEString(), "signature", null, 0, 1, IMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iObjectSymbolEClass, IObjectSymbol.class, "IObjectSymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIObjectSymbol_TypeDescriptor(), this.getITypeDescriptor(), null, "typeDescriptor", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIObjectSymbol_Readable(), ecorePackage.getEBoolean(), "readable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIObjectSymbol_Writable(), ecorePackage.getEBoolean(), "writable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - op = addEOperation(iObjectSymbolEClass, ecorePackage.getEBoolean(), "supportsCoercion", 0, 1); - addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); - - op = addEOperation(iObjectSymbolEClass, this.getITypeDescriptor(), "coerce", 0, 1); - addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); - - op = addEOperation(iObjectSymbolEClass, this.getISymbol(), "call", 0, 1); - addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1); - addEParameter(op, this.getValueType(), "methodArguments", 0, -1); - addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1); - - initEClass(iBoundedTypeDescriptorEClass, IBoundedTypeDescriptor.class, "IBoundedTypeDescriptor", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - op = addEOperation(iBoundedTypeDescriptorEClass, ecorePackage.getEBoolean(), "isUnboundedForType", 0, 1); - addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); - - op = addEOperation(iBoundedTypeDescriptorEClass, this.getISymbol(), "getUnboundedProperty", 0, 1); - addEParameter(op, ecorePackage.getEJavaObject(), "name", 0, 1); - addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); - - initEClass(iBoundedMapTypeDescriptorEClass, IBoundedMapTypeDescriptor.class, "IBoundedMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(iBoundedJavaTypeDescriptorEClass, IBoundedJavaTypeDescriptor.class, "IBoundedJavaTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(iListTypeDescriptorEClass, IListTypeDescriptor.class, "IListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIListTypeDescriptor_ListSource(), ecorePackage.getEEList(), "listSource", null, 0, 1, IListTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(iBoundedListTypeDescriptorEClass, IBoundedListTypeDescriptor.class, "IBoundedListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - // Initialize enums and add enum literals - initEEnum(eRuntimeSourceEEnum, ERuntimeSource.class, "ERuntimeSource"); - addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.BUILT_IN_SYMBOL_LITERAL); - addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.MANAGED_BEAN_SYMBOL_LITERAL); - addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL); - addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.OTHER_LITERAL); - - // Initialize data types - initEDataType(iTypeEDataType, IType.class, "IType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(iJavaElementEDataType, IJavaElement.class, "IJavaElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(valueTypeEDataType, ValueType.class, "ValueType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - - // Create resource - createResource(eNS_URI); - } - -} //SymbolPackageImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java deleted file mode 100644 index 0c2f288e3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java +++ /dev/null @@ -1,191 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.impl; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolFactory; - -final class Util -{ - static ISymbol call(String methodName, EList methodArguments, - String symbolName, ITypeDescriptor typeDesc) - { - // first, see if the type descriptor wants to handle the call - ISymbol result = typeDesc.calculateSyntheticCall(methodName, methodArguments, symbolName); - - final IType type= typeDesc.resolveType(typeDesc.getTypeSignature()); - - // if the type is resolved and the typeDesc didn't already handle - // the call then do this the hard way... - if (type != null && result == null) - { - final JDTBeanIntrospector introspector = - new JDTBeanIntrospector(type); - - final IMethod callMethod = - Util.matchMethod(methodName, methodArguments, introspector.getAllMethods(),typeDesc.getTypeParameterSignatures()); - - if (callMethod != null) - { - try - { - // resolve the method's return type; don't erase parameters - String retTypeSignature = callMethod.getReturnType(); - - // if we have a type variable, try to parameter match it - if (Signature.getTypeSignatureKind(retTypeSignature) == Signature.TYPE_VARIABLE_SIGNATURE) - { - retTypeSignature = TypeUtil.matchTypeParameterToArgument - (type - , retTypeSignature, typeDesc.getTypeParameterSignatures()); - - if (retTypeSignature == null) - { - retTypeSignature = TypeConstants.TYPE_JAVAOBJECT; - } - } - // otherwise, try and resolve it in type - else - { - retTypeSignature = TypeUtil.resolveTypeSignature - (type, callMethod.getReturnType(), false); - } - - final IPropertySymbol propSymbol = - SymbolFactory.eINSTANCE.createIPropertySymbol(); - - // TODO: there is a possible problem here for non-string keyed maps - propSymbol.setName(symbolName); - propSymbol.setReadable(true); - - { - IJavaTypeDescriptor2 newTypeDesc = null; - - if (retTypeSignature.equals(TypeConstants.TYPE_JAVAOBJECT)) - { - newTypeDesc = SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor(); - } - else - { - newTypeDesc = SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2(); - } - - newTypeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature)); - - // may be null - newTypeDesc.setType(typeDesc.resolveType(retTypeSignature)); - newTypeDesc.setTypeSignatureDelegate(retTypeSignature); - propSymbol.setTypeDescriptor(newTypeDesc); - } - - result = propSymbol; - } - catch (JavaModelException e) - { - JSFCommonPlugin.log(e); - // fall-through and return null result - } - } - } - - return result; - } - - static IMethod matchMethod(String methodName, List methodArguments, IMethod[] allMethods, List typeParameterSignatures) - { -// final List argSigs = convertArgsToSignatures(methodArguments); - IMethod matchedMethod = null; - - for (int i = 0; i < allMethods.length; i++) - { - final IMethod method = allMethods[i]; - - // check for names and argument count match - if (method.getParameterTypes().length == methodArguments.size() - && method.getElementName().equals(methodName)) - { - List<String> methods = resolveMethodParameters(method, typeParameterSignatures); - - // need to verify argument matches - boolean isMatched = true; - CHECK_ARGUMENTS: for (int j = 0; j < methods.size(); j++) - { - final ValueType valueType = (ValueType) methodArguments.get(j); - - // if the parameters match, or if the method expects an object - // and we have a class - // TODO: there are some cases not supported here like: - // - method name overloading - // - autoboxing primitives - // - certain kinds of parameterized args - if (!methods.get(j).equals(valueType.getSignature()) - && !(methods.get(j).equals(TypeConstants.TYPE_JAVAOBJECT) - && Signature.getTypeSignatureKind(valueType.getSignature())==Signature.CLASS_TYPE_SIGNATURE)) - { - // not a match - isMatched = false; - break CHECK_ARGUMENTS; - } - } - - if (isMatched) - { - return method; - } - } - } - - return matchedMethod; - } - - static List<String> resolveMethodParameters(IMethod method, List typeParametersSignatures) - { - List<String> resolved = new ArrayList<String>(); - String[] parameterTypes = method.getParameterTypes(); - for (String parameter : parameterTypes) - { - parameter = TypeUtil.resolveTypeSignature(method.getDeclaringType() - , parameter, false); - - if (Signature.getTypeSignatureKind(parameter) == Signature.TYPE_VARIABLE_SIGNATURE) - { - parameter = TypeUtil.matchTypeParameterToArgument - (method.getDeclaringType(), parameter, typeParametersSignatures); - } - - if (parameter == null) - { - parameter = TypeConstants.TYPE_JAVAOBJECT; - } - - resolved.add(parameter); - } - - return resolved; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties deleted file mode 100644 index ab418ae5b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -IBeanPropertySymbolImpl.Access=Access: -IBeanPropertySymbolImpl.hiding=hiding -IBeanPropertySymbolImpl.none=none -IBeanPropertySymbolImpl.read_write=read/write -IBeanPropertySymbolImpl.readonly=read-only -IBeanPropertySymbolImpl.Type=Type: -IBeanPropertySymbolImpl.writeonly=write-only diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java deleted file mode 100644 index ee8e4b9ad..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java +++ /dev/null @@ -1,219 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; -import org.eclipse.swt.graphics.Image; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IBeanInstanceSymbolItemProvider - extends IInstanceSymbolItemProvider - implements - IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider -{ - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IBeanInstanceSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addPropertiesPropertyDescriptor(object); - addMethodsPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Properties feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addPropertiesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBeanInstanceSymbol_properties_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_properties_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__PROPERTIES, - false, - false, - false, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Methods feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addMethodsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBeanInstanceSymbol_methods_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_methods_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__METHODS, - false, - false, - false, - null, - null, - null)); - } - - /** - * This returns IBeanInstanceSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if not found - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanInstanceSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label associated with object or null if not found - * <!-- end-user-doc --> - * @generated NOT - */ - public String getText(Object object) { - String label = ((IBeanInstanceSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IBeanInstanceSymbol_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - - /** - * @param target_ - * @param proposalFactory - * @return a completion proposal for target at offset - */ - public ICompletionProposal[] getProposals(Object target_, - IProposalCreationFactory proposalFactory) - { - IBeanInstanceSymbol symbol = (IBeanInstanceSymbol) target_; - - final String replacementText = symbol.getName(); - final String displayText = getText(symbol); - final String additionalText = symbol.getDetailedDescription(); - final Image displayImage = - ExtendedImageRegistry.getInstance().getImage(getImage(symbol)); - - return new ICompletionProposal[] - { - proposalFactory.createProposal(replacementText, - displayText, - additionalText, - displayImage, - target_) - }; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java deleted file mode 100644 index ed4eaae3a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java +++ /dev/null @@ -1,254 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; -import org.eclipse.swt.graphics.Image; - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IBeanMethodSymbolItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IContentProposalProvider { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IBeanMethodSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the list of property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addNamePropertyDescriptor(object); - addSignaturePropertyDescriptor(object); - addOwnerPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Name feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ISYMBOL__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Signature feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addSignaturePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Owner feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addOwnerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBeanMethodSymbol_owner_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBeanMethodSymbol_owner_feature", "_UI_IBeanMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IBEAN_METHOD_SYMBOL__OWNER, - true, - false, - false, - null, - null, - null)); - } - - /** - * This returns IBeanMethodSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if no found - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanMethodSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label associated with label or null if not found - * <!-- end-user-doc --> - * @generated NOT - */ - public String getText(Object object) { - String label = ((IBeanMethodSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IBeanMethodSymbol_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IBeanMethodSymbol.class)) { - case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: - case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - - public ICompletionProposal[] getProposals(Object target_, - IProposalCreationFactory proposalFactory) - { - IBeanMethodSymbol symbol = (IBeanMethodSymbol) target_; - - final String replacementText = symbol.getName(); - final String displayText = getText(target_); - final String additionalText = symbol.getDetailedDescription(); - final Image displayImage = - ExtendedImageRegistry.getInstance().getImage(getImage(symbol)); - - return new ICompletionProposal[] - { - proposalFactory.createProposal(replacementText, - displayText, - additionalText, - displayImage, - target_) - }; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java deleted file mode 100644 index 200d69471..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java +++ /dev/null @@ -1,196 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IBeanPropertySymbolItemProvider - extends IPropertySymbolItemProvider - implements - IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider -{ - private static final String PROPERTY_SYMBOL_WO = "full/obj16/IBeanPropertySymbol_wo"; - private static final String PROPERTY_SYMBOL_RO = "full/obj16/IBeanPropertySymbol_ro"; - private static final String PROPERTY_SYMBOL_RW = "full/obj16/IBeanPropertySymbol_rw"; - private static final String PROPERTY_SYMBOL_WO_INDEXABLE = "full/obj16/IBeanPropertySymbol_wo_indexable"; - private static final String PROPERTY_SYMBOL_RO_INDEXABLE = "full/obj16/IBeanPropertySymbol_ro_indexable"; - private static final String PROPERTY_SYMBOL_RW_INDEXABLE = "full/obj16/IBeanPropertySymbol_rw_indexable"; - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ - public IBeanPropertySymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the list of property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addOwnerPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Owner feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addOwnerPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IBeanPropertySymbol_owner_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IBeanPropertySymbol_owner_feature", "_UI_IBeanPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL__OWNER, - true, - false, - false, - null, - null, - null)); - } - - /** - * This returns IBeanPropertySymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if not found - * <!-- end-user-doc --> - * @generated NOT - */ - public Object getImage(Object object) { - IBeanPropertySymbol propertySymbol = (IBeanPropertySymbol) object; - String imageFile = null; - ITypeDescriptor typeDescriptor = propertySymbol.getTypeDescriptor(); - if (typeDescriptor != null && (typeDescriptor.isArray() || typeDescriptor.instanceOf("Ljava.util.List;") || typeDescriptor.instanceOf("Ljava.util.Map;"))) { - // property is somehow "indexable" by int/String: - if (propertySymbol.isReadable() && propertySymbol.isWritable()) { - imageFile = PROPERTY_SYMBOL_RW_INDEXABLE; - } else if (propertySymbol.isReadable()) { - imageFile = PROPERTY_SYMBOL_RO_INDEXABLE; - } else if (propertySymbol.isWritable()) { - imageFile = PROPERTY_SYMBOL_WO_INDEXABLE; - } - } else { - if (propertySymbol.isReadable() && propertySymbol.isWritable()) { - imageFile = PROPERTY_SYMBOL_RW; - } else if (propertySymbol.isReadable()) { - imageFile = PROPERTY_SYMBOL_RO; - } else if (propertySymbol.isWritable()) { - imageFile = PROPERTY_SYMBOL_WO; - } - } - return imageFile == null? null : overlayImage(object, getResourceLocator().getImage(imageFile)); - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label associated with object - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IBeanPropertySymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IBeanPropertySymbol_type") : //$NON-NLS-1$ - getString("_UI_IBeanPropertySymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java deleted file mode 100644 index 1c85e05dc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IBoundedJavaTypeDescriptorItemProvider - extends IJavaTypeDescriptor2ItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IBoundedJavaTypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - } - return itemPropertyDescriptors; - } - - /** - * This returns IBoundedJavaTypeDescriptor.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedJavaTypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IBoundedJavaTypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IBoundedJavaTypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_IBoundedJavaTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java deleted file mode 100644 index 4bee1ad98..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java +++ /dev/null @@ -1,136 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; - -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; - -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IBoundedListTypeDescriptorItemProvider - extends IListTypeDescriptorItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param adapterFactory - * @generated - */ - public IBoundedListTypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - } - return itemPropertyDescriptors; - } - - /** - * This returns IBoundedListTypeDescriptor.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedListTypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IBoundedListTypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IBoundedListTypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_IBoundedListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java deleted file mode 100644 index 02b1a2409..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $ - */ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IBoundedMapTypeDescriptorItemProvider - extends IMapTypeDescriptorItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IBoundedMapTypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - } - return itemPropertyDescriptors; - } - - /** - * This returns IBoundedMapTypeDescriptor.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedMapTypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IBoundedMapTypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IBoundedMapTypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_IBoundedMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java deleted file mode 100644 index 96b04f747..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java +++ /dev/null @@ -1,169 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; -import org.eclipse.swt.graphics.Image; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IComponentSymbolItemProvider - extends IInstanceSymbolItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IContentProposalProvider -{ - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IComponentSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the property descriptor list - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - } - return itemPropertyDescriptors; - } - - /** - * This returns IComponentSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if not found - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IComponentSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label for object or null if not found - * <!-- end-user-doc --> - * @generated NOT - */ - public String getText(Object object) { - String label = ((IComponentSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IComponentSymbol_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - - public ICompletionProposal[] getProposals(Object target_, - IProposalCreationFactory proposalFactory) - { - IComponentSymbol symbol = (IComponentSymbol) target_; - - final String replacementText = symbol.getName(); - final String displayText = getText(symbol); - final String additionalText = symbol.getDetailedDescription(); - final Image displayImage = - ExtendedImageRegistry.getInstance().getImage(getImage(symbol)); - - return new ICompletionProposal[] - { - proposalFactory.createProposal(replacementText, - displayText, - additionalText, - displayImage, - target_) - }; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java deleted file mode 100644 index 155bfb186..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java +++ /dev/null @@ -1,329 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; -import org.eclipse.swt.graphics.Image; - - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IInstanceSymbolItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IContentProposalProvider { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IInstanceSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the EMF property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addNamePropertyDescriptor(object); - addTypeDescriptorPropertyDescriptor(object); - addReadablePropertyDescriptor(object); - addWritablePropertyDescriptor(object); - addTypeResolvedPropertyDescriptor(object); - addRuntimeSourcePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Name feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ISYMBOL__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Descriptor feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeDescriptorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR, - true, - false, - true, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Readable feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addReadablePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Writable feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addWritablePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Resolved feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeResolvedPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IInstanceSymbol_typeResolved_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_typeResolved_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IINSTANCE_SYMBOL__TYPE_RESOLVED, - false, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Runtime Source feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addRuntimeSourcePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IInstanceSymbol_runtimeSource_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_runtimeSource_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IINSTANCE_SYMBOL__RUNTIME_SOURCE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IInstanceSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image adaption for object - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IInstanceSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text representation of object - * <!-- end-user-doc --> - * @generated NOT - */ - public String getText(Object object) { - String label = ((IInstanceSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IInstanceSymbol_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IInstanceSymbol.class)) { - case SymbolPackage.IINSTANCE_SYMBOL__NAME: - case SymbolPackage.IINSTANCE_SYMBOL__READABLE: - case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE: - case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED: - case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - - public ICompletionProposal[] getProposals(Object target_, - IProposalCreationFactory proposalFactory) - { - IInstanceSymbol symbol = (IInstanceSymbol) target_; - - final String replacementText = symbol.getName(); - final String displayText = getText(symbol); - //final String additionalText = symbol.getDetailedDescription(); - final Image displayImage = - ExtendedImageRegistry.getInstance().getImage(getImage(symbol)); - - return new ICompletionProposal[] - { - proposalFactory.createProposal(replacementText, - displayText, - null, - displayImage, - target_) - }; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java deleted file mode 100644 index 021cd5bed..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java +++ /dev/null @@ -1,204 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IJavaSymbolItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IJavaSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the list of property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addNamePropertyDescriptor(object); - addJavaElementPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Name feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ISYMBOL__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Java Element feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addJavaElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IJavaSymbol_javaElement_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IJavaSymbol_javaElement_feature", "_UI_IJavaSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IJAVA_SYMBOL__JAVA_ELEMENT, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IJavaSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if not found - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label associated with object or null if no found - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IJavaSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IJavaSymbol_type") : //$NON-NLS-1$ - getString("_UI_IJavaSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IJavaSymbol.class)) { - case SymbolPackage.IJAVA_SYMBOL__NAME: - case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java deleted file mode 100644 index 201abe48d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java +++ /dev/null @@ -1,250 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IJavaTypeDescriptor2ItemProvider - extends ITypeDescriptorItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IJavaTypeDescriptor2ItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the emf property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addTypePropertyDescriptor(object); - addBeanPropertiesPropertyDescriptor(object); - addBeanMethodsPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Type feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IJavaTypeDescriptor2_type_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_type_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__TYPE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Bean Properties feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addBeanPropertiesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IJavaTypeDescriptor2_beanProperties_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanProperties_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES, - true, - false, - false, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Bean Methods feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addBeanMethodsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IJavaTypeDescriptor2_beanMethods_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanMethods_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS, - true, - false, - false, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Array Count feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param object - * @generated - */ - protected void addArrayCountPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IJavaTypeDescriptor2_arrayCount_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_arrayCount_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT, - true, - false, - false, - ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, - null, - null)); - } - - - /** - * This returns IJavaTypeDescriptor2.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image adaption for object - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaTypeDescriptor2")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text representation of object - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IJavaTypeDescriptor2)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IJavaTypeDescriptor2_type") : //$NON-NLS-1$ - getString("_UI_IJavaTypeDescriptor2_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IJavaTypeDescriptor2.class)) { - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java deleted file mode 100644 index 76d3eb3ed..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java +++ /dev/null @@ -1,170 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; - -import org.eclipse.emf.common.util.ResourceLocator; - -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ViewerNotification; - -import org.eclipse.jst.jsf.common.JSFCommonPlugin; - -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IListTypeDescriptorItemProvider - extends ITypeDescriptorItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IListTypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addListSourcePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the List Source feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addListSourcePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IListTypeDescriptor_listSource_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IListTypeDescriptor_listSource_feature", "_UI_IListTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IListTypeDescriptor.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IListTypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IListTypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IListTypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_IListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IListTypeDescriptor.class)) { - case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java deleted file mode 100644 index 165629ca9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java +++ /dev/null @@ -1,204 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IMapTypeDescriptorItemProvider - extends ITypeDescriptorItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IMapTypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the prop descriptor - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addMapSourcePropertyDescriptor(object); - addImmutablePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Map Source feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addMapSourcePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IMapTypeDescriptor_mapSource_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_mapSource_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Immutable feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addImmutablePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IMapTypeDescriptor_immutable_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_immutable_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__IMMUTABLE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IMapTypeDescriptor.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image adaptation of the object - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IMapTypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text rep of the object - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IMapTypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_IMapTypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_IMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IMapTypeDescriptor.class)) { - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE: - case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java deleted file mode 100644 index 0d2902168..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class IMethodSymbolItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IMethodSymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the property sheet descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addNamePropertyDescriptor(object); - addSignaturePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Name feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ISYMBOL__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Signature feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addSignaturePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IMethodSymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image representatino of object - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IMethodSymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text represention of object - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((IMethodSymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IMethodSymbol_type") : //$NON-NLS-1$ - getString("_UI_IMethodSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IMethodSymbol.class)) { - case SymbolPackage.IMETHOD_SYMBOL__NAME: - case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the EMF resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java deleted file mode 100644 index 3958147ad..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java +++ /dev/null @@ -1,361 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} object. - * <!-- begin-user-doc --> - * @extends IContentProposalProvider - * <!-- end-user-doc --> - * @generated - */ -public class IPropertySymbolItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource, - IContentProposalProvider{ - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public IPropertySymbolItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addNamePropertyDescriptor(object); - addTypeDescriptorPropertyDescriptor(object); - addReadablePropertyDescriptor(object); - addWritablePropertyDescriptor(object); - addIntermediatePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Name feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addNamePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ISYMBOL__NAME, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Descriptor feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeDescriptorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR, - true, - false, - true, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Readable feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addReadablePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Writable feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addWritablePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Intermediate feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addIntermediatePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_IPropertySymbol_intermediate_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_IPropertySymbol_intermediate_feature", "_UI_IPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.IPROPERTY_SYMBOL__INTERMEDIATE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns IPropertySymbol.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image rep of object - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/IPropertySymbol")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text representation of the object - * <!-- end-user-doc --> - * @generated NOT - */ - public String getText(Object object) { - String label = ((IPropertySymbol)object).getName(); - return label == null || label.length() == 0 ? - getString("_UI_IPropertySymbol_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(IPropertySymbol.class)) { - case SymbolPackage.IPROPERTY_SYMBOL__NAME: - case SymbolPackage.IPROPERTY_SYMBOL__READABLE: - case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE: - case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - - /** - * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object) - */ - public Collection getChildren(Object object) - { - final List childSymbols = new ArrayList(); - childSymbols.addAll(((IPropertySymbol)object).getTypeDescriptor().getProperties()); - return Collections.unmodifiableList(childSymbols); - } - - /** - * @see org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider#getProposals(Object, org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory) - */ - public ICompletionProposal[] getProposals(Object target1, IProposalCreationFactory proposalFactory) - { - return getProposalsInternal((IPropertySymbol) target1, proposalFactory, ""); //$NON-NLS-1$ - } - - private ICompletionProposal[] getProposalsInternal(IPropertySymbol symbol, IProposalCreationFactory proposalFactory, String intermediatePrefix) - { - final List completions = new ArrayList(); - final Image displayImage = - ExtendedImageRegistry.getInstance().getImage(getImage(symbol)); - - if (symbol.isIntermediate()) - { - // see if there's something using this as intermediate completion - List props = symbol.getTypeDescriptor().getProperties(); - - for (final Iterator it = props.iterator(); it.hasNext();) - { - final IPropertySymbol propSymbol = (IPropertySymbol) it.next(); - - if (!propSymbol.isIntermediate()) - { - final String replacementText = "['" + intermediatePrefix + symbol.getName() + "." + propSymbol.getName() + "']"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - completions.add(proposalFactory.createProposal( - replacementText, - replacementText, - null, - displayImage, symbol)); - } - else - { - completions.addAll(Arrays.asList(getProposalsInternal(propSymbol, proposalFactory, intermediatePrefix+symbol.getName()+"."))); //$NON-NLS-1$ - } - } - } - else - { - final String replacementText = intermediatePrefix + symbol.getName(); - final String displayText = symbol.getName(); - - completions.add(createProposal(symbol, replacementText, displayText, displayImage, - proposalFactory)); - } - - return (ICompletionProposal[]) completions.toArray(new CustomCompletionProposal[0]); - - } - - private ICompletionProposal createProposal(IPropertySymbol symbol, - final String replacementText, final String displayText, - final Image displayImage, IProposalCreationFactory proposalFactory) { - String additionalText = null; // TODO: put property value here where possible? - if (symbol instanceof IDescribedInDetail) { - additionalText = ((IDescribedInDetail) symbol).getDetailedDescription(); - } - return proposalFactory.createProposal( - replacementText, - displayText, - additionalText, - displayImage, symbol); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java deleted file mode 100644 index 247422a5e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java +++ /dev/null @@ -1,372 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - - -import java.util.Collection; -import java.util.List; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - - -/** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class ITypeDescriptorItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * @param adapterFactory - * <!-- end-user-doc --> - * @generated - */ - public ITypeDescriptorItemProvider(AdapterFactory adapterFactory) { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the list of property descriptors - * <!-- end-user-doc --> - * @generated - */ - public List getPropertyDescriptors(Object object) { - if (itemPropertyDescriptors == null) { - super.getPropertyDescriptors(object); - - addPropertiesPropertyDescriptor(object); - addTypeSignaturePropertyDescriptor(object); - addSuperTypeSignaturesPropertyDescriptor(object); - addInterfaceTypeSignaturesPropertyDescriptor(object); - addTypeSignatureDelegatePropertyDescriptor(object); - addMethodsPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Properties feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addPropertiesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_properties_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_properties_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__PROPERTIES, - true, - false, - true, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Signature feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeSignaturePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_typeSignature_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignature_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE, - false, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Super Type Signatures feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addSuperTypeSignaturesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_superTypeSignatures_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_superTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Interface Type Signatures feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addInterfaceTypeSignaturesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_interfaceTypeSignatures_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_interfaceTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Signature Delegate feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeSignatureDelegatePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_typeSignatureDelegate_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignatureDelegate_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Methods feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addMethodsPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_methods_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_methods_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__METHODS, - true, - false, - true, - null, - null, - null)); - } - - /** - * This adds a property descriptor for the Type Parameter Signatures feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addTypeParameterSignaturesPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_typeParameterSignatures_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeParameterSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Jdt Context feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addJdtContextPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_jdtContext_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_jdtContext_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SymbolPackage.Literals.ITYPE_DESCRIPTOR__JDT_CONTEXT, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - - /** - * This adds a property descriptor for the Enum Type feature. - * <!-- begin-user-doc --> - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void addEnumTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ITypeDescriptor_enumType_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_enumType_feature", "_UI_ITypeDescriptor_type"), - SymbolPackage.Literals.ITYPE_DESCRIPTOR__ENUM_TYPE, - true, - false, - false, - ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, - null, - null)); - } - - /** - * This returns ITypeDescriptor.gif. - * <!-- begin-user-doc --> - * @param object - * @return the image associated with object or null if not found - * <!-- end-user-doc --> - * @generated - */ - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ITypeDescriptor")); //$NON-NLS-1$ - } - - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * @param object - * @return the text label associated with object or null if not found - * <!-- end-user-doc --> - * @generated - */ - public String getText(Object object) { - String label = ((ITypeDescriptor)object).getTypeSignature(); - return label == null || label.length() == 0 ? - getString("_UI_ITypeDescriptor_type") : //$NON-NLS-1$ - getString("_UI_ITypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void notifyChanged(Notification notification) { - updateChildren(notification); - - switch (notification.getFeatureID(ITypeDescriptor.class)) { - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE: - case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES: - case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES: - case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s - * describing all of the children that can be created under this object. - * <!-- begin-user-doc --> - * @param newChildDescriptors - * @param object - * <!-- end-user-doc --> - * @generated - */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * @return the resource locator - * <!-- end-user-doc --> - * @generated - */ - public ResourceLocator getResourceLocator() { - return JSFCommonPlugin.INSTANCE; - } - -} - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java deleted file mode 100644 index 6dc9171c9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java +++ /dev/null @@ -1,534 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provider; - -import java.util.ArrayList; -import java.util.Collection; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.edit.provider.ChangeNotifier; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.emf.edit.provider.IChangeNotifier; -import org.eclipse.emf.edit.provider.IDisposable; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.INotifyChangedListener; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.jst.jsf.context.symbol.internal.util.SymbolAdapterFactory; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; - -/** - * This is the factory that is used to provide the interfaces needed to support Viewers. - * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. - * The adapters also support Eclipse property sheets. - * Note that most of the adapters are shared among multiple instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("hiding") - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * This keeps track of the root adapter factory that delegates to this adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ComposedAdapterFactory parentAdapterFactory; - - /** - * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IChangeNotifier changeNotifier = new ChangeNotifier(); - - /** - * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected Collection supportedTypes = new ArrayList(); - - /** - * This constructs an instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * TODO: try to got to Gen function to add custom adapters - * instead of a NOT - * @generated NOT - */ - public SymbolItemProviderAdapterFactory() { - supportedTypes.add(IEditingDomainItemProvider.class); - supportedTypes.add(IStructuredItemContentProvider.class); - supportedTypes.add(ITreeItemContentProvider.class); - supportedTypes.add(IItemLabelProvider.class); - supportedTypes.add(IItemPropertySource.class); - supportedTypes.add(IContentProposalProvider.class); - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanInstanceSymbolItemProvider iBeanInstanceSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBeanInstanceSymbolAdapter() { - if (iBeanInstanceSymbolItemProvider == null) { - iBeanInstanceSymbolItemProvider = new IBeanInstanceSymbolItemProvider(this); - } - - return iBeanInstanceSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanPropertySymbolItemProvider iBeanPropertySymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBeanPropertySymbolAdapter() { - if (iBeanPropertySymbolItemProvider == null) { - iBeanPropertySymbolItemProvider = new IBeanPropertySymbolItemProvider(this); - } - - return iBeanPropertySymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IInstanceSymbolItemProvider iInstanceSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIInstanceSymbolAdapter() { - if (iInstanceSymbolItemProvider == null) { - iInstanceSymbolItemProvider = new IInstanceSymbolItemProvider(this); - } - - return iInstanceSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IJavaSymbolItemProvider iJavaSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIJavaSymbolAdapter() { - if (iJavaSymbolItemProvider == null) { - iJavaSymbolItemProvider = new IJavaSymbolItemProvider(this); - } - - return iJavaSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IJavaTypeDescriptor2ItemProvider iJavaTypeDescriptor2ItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIJavaTypeDescriptor2Adapter() { - if (iJavaTypeDescriptor2ItemProvider == null) { - iJavaTypeDescriptor2ItemProvider = new IJavaTypeDescriptor2ItemProvider(this); - } - - return iJavaTypeDescriptor2ItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBeanMethodSymbolItemProvider iBeanMethodSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBeanMethodSymbolAdapter() { - if (iBeanMethodSymbolItemProvider == null) { - iBeanMethodSymbolItemProvider = new IBeanMethodSymbolItemProvider(this); - } - - return iBeanMethodSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IComponentSymbolItemProvider iComponentSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIComponentSymbolAdapter() { - if (iComponentSymbolItemProvider == null) { - iComponentSymbolItemProvider = new IComponentSymbolItemProvider(this); - } - - return iComponentSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IPropertySymbolItemProvider iPropertySymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}. - * <!-- begin-user-doc --> - * @return the property symbol adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIPropertySymbolAdapter() { - if (iPropertySymbolItemProvider == null) { - iPropertySymbolItemProvider = new IPropertySymbolItemProvider(this); - } - - return iPropertySymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IMapTypeDescriptorItemProvider iMapTypeDescriptorItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor}. - * <!-- begin-user-doc --> - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIMapTypeDescriptorAdapter() { - if (iMapTypeDescriptorItemProvider == null) { - iMapTypeDescriptorItemProvider = new IMapTypeDescriptorItemProvider(this); - } - - return iMapTypeDescriptorItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IMethodSymbolItemProvider iMethodSymbolItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}. - * <!-- begin-user-doc --> - * @return the adapter for method symbols - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIMethodSymbolAdapter() { - if (iMethodSymbolItemProvider == null) { - iMethodSymbolItemProvider = new IMethodSymbolItemProvider(this); - } - - return iMethodSymbolItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedMapTypeDescriptorItemProvider iBoundedMapTypeDescriptorItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBoundedMapTypeDescriptorAdapter() { - if (iBoundedMapTypeDescriptorItemProvider == null) { - iBoundedMapTypeDescriptorItemProvider = new IBoundedMapTypeDescriptorItemProvider(this); - } - - return iBoundedMapTypeDescriptorItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedJavaTypeDescriptorItemProvider iBoundedJavaTypeDescriptorItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBoundedJavaTypeDescriptorAdapter() { - if (iBoundedJavaTypeDescriptorItemProvider == null) { - iBoundedJavaTypeDescriptorItemProvider = new IBoundedJavaTypeDescriptorItemProvider(this); - } - - return iBoundedJavaTypeDescriptorItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IListTypeDescriptorItemProvider iListTypeDescriptorItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIListTypeDescriptorAdapter() { - if (iListTypeDescriptorItemProvider == null) { - iListTypeDescriptorItemProvider = new IListTypeDescriptorItemProvider(this); - } - - return iListTypeDescriptorItemProvider; - } - - /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IBoundedListTypeDescriptorItemProvider iBoundedListTypeDescriptorItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Adapter createIBoundedListTypeDescriptorAdapter() { - if (iBoundedListTypeDescriptorItemProvider == null) { - iBoundedListTypeDescriptorItemProvider = new IBoundedListTypeDescriptorItemProvider(this); - } - - return iBoundedListTypeDescriptorItemProvider; - } - - /** - * This returns the root adapter factory that contains this factory. - * <!-- begin-user-doc --> - * @return the adapter factory - * <!-- end-user-doc --> - * @generated - */ - public ComposeableAdapterFactory getRootAdapterFactory() { - return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); - } - - /** - * This sets the composed adapter factory that contains this factory. - * <!-- begin-user-doc --> - * @param parentAdapterFactory - * <!-- end-user-doc --> - * @generated - */ - public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { - this.parentAdapterFactory = parentAdapterFactory; - } - - /** - * <!-- begin-user-doc --> - * @param type - * @return true if the factory supports the adapter type - * <!-- end-user-doc --> - * @generated - */ - public boolean isFactoryForType(Object type) { - return supportedTypes.contains(type) || super.isFactoryForType(type); - } - - /** - * This implementation substitutes the factory itself as the key for the adapter. - * <!-- begin-user-doc --> - * @param notifier - * @param type - * @return the adapter - * <!-- end-user-doc --> - * @generated - */ - public Adapter adapt(Notifier notifier, Object type) { - return super.adapt(notifier, this); - } - - /** - * <!-- begin-user-doc --> - * @param object - * @param type - * @return the adapted object - * <!-- end-user-doc --> - * @generated - */ - public Object adapt(Object object, Object type) { - if (isFactoryForType(type)) { - Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) { - return adapter; - } - } - - return null; - } - - /** - * This adds a listener. - * <!-- begin-user-doc --> - * @param notifyChangedListener - * <!-- end-user-doc --> - * @generated - */ - public void addListener(INotifyChangedListener notifyChangedListener) { - changeNotifier.addListener(notifyChangedListener); - } - - /** - * This removes a listener. - * <!-- begin-user-doc --> - * @param notifyChangedListener - * <!-- end-user-doc --> - * @generated - */ - public void removeListener(INotifyChangedListener notifyChangedListener) { - changeNotifier.removeListener(notifyChangedListener); - } - - /** - * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. - * <!-- begin-user-doc --> - * @param notification - * <!-- end-user-doc --> - * @generated - */ - public void fireNotifyChanged(Notification notification) { - changeNotifier.fireNotifyChanged(notification); - - if (parentAdapterFactory != null) { - parentAdapterFactory.fireNotifyChanged(notification); - } - } - - /** - * This disposes all of the item providers created by this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void dispose() { - if (iBeanInstanceSymbolItemProvider != null) iBeanInstanceSymbolItemProvider.dispose(); - if (iBeanPropertySymbolItemProvider != null) iBeanPropertySymbolItemProvider.dispose(); - if (iInstanceSymbolItemProvider != null) iInstanceSymbolItemProvider.dispose(); - if (iJavaSymbolItemProvider != null) iJavaSymbolItemProvider.dispose(); - if (iJavaTypeDescriptor2ItemProvider != null) iJavaTypeDescriptor2ItemProvider.dispose(); - if (iBeanMethodSymbolItemProvider != null) iBeanMethodSymbolItemProvider.dispose(); - if (iComponentSymbolItemProvider != null) iComponentSymbolItemProvider.dispose(); - if (iPropertySymbolItemProvider != null) iPropertySymbolItemProvider.dispose(); - if (iMapTypeDescriptorItemProvider != null) iMapTypeDescriptorItemProvider.dispose(); - if (iMethodSymbolItemProvider != null) iMethodSymbolItemProvider.dispose(); - if (iBoundedMapTypeDescriptorItemProvider != null) iBoundedMapTypeDescriptorItemProvider.dispose(); - if (iBoundedJavaTypeDescriptorItemProvider != null) iBoundedJavaTypeDescriptorItemProvider.dispose(); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java deleted file mode 100644 index 4a77889fe..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.source; - -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.InitializedSymbolFactory; -import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory; -import org.eclipse.jst.jsf.context.symbol.source.IAdditionalContextSymbolInfo; - -/** - * Returns an unknown component symbol. - * - * @author cbateman - * - */ -public final class UnknownTypeContextSymbolFactory extends -AbstractContextSymbolFactory -{ - private final InitializedSymbolFactory _factory = new InitializedSymbolFactory(); - - @Override - protected ISymbol internalCreate(final String symbolName, final int scope, - final IAdaptable context, final List problems) - { - return internalCreate(symbolName, scope, context, null); - } - - @Override - protected ISymbol internalCreate(final String symbolName, final int scope, - final IAdaptable context, final List problems, - final IAdditionalContextSymbolInfo info) - { - return _factory.createUnknownComponentSymbol(symbolName, - ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL); - } - @Override - public boolean supports(final IAdaptable context) - { - return true; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java deleted file mode 100644 index ae764bed7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.util; - -import org.eclipse.jst.jsf.common.internal.types.MethodType; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; - -/** - * - * @author cbateman - * - */ -public class IMethodSymbolBasedType extends MethodType -{ - private final IMethodSymbol _methodSymbol; - - /** - * @param methodSymbol - */ - public IMethodSymbolBasedType(IMethodSymbol methodSymbol) - { - super(methodSymbol.getName(), methodSymbol.getSignature()); - _methodSymbol = methodSymbol; - } - - /** - * @return the method symbol - */ - public IMethodSymbol getSymbol() - { - return _methodSymbol; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java deleted file mode 100644 index 04fbe527d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.util; - -import org.eclipse.jst.jsf.common.internal.types.IAssignable; -import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; - -/** - * A value type adapter class for IObjectSymbol's - * - * @author cbateman - * - */ -public class IObjectSymbolBasedValueType extends ValueType -{ - private final IObjectSymbol _symbol; - - /** - * @param symbol - * @return a properly configured instance based on the sub-type of symbol. - * Returns null if symbol is not of an appropriate IObjectSymbol type - */ - public static IObjectSymbolBasedValueType getInstance(ISymbol symbol) - { - if (symbol instanceof IInstanceSymbol) - { - if (((IInstanceSymbol)symbol).getTypeDescriptor() != null) - { - return new IObjectSymbolBasedValueType((IInstanceSymbol) symbol); - } - } - else if (symbol instanceof IPropertySymbol) - { - if (((IPropertySymbol)symbol).getTypeDescriptor() != null) - { - return new IObjectSymbolBasedValueType((IPropertySymbol) symbol); - } - } - - return null; - } - - /** - * Constructor for instance symbols (model objects) - * @param symbol - */ - public IObjectSymbolBasedValueType(final IInstanceSymbol symbol) - { - this(symbol.getTypeDescriptor().getTypeSignature(), - (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY), - (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY), - (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY), - symbol.getTypeDescriptor().isEnumType(), - IAssignable.ASSIGNMENT_TYPE_RHS /* variables are not assignable */ - , symbol); - } - - /** - * Constructor for property symbols - * - * @param symbol - */ - public IObjectSymbolBasedValueType(final IPropertySymbol symbol) - { - this(symbol.getTypeDescriptor().getTypeSignature(), - (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY), - (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY), - (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY), - symbol.getTypeDescriptor().isEnumType(), - ASSIGNMENT_TYPE_NONE | (symbol.isReadable()?IAssignable.ASSIGNMENT_TYPE_RHS:ASSIGNMENT_TYPE_NONE)|(symbol.isWritable()?IAssignable.ASSIGNMENT_TYPE_LHS:ASSIGNMENT_TYPE_NONE) - , symbol); - } - - private IObjectSymbolBasedValueType(final String signature, - final String[] typeArgs, - final String[] superTypes, - final String[] interfaceTypes, - final boolean isEnumType, - final int assignmentMask, - final IObjectSymbol symbol) - { - super(signature, typeArgs, superTypes, interfaceTypes, isEnumType, assignmentMask); - _symbol = symbol; - } - - /** - * @return the underlying IObjectSymbol - */ - public IObjectSymbol getSymbol() - { - return _symbol; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java deleted file mode 100644 index dcecf364a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java +++ /dev/null @@ -1,457 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.util; - -import org.eclipse.emf.common.notify.Adapter; -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.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage - * @generated - */ -public class SymbolAdapterFactory extends AdapterFactoryImpl { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static SymbolPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public SymbolAdapterFactory() { - if (modelPackage == null) { - modelPackage = SymbolPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * @param object - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - public boolean isFactoryForType(Object object) { - if (object == modelPackage) { - return true; - } - if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch the delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected SymbolSwitch modelSwitch = - new SymbolSwitch() { - public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) { - return createIBeanInstanceSymbolAdapter(); - } - public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) { - return createIBeanPropertySymbolAdapter(); - } - public Object caseIInstanceSymbol(IInstanceSymbol object) { - return createIInstanceSymbolAdapter(); - } - public Object caseIJavaSymbol(IJavaSymbol object) { - return createIJavaSymbolAdapter(); - } - public Object caseISymbol(ISymbol object) { - return createISymbolAdapter(); - } - public Object caseITypeDescriptor(ITypeDescriptor object) { - return createITypeDescriptorAdapter(); - } - public Object caseIDescribedInDetail(IDescribedInDetail object) { - return createIDescribedInDetailAdapter(); - } - public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) { - return createIJavaTypeDescriptor2Adapter(); - } - public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) { - return createIBeanMethodSymbolAdapter(); - } - public Object caseIComponentSymbol(IComponentSymbol object) { - return createIComponentSymbolAdapter(); - } - public Object caseIPropertySymbol(IPropertySymbol object) { - return createIPropertySymbolAdapter(); - } - public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) { - return createIMapTypeDescriptorAdapter(); - } - public Object caseIMethodSymbol(IMethodSymbol object) { - return createIMethodSymbolAdapter(); - } - public Object caseIObjectSymbol(IObjectSymbol object) { - return createIObjectSymbolAdapter(); - } - public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) { - return createIBoundedTypeDescriptorAdapter(); - } - public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) { - return createIBoundedMapTypeDescriptorAdapter(); - } - public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) { - return createIBoundedJavaTypeDescriptorAdapter(); - } - public Object caseIListTypeDescriptor(IListTypeDescriptor object) { - return createIListTypeDescriptorAdapter(); - } - public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) { - return createIBoundedListTypeDescriptorAdapter(); - } - public Object defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - public Adapter createAdapter(Notifier target) { - return (Adapter)modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol - * @generated - */ - public Adapter createIBeanInstanceSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol - * @generated - */ - public Adapter createIBeanPropertySymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol - * @generated - */ - public Adapter createIInstanceSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol - * @generated - */ - public Adapter createIJavaSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.ISymbol - * @generated - */ - public Adapter createISymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor - * @generated - */ - public Adapter createITypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail - * @generated - */ - public Adapter createIDescribedInDetailAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 - * @generated - */ - public Adapter createIJavaTypeDescriptor2Adapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol - * @generated - */ - public Adapter createIBeanMethodSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol - * @generated - */ - public Adapter createIComponentSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol - * @generated - */ - public Adapter createIPropertySymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor - * @generated - */ - public Adapter createIMapTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol - * @generated - */ - public Adapter createIMethodSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol - * @generated - */ - public Adapter createIObjectSymbolAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor - * @generated - */ - public Adapter createIBoundedTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor - * @generated - */ - public Adapter createIBoundedMapTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor - * @generated - */ - public Adapter createIBoundedJavaTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor - * @generated - */ - public Adapter createIListTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'. - * <!-- begin-user-doc --> - * 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. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor - * @generated - */ - public Adapter createIBoundedListTypeDescriptorAdapter() { - return null; - } - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() { - return null; - } - -} //SymbolAdapterFactory diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java deleted file mode 100644 index 92c774619..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java +++ /dev/null @@ -1,579 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.util; - -import java.util.List; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.ISymbol; -import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.SymbolPackage; - - - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage - * @generated - */ -public class SymbolSwitch { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$ - - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static SymbolPackage modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public SymbolSwitch() { - if (modelPackage == null) { - modelPackage = SymbolPackage.eINSTANCE; - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * @param theEObject - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public Object doSwitch(EObject theEObject) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * @param theEClass - * @param theEObject - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(EClass theEClass, EObject theEObject) { - if (theEClass.eContainer() == modelPackage) { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch((EClass)eSuperTypes.get(0), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * @param classifierID - * @param theEObject - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected Object doSwitch(int classifierID, EObject theEObject) { - switch (classifierID) { - case SymbolPackage.IBEAN_INSTANCE_SYMBOL: { - IBeanInstanceSymbol iBeanInstanceSymbol = (IBeanInstanceSymbol)theEObject; - Object result = caseIBeanInstanceSymbol(iBeanInstanceSymbol); - if (result == null) result = caseIInstanceSymbol(iBeanInstanceSymbol); - if (result == null) result = caseIDescribedInDetail(iBeanInstanceSymbol); - if (result == null) result = caseIObjectSymbol(iBeanInstanceSymbol); - if (result == null) result = caseISymbol(iBeanInstanceSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBEAN_PROPERTY_SYMBOL: { - IBeanPropertySymbol iBeanPropertySymbol = (IBeanPropertySymbol)theEObject; - Object result = caseIBeanPropertySymbol(iBeanPropertySymbol); - if (result == null) result = caseIPropertySymbol(iBeanPropertySymbol); - if (result == null) result = caseIDescribedInDetail(iBeanPropertySymbol); - if (result == null) result = caseIObjectSymbol(iBeanPropertySymbol); - if (result == null) result = caseISymbol(iBeanPropertySymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IINSTANCE_SYMBOL: { - IInstanceSymbol iInstanceSymbol = (IInstanceSymbol)theEObject; - Object result = caseIInstanceSymbol(iInstanceSymbol); - if (result == null) result = caseIObjectSymbol(iInstanceSymbol); - if (result == null) result = caseISymbol(iInstanceSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IJAVA_SYMBOL: { - IJavaSymbol iJavaSymbol = (IJavaSymbol)theEObject; - Object result = caseIJavaSymbol(iJavaSymbol); - if (result == null) result = caseISymbol(iJavaSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.ISYMBOL: { - ISymbol iSymbol = (ISymbol)theEObject; - Object result = caseISymbol(iSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.ITYPE_DESCRIPTOR: { - ITypeDescriptor iTypeDescriptor = (ITypeDescriptor)theEObject; - Object result = caseITypeDescriptor(iTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IDESCRIBED_IN_DETAIL: { - IDescribedInDetail iDescribedInDetail = (IDescribedInDetail)theEObject; - Object result = caseIDescribedInDetail(iDescribedInDetail); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: { - IJavaTypeDescriptor2 iJavaTypeDescriptor2 = (IJavaTypeDescriptor2)theEObject; - Object result = caseIJavaTypeDescriptor2(iJavaTypeDescriptor2); - if (result == null) result = caseITypeDescriptor(iJavaTypeDescriptor2); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBEAN_METHOD_SYMBOL: { - IBeanMethodSymbol iBeanMethodSymbol = (IBeanMethodSymbol)theEObject; - Object result = caseIBeanMethodSymbol(iBeanMethodSymbol); - if (result == null) result = caseIDescribedInDetail(iBeanMethodSymbol); - if (result == null) result = caseIMethodSymbol(iBeanMethodSymbol); - if (result == null) result = caseISymbol(iBeanMethodSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.ICOMPONENT_SYMBOL: { - IComponentSymbol iComponentSymbol = (IComponentSymbol)theEObject; - Object result = caseIComponentSymbol(iComponentSymbol); - if (result == null) result = caseIInstanceSymbol(iComponentSymbol); - if (result == null) result = caseIDescribedInDetail(iComponentSymbol); - if (result == null) result = caseIObjectSymbol(iComponentSymbol); - if (result == null) result = caseISymbol(iComponentSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IPROPERTY_SYMBOL: { - IPropertySymbol iPropertySymbol = (IPropertySymbol)theEObject; - Object result = caseIPropertySymbol(iPropertySymbol); - if (result == null) result = caseIObjectSymbol(iPropertySymbol); - if (result == null) result = caseISymbol(iPropertySymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IMAP_TYPE_DESCRIPTOR: { - IMapTypeDescriptor iMapTypeDescriptor = (IMapTypeDescriptor)theEObject; - Object result = caseIMapTypeDescriptor(iMapTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iMapTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IMETHOD_SYMBOL: { - IMethodSymbol iMethodSymbol = (IMethodSymbol)theEObject; - Object result = caseIMethodSymbol(iMethodSymbol); - if (result == null) result = caseISymbol(iMethodSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IOBJECT_SYMBOL: { - IObjectSymbol iObjectSymbol = (IObjectSymbol)theEObject; - Object result = caseIObjectSymbol(iObjectSymbol); - if (result == null) result = caseISymbol(iObjectSymbol); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBOUNDED_TYPE_DESCRIPTOR: { - IBoundedTypeDescriptor iBoundedTypeDescriptor = (IBoundedTypeDescriptor)theEObject; - Object result = caseIBoundedTypeDescriptor(iBoundedTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iBoundedTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: { - IBoundedMapTypeDescriptor iBoundedMapTypeDescriptor = (IBoundedMapTypeDescriptor)theEObject; - Object result = caseIBoundedMapTypeDescriptor(iBoundedMapTypeDescriptor); - if (result == null) result = caseIMapTypeDescriptor(iBoundedMapTypeDescriptor); - if (result == null) result = caseIBoundedTypeDescriptor(iBoundedMapTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iBoundedMapTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: { - IBoundedJavaTypeDescriptor iBoundedJavaTypeDescriptor = (IBoundedJavaTypeDescriptor)theEObject; - Object result = caseIBoundedJavaTypeDescriptor(iBoundedJavaTypeDescriptor); - if (result == null) result = caseIJavaTypeDescriptor2(iBoundedJavaTypeDescriptor); - if (result == null) result = caseIBoundedTypeDescriptor(iBoundedJavaTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iBoundedJavaTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.ILIST_TYPE_DESCRIPTOR: { - IListTypeDescriptor iListTypeDescriptor = (IListTypeDescriptor)theEObject; - Object result = caseIListTypeDescriptor(iListTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iListTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: { - IBoundedListTypeDescriptor iBoundedListTypeDescriptor = (IBoundedListTypeDescriptor)theEObject; - Object result = caseIBoundedListTypeDescriptor(iBoundedListTypeDescriptor); - if (result == null) result = caseIListTypeDescriptor(iBoundedListTypeDescriptor); - if (result == null) result = caseIBoundedTypeDescriptor(iBoundedListTypeDescriptor); - if (result == null) result = caseITypeDescriptor(iBoundedListTypeDescriptor); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIInstanceSymbol(IInstanceSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IJava Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IJava Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIJavaSymbol(IJavaSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>ISymbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>ISymbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseISymbol(ISymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IType Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IType Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseITypeDescriptor(ITypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIDescribedInDetail(IDescribedInDetail object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIComponentSymbol(IComponentSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIPropertySymbol(IPropertySymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIMethodSymbol(IMethodSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IObject Symbol</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IObject Symbol</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIObjectSymbol(IObjectSymbol object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIListTypeDescriptor(IListTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) { - return null; - } - - /** - * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpretting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - public Object defaultCase(EObject object) { - return null; - } - -} //SymbolSwitch - diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java deleted file mode 100644 index 3e43b1440..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * EL symbols framework. - * - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.context.symbol; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java deleted file mode 100644 index b37344b04..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.provider; - -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.swt.graphics.Image; - -/** - * Adapts an object to appropriate content proposal - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface IContentProposalProvider -{ - /** - * @param target - * @param proposalFactory - * @return an content proposal for target or null - * if nothing appropriate can be created - */ - ICompletionProposal[] getProposals(Object target, - IProposalCreationFactory proposalFactory); - - /** - * Implementors of the class can configure certain aspects of the returned - * proposals - * - * @author cbateman - * - */ - public interface IProposalCreationFactory - { - /** - * @param replacementText The text to be replaced - * @param displayText The text to be displayed in the assist window - * @param additionalText The text to be displayed in the "addition info" - * or null - * @param displayImage The image to be displayed or null - * @param sourceObject The original source object. Implementors should - * make no assumptions (i.e. always test instanceof before casting) - * @return a configured completion proposal for the parameters - */ - ICompletionProposal createProposal(final String replacementText, - final String displayText, - final String additionalText, - final Image displayImage, - final Object sourceObject); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java deleted file mode 100644 index 588a48b01..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.provider; - -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; - -/** - * Default implementation of the proposal creation factory - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class ProposalCreationFactoryAdapter implements IProposalCreationFactory -{ - /** - * The absolute document offset where the replacement is to occur - */ - protected final int _replacementOffset; - /** - * The number of characters to replace starting from _replaceOffset with - * the proposal. 0 indicates insertion with no replacement - */ - protected final int _replacementLength; - - /** - * @param replacementOffset -- the absolute document offset to do the replacement - * @param replacementLength -- the number of characters to replace or 0 - * for insert without any replacement - */ - public ProposalCreationFactoryAdapter(final int replacementOffset, - final int replacementLength) - { - _replacementOffset = replacementOffset; - _replacementLength = replacementLength; - } - - public ICompletionProposal createProposal(String replacementText, - String displayText, String additionalText, Image displayImage, - Object targetObject) - - { - return createDefaultProposal(replacementText, - _replacementOffset, - _replacementLength, - replacementText.length(), - displayImage, - displayText, - null, - additionalText, - 1); - } - - /** - * Simple factory method for creating a default proposal - * - * @param replacementText - * @param replacementOffset - * @param replacementLength - * @param cursorPosition - * @param displayImage - * @param displayText - * @param contextInfo - * @param additionalText - * @param relevance - * @return a default configuration of the completion proposal based on - * the CustomCompletionProposal - */ - protected static ICompletionProposal - createDefaultProposal(final String replacementText, - final int replacementOffset, - final int replacementLength, - final int cursorPosition, - final Image displayImage, - final String displayText, - final IContextInformation contextInfo, - final String additionalText, - final int relevance) - { - return new CustomCompletionProposal(replacementText, - replacementOffset, - replacementLength, - cursorPosition, - displayImage, - displayText, - contextInfo, - additionalText, - relevance); - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java deleted file mode 100644 index c1dcf6340..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * Extended providers for the EL symbols framework. - * - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.context.symbol.provider; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java deleted file mode 100644 index 8904e9f3b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.source; - -import java.util.List; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.ISymbol; - -/** - * Must be sub-classed by all contextSymbolFactory extension point implementors - * to create context configured symbols - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class AbstractContextSymbolFactory -{ - /** - * @param symbolName -- the symbol name - * @param scope -- the scope of the symbol - * @param context -- the context; must be supported (call supports(context)) - * @param problems -- populated with problems found during symbol construction. - * @return a new ISymbol configured for the name, scope and context or null - * if the arguments are invalid but some other reason a symbol cannot be created. - * @throws IllegalArgumentException if this method is called with context - * for which supports(context) == false or if scope does not conform - * to exactly one of the ISymbolConstants.SYMBOL_SCOPE_* constants - * @deprecated Use the new create method instead. - */ - @Deprecated - public final ISymbol create(final String symbolName, final int scope, final IAdaptable context, final List problems) - { - if (!supports(context)) - { - throw new IllegalArgumentException("Unsupported context"); //$NON-NLS-1$ - } - else if (!ISymbolConstants.isValid(scope)) - { - throw new IllegalArgumentException("Unsupported symbol constant:"+scope); //$NON-NLS-1$ - } - - try - { - return internalCreate(symbolName, scope, context, problems, null); - } - catch (final Exception e) - { - JSFCommonPlugin.log(e, "During execution of context symbol factory: "+this.getClass().getName()); - return null; - } - } - - /** - * The same as create(symbolName, scope, context, problems), except it calls - * the internalCreate with additionalInfo. By default this has the same - * effect. - * - * @param symbolName - * @param scope - * @param context - * @param problems - * @param additionalInfo - * @return the new Symbol - */ - public final ISymbol create(final String symbolName, final int scope, final IAdaptable context, final List problems, final IAdditionalContextSymbolInfo additionalInfo) - { - if (!supports(context)) - { - throw new IllegalArgumentException("Unsupported context"); //$NON-NLS-1$ - } - else if (!ISymbolConstants.isValid(scope)) - { - throw new IllegalArgumentException("Unsupported symbol constant:"+scope); //$NON-NLS-1$ - } - - try - { - return internalCreate(symbolName, scope, context, problems, additionalInfo); - } - catch (final Exception e) - { - JSFCommonPlugin.log(e, "During execution of context symbol factory: "+this.getClass().getName()); - return null; - } - } - - - /** - * Use of this method is DISCOURAGED. It is preferable to move functionality - * to the new internalCreate method and have this one call it with null. - * - * This method will eventually be deprecated and removed - * - * @param symbolName - * @param scope - * @param context - * @param problems -- see problems arg on create - * @return a new ISymbol for the name, scope and context; may return null - * @deprecated Use the new internalCreate instead. Ignore the new - * additionalInfo parameter if you do not need it. - */ - @Deprecated - protected ISymbol internalCreate(final String symbolName, final int scope, final IAdaptable context, final List problems) - { - // do nothing by default - return null; - } - - /** - * NOTE: when migrating to this method, ensure that the other internalCreate - * method in your implementation doesn't create inconsistent behaviour. - * - * @param symbolName - * @param scope - * @param context Will conform to restrictions you set out in supports(). - * @param problems CURRENTLY IGNORED. - * @param additionalInfo May be null - * @since 3.0 - * @return a new ISymbol for the name, scope and context, but with the option - * to also consult additionalInfo passed by the framework. may return null. - */ - protected ISymbol internalCreate(final String symbolName, final int scope, final IAdaptable context, final List problems, final IAdditionalContextSymbolInfo additionalInfo) - { - // by default, call the other internalCreate for backward compatibility. - // implementers can override to do things with the additional info - return internalCreate(symbolName, scope, context, problems); - } - - /** - * @param context - * @return true if this factory supports the context - */ - public abstract boolean supports(IAdaptable context); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java deleted file mode 100644 index f793f81fe..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.source; - -import org.eclipse.core.resources.IProject; - -/** - * Default implementation of ISymbolSourceProviderFactory. Implementors may - * sub-class or create their own separate factory class. - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public abstract class AbstractSymbolSourceProviderFactory implements - ISymbolSourceProviderFactory -{ - private IProject _project; - - /** - * Default constructor used by extension manager to create this factory - */ - public AbstractSymbolSourceProviderFactory() - { - // do nothing - } - - /* (non-Javadoc) - * @see org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory#createInstance(org.eclipse.core.resources.IProject) - */ - public final ISymbolSourceProvider createInstance(IProject project) - { - _project = project; - return create(project); - } - - /** - * Override this method to do specialization of provider creation - * - * @param project - * @return the symbol source provider created by the subclass - */ - protected abstract ISymbolSourceProvider create(IProject project); - - /** - * @return the IProject that this source provider is associated with. - */ - protected final IProject getProject() - { - return _project; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java deleted file mode 100644 index ad069e7a0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2008 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.source; - - -/** - * Passed to AbstractContextSymbolFactory's to provide additional information. - * All information is optional and need not be used if not needed. - * - * Clients may use but NOT IMPLEMENT. New methods may be added without notice. - * - * @author cbateman - * @since 3.0 - * - */ -public interface IAdditionalContextSymbolInfo -{ - /** - * @return a suggested symbol type signature. May be null. - */ - String getSymbolTypeSignature(); - - /** - * @return the name of the attribute on the current element context that - * contains a value expression that may be used to find type information. - * May be null. - * - */ - String getValueExpressionAttributeName(); -}
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java deleted file mode 100644 index 590b79233..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java +++ /dev/null @@ -1,139 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.source; - -/** - * Defines global constants for symbols - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public class ISymbolConstants { - /** - * Mask to indicate all request scope symbols for a particular context - */ - public final static int SYMBOL_SCOPE_REQUEST = 1; - - /** - * Mask to indicate all session scope symbols for a particular context - */ - public final static int SYMBOL_SCOPE_SESSION = 2; - - /** - * Mask to indicate all application scope symbols for a particular context - */ - public final static int SYMBOL_SCOPE_APPLICATION = 4; - - /** - * Mask to indicate all 'none' scope symbols for a particular context - */ - public final static int SYMBOL_SCOPE_NONE = 8; - - /** - * All scopes - */ - public final static int SYMBOL_SCOPE_ALL = - SYMBOL_SCOPE_REQUEST - | SYMBOL_SCOPE_SESSION - | SYMBOL_SCOPE_APPLICATION - | SYMBOL_SCOPE_NONE; - - /** - * the string representation for request scope - */ - public final static String SYMBOL_SCOPE_REQUEST_STRING = "request"; //$NON-NLS-1$ - - - /** - * the string representation for session scope - */ - public final static String SYMBOL_SCOPE_SESSION_STRING = "session"; //$NON-NLS-1$ - - /** - * the string representation for application scope - */ - public final static String SYMBOL_SCOPE_APPLICATION_STRING = "application"; //$NON-NLS-1$ - - /** - * the string representation for none scope - */ - public final static String SYMBOL_SCOPE_NONE_STRING = "none"; //$NON-NLS-1$ - - /** - * @param scope - * @return true iff scope matches exactly one scope value (excluding ALL) - */ - public static boolean isValid(int scope) - { - return scope == SYMBOL_SCOPE_APPLICATION - || scope == SYMBOL_SCOPE_REQUEST - || scope == SYMBOL_SCOPE_SESSION - || scope == SYMBOL_SCOPE_NONE; - } - - /** - * @param scopeMask - * @return the string representation for a scope mask or null if either - * the mask contains more than one scope or the scope is not valid - */ - public static String getStringForMask(final int scopeMask) - { - if (scopeMask == SYMBOL_SCOPE_REQUEST) - { - return SYMBOL_SCOPE_REQUEST_STRING; - } - else if (scopeMask == SYMBOL_SCOPE_SESSION) - { - return SYMBOL_SCOPE_SESSION_STRING; - } - else if (scopeMask == SYMBOL_SCOPE_APPLICATION) - { - return SYMBOL_SCOPE_APPLICATION_STRING; - } - else if (scopeMask == SYMBOL_SCOPE_NONE) - { - return SYMBOL_SCOPE_NONE_STRING; - } - - return null; - } - - /** - * @param scopeString - * @return the scope mask for the string or -1 if the string is not - * one of SYMBOL_SCOPE_*_STRING - */ - public static int getMaskForString(final String scopeString) - { - if (SYMBOL_SCOPE_REQUEST_STRING.equals(scopeString)) - { - return SYMBOL_SCOPE_REQUEST; - } - else if (SYMBOL_SCOPE_SESSION_STRING.equals(scopeString)) - { - return SYMBOL_SCOPE_SESSION; - } - else if (SYMBOL_SCOPE_APPLICATION_STRING.equals(scopeString)) - { - return SYMBOL_SCOPE_APPLICATION; - } - else if (SYMBOL_SCOPE_NONE_STRING.equals(scopeString)) - { - return SYMBOL_SCOPE_NONE; - } - - return -1; - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java deleted file mode 100644 index 96dae6546..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.source; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.ISymbol; - -/** - * Defines a provider that acts as source of symbols. The - * implementor is usually context specific - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface ISymbolSourceProvider -{ - /** - * @param context - * @param symbolScopeMask - a mask resulting for ORing the SYMBOL_SCOPE_* - * constants to indicate what scopes to retrieve symbols for. - * @return all symbols in context matching symbolScopeMask - */ - ISymbol[] getSymbols(IAdaptable context, int symbolScopeMask); - - /** - * @param prefix - * @param context - * @param symbolScopeMask a mask resulting for ORing the SYMBOL_SCOPE_* - * @return the sub-set of getSymbols that conforms - * to String.startsWith(prefix) in context matching symbolScopeMask. - */ - ISymbol[] getSymbols(String prefix, IAdaptable context, int symbolScopeMask); - - /** - * @param context - * @return true if this provider has symbols for this context - */ - boolean isProvider(IAdaptable context); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java deleted file mode 100644 index 87b9558ed..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Cameron Bateman/Oracle - initial API and implementation - * - ********************************************************************************/ - -package org.eclipse.jst.jsf.context.symbol.source; - -import org.eclipse.core.resources.IProject; - -/** - * Implemented by extensions wishing to use symbolSourceProvider extension point - * to contribute designtime symbols to the JSF symbol resolver framework. - * - * Instance factory class must implement a zero-argument default constructor - * - * <p><b>Provisional API - subject to change</b></p> - * - * @author cbateman - * - */ -public interface ISymbolSourceProviderFactory -{ - /** - * @param project - * @return a new instance of a symbol source provider for project - */ - ISymbolSourceProvider createInstance(IProject project); -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java deleted file mode 100644 index b4a9cc784..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 Oracle Corporation. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - * - ********************************************************************************/ - -/** - * EL Symbols Framework Extension Point API. - * - * <p><b>Provisional API - subject to change</b></p> - */ -package org.eclipse.jst.jsf.context.symbol.source; diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.classpath b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.classpath deleted file mode 100644 index 304e86186..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.cvsignore deleted file mode 100644 index 3d95935d6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -build.xml -javaCompiler...args -temp.folder -@dot diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.project b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.project deleted file mode 100644 index 4246d9b44..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.jsf.standard.tagsupport</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ecfb123e4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sun May 27 16:04:06 EDT 2007 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 04e932e0d..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Tue Apr 10 09:31:38 PDT 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 78bb525d2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,22 +0,0 @@ -#Fri May 30 11:56:44 PDT 2008 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=1 -compilers.p.build=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=0 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=0 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF deleted file mode 100644 index d5b0848a3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.jst.jsf.standard.tagsupport;singleton:=true -Bundle-Version: 1.1.102.qualifier -Bundle-Localization: plugin -Bundle-Activator: org.eclipse.jst.jsf.standard.tagsupport.StandardTagSupportPlugin -Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jst.jsf.standard.tagsupport;x-internal:=true -Bundle-Vendor: %pluginProvider diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/about.html b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/about.html deleted file mode 100644 index 8e5605900..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June, 2008</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/build.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/build.properties deleted file mode 100644 index aa99bac66..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/build.properties +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - metadata/,\ - plugin.properties,\ - about.html,\ - icons/ -javacSource=1.5 -javacTarget=1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_A.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_A.gif Binary files differdeleted file mode 100644 index 4c57d0e22..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_A.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_FORM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_FORM.gif Binary files differdeleted file mode 100644 index cc27deb97..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_FORM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HEAD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HEAD.gif Binary files differdeleted file mode 100644 index 4bdc052c9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HEAD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HR.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HR.gif Binary files differdeleted file mode 100644 index 44e283d13..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_HR.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_IMG.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_IMG.gif Binary files differdeleted file mode 100644 index 776fc8feb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_IMG.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_BUTTON.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_BUTTON.gif Binary files differdeleted file mode 100644 index 9ead4e44a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_BUTTON.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_CHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_CHECKBOX.gif Binary files differdeleted file mode 100644 index 4a02dde9c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_CHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_HIDDEN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_HIDDEN.gif Binary files differdeleted file mode 100644 index d14d09fa9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_HIDDEN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_IMAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_IMAGE.gif Binary files differdeleted file mode 100644 index b12850f31..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_IMAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_PASSWORD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_PASSWORD.gif Binary files differdeleted file mode 100644 index 05d5fe549..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_PASSWORD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_RADIO.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_RADIO.gif Binary files differdeleted file mode 100644 index f6aeac0f5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_RADIO.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_TEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_TEXT.gif Binary files differdeleted file mode 100644 index 1c8fa1ecd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_INPUT_TEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_OBJECT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_OBJECT.gif Binary files differdeleted file mode 100644 index cba93bf83..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_OBJECT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_SELECT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_SELECT.gif Binary files differdeleted file mode 100644 index 3831d9583..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_SELECT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TABLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TABLE.gif Binary files differdeleted file mode 100644 index 9873b0928..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TABLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TEXTAREA.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TEXTAREA.gif Binary files differdeleted file mode 100644 index 25f22d860..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/large/HTML_TEXTAREA.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_A.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_A.gif Binary files differdeleted file mode 100644 index 5fd9c9494..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_A.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_BR.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_BR.gif Binary files differdeleted file mode 100644 index b46868549..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_BR.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_FORM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_FORM.gif Binary files differdeleted file mode 100644 index 3081f3235..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_FORM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HEAD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HEAD.gif Binary files differdeleted file mode 100644 index 4bdc052c9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HEAD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HR.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HR.gif Binary files differdeleted file mode 100644 index 19ab61434..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_HR.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_IMG.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_IMG.gif Binary files differdeleted file mode 100644 index 115cbc6fe..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_IMG.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_BUTTON.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_BUTTON.gif Binary files differdeleted file mode 100644 index 8e721c512..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_BUTTON.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_CHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_CHECKBOX.gif Binary files differdeleted file mode 100644 index 00da14ec8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_CHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_HIDDEN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_HIDDEN.gif Binary files differdeleted file mode 100644 index f18865b9a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_HIDDEN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_IMAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_IMAGE.gif Binary files differdeleted file mode 100644 index 2a7596399..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_IMAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_PASSWORD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_PASSWORD.gif Binary files differdeleted file mode 100644 index 25c2e2670..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_PASSWORD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_RADIO.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_RADIO.gif Binary files differdeleted file mode 100644 index 2598367c8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_RADIO.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_TEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_TEXT.gif Binary files differdeleted file mode 100644 index 7f506d902..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_INPUT_TEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_OBJECT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_OBJECT.gif Binary files differdeleted file mode 100644 index 745f6d914..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_OBJECT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_SELECT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_SELECT.gif Binary files differdeleted file mode 100644 index 247efe030..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_SELECT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TABLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TABLE.gif Binary files differdeleted file mode 100644 index d11c996e5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TABLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TEXTAREA.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TEXTAREA.gif Binary files differdeleted file mode 100644 index a2fa616a9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/HTML/small/HTML_TEXTAREA.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ACTIONLISTENER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ACTIONLISTENER.gif Binary files differdeleted file mode 100644 index 5dc1abc6c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ACTIONLISTENER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ATTRIBUTE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ATTRIBUTE.gif Binary files differdeleted file mode 100644 index d99d2eba7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_ATTRIBUTE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTDATETIME.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTDATETIME.gif Binary files differdeleted file mode 100644 index f9f3409e9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTDATETIME.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTER.gif Binary files differdeleted file mode 100644 index a8f5d3a78..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTNUMBER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTNUMBER.gif Binary files differdeleted file mode 100644 index 21b24f031..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_CONVERTNUMBER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_FACET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_FACET.gif Binary files differdeleted file mode 100644 index 6424c7faf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_FACET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_LOADBUNDLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_LOADBUNDLE.gif Binary files differdeleted file mode 100644 index e1cd4e1bb..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_LOADBUNDLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_PARAM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_PARAM.gif Binary files differdeleted file mode 100644 index 79e07c22c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_PARAM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEM.gif Binary files differdeleted file mode 100644 index 3831d9583..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEMS.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEMS.gif Binary files differdeleted file mode 100644 index b2a1c43df..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SELECTITEMS.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SUBVIEW.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SUBVIEW.gif Binary files differdeleted file mode 100644 index f37f41273..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_SUBVIEW.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATEDOUBLERANGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATEDOUBLERANGE.gif Binary files differdeleted file mode 100644 index afee57bcf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATEDOUBLERANGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELENGTH.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELENGTH.gif Binary files differdeleted file mode 100644 index afee57bcf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELENGTH.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELONGRANGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELONGRANGE.gif Binary files differdeleted file mode 100644 index afee57bcf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATELONGRANGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATOR.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATOR.gif Binary files differdeleted file mode 100644 index afee57bcf..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALIDATOR.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALUECHANGELISTENER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALUECHANGELISTENER.gif Binary files differdeleted file mode 100644 index 2fafdebbc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VALUECHANGELISTENER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VERBATIM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VERBATIM.gif Binary files differdeleted file mode 100644 index d284eb9f5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VERBATIM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VIEW.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VIEW.gif Binary files differdeleted file mode 100644 index 98294c189..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/large/JSF_VIEW.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ACTIONLISTENER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ACTIONLISTENER.gif Binary files differdeleted file mode 100644 index 67b2d33f6..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ACTIONLISTENER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ATTRIBUTE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ATTRIBUTE.gif Binary files differdeleted file mode 100644 index b77c75004..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_ATTRIBUTE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTDATETIME.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTDATETIME.gif Binary files differdeleted file mode 100644 index 779d8205f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTDATETIME.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTER.gif Binary files differdeleted file mode 100644 index 16466edfd..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTNUMBER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTNUMBER.gif Binary files differdeleted file mode 100644 index 938f364f4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_CONVERTNUMBER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_FACET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_FACET.gif Binary files differdeleted file mode 100644 index b9cb1485b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_FACET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gif Binary files differdeleted file mode 100644 index 8f40ee135..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_PARAM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_PARAM.gif Binary files differdeleted file mode 100644 index b3e0727e8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_PARAM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEM.gif Binary files differdeleted file mode 100644 index 247efe030..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEMS.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEMS.gif Binary files differdeleted file mode 100644 index 7fb0974db..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SELECTITEMS.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SUBVIEW.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SUBVIEW.gif Binary files differdeleted file mode 100644 index 974801573..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_SUBVIEW.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATEDOUBLERANGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATEDOUBLERANGE.gif Binary files differdeleted file mode 100644 index 86196e996..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATEDOUBLERANGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELENGTH.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELENGTH.gif Binary files differdeleted file mode 100644 index 86196e996..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELENGTH.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELONGRANGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELONGRANGE.gif Binary files differdeleted file mode 100644 index 86196e996..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATELONGRANGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATOR.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATOR.gif Binary files differdeleted file mode 100644 index 86196e996..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALIDATOR.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALUECHANGELISTENER.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALUECHANGELISTENER.gif Binary files differdeleted file mode 100644 index a1cd624a9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VALUECHANGELISTENER.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VERBATIM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VERBATIM.gif Binary files differdeleted file mode 100644 index f12c9df68..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VERBATIM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VIEW.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VIEW.gif Binary files differdeleted file mode 100644 index c81630a08..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFCORE/small/JSF_VIEW.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COLUMN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COLUMN.gif Binary files differdeleted file mode 100644 index 381154d55..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COLUMN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDBUTTON.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDBUTTON.gif Binary files differdeleted file mode 100644 index 9ead4e44a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDBUTTON.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDLINK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDLINK.gif Binary files differdeleted file mode 100644 index 4c57d0e22..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_COMMANDLINK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_DATATABLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_DATATABLE.gif Binary files differdeleted file mode 100644 index 9873b0928..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_DATATABLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_FORM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_FORM.gif Binary files differdeleted file mode 100644 index cc27deb97..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_FORM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_GRAPHICIMAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_GRAPHICIMAGE.gif Binary files differdeleted file mode 100644 index ad341a5af..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_GRAPHICIMAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTHIDDEN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTHIDDEN.gif Binary files differdeleted file mode 100644 index d14d09fa9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTHIDDEN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTSECRET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTSECRET.gif Binary files differdeleted file mode 100644 index 60c0a5d44..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTSECRET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXT.gif Binary files differdeleted file mode 100644 index 4cc147e98..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXTAREA.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXTAREA.gif Binary files differdeleted file mode 100644 index 25f22d860..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_INPUTTEXTAREA.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGE.gif Binary files differdeleted file mode 100644 index fb737eb84..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGES.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGES.gif Binary files differdeleted file mode 100644 index ca050e65f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_MESSAGES.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTFORMAT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTFORMAT.gif Binary files differdeleted file mode 100644 index ac5920dd5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTFORMAT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLABEL.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLABEL.gif Binary files differdeleted file mode 100644 index 348aa17b2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLABEL.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLINK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLINK.gif Binary files differdeleted file mode 100644 index 03b2bf908..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTLINK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTTEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTTEXT.gif Binary files differdeleted file mode 100644 index 295ecc4e8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_OUTPUTTEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGRID.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGRID.gif Binary files differdeleted file mode 100644 index a31479c3f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGRID.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGROUP.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGROUP.gif Binary files differdeleted file mode 100644 index da85fe9e8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_PANELGROUP.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTBOOLEANCHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTBOOLEANCHECKBOX.gif Binary files differdeleted file mode 100644 index 4a02dde9c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTBOOLEANCHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYCHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYCHECKBOX.gif Binary files differdeleted file mode 100644 index 31b1f37c5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYCHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYLISTBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYLISTBOX.gif Binary files differdeleted file mode 100644 index 0ed94433f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYLISTBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYMENU.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYMENU.gif Binary files differdeleted file mode 100644 index dc1dbbc8b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTMANYMENU.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONELISTBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONELISTBOX.gif Binary files differdeleted file mode 100644 index a1c257e59..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONELISTBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONEMENU.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONEMENU.gif Binary files differdeleted file mode 100644 index 3686b5cc1..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONEMENU.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONERADIO.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONERADIO.gif Binary files differdeleted file mode 100644 index f6aeac0f5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/large/JSF_SELECTONERADIO.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COLUMN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COLUMN.gif Binary files differdeleted file mode 100644 index 5a3db49aa..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COLUMN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDBUTTON.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDBUTTON.gif Binary files differdeleted file mode 100644 index 8e721c512..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDBUTTON.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDLINK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDLINK.gif Binary files differdeleted file mode 100644 index 5fd9c9494..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_COMMANDLINK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_DATATABLE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_DATATABLE.gif Binary files differdeleted file mode 100644 index d11c996e5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_DATATABLE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_FORM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_FORM.gif Binary files differdeleted file mode 100644 index 3081f3235..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_FORM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_GRAPHICIMAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_GRAPHICIMAGE.gif Binary files differdeleted file mode 100644 index a988c1d5f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_GRAPHICIMAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gif Binary files differdeleted file mode 100644 index f18865b9a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTSECRET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTSECRET.gif Binary files differdeleted file mode 100644 index 13dbf621a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTSECRET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXT.gif Binary files differdeleted file mode 100644 index 7f506d902..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXTAREA.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXTAREA.gif Binary files differdeleted file mode 100644 index a2fa616a9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_INPUTTEXTAREA.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGE.gif Binary files differdeleted file mode 100644 index 7d0c261e2..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGES.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGES.gif Binary files differdeleted file mode 100644 index 6f43980a3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_MESSAGES.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTFORMAT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTFORMAT.gif Binary files differdeleted file mode 100644 index 29dcd77f4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTFORMAT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLABEL.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLABEL.gif Binary files differdeleted file mode 100644 index b957bca24..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLABEL.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLINK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLINK.gif Binary files differdeleted file mode 100644 index 521695662..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTLINK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTTEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTTEXT.gif Binary files differdeleted file mode 100644 index 084514528..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_OUTPUTTEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGRID.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGRID.gif Binary files differdeleted file mode 100644 index dd22a9991..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGRID.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGROUP.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGROUP.gif Binary files differdeleted file mode 100644 index 0a13d8cca..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_PANELGROUP.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTBOOLEANCHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTBOOLEANCHECKBOX.gif Binary files differdeleted file mode 100644 index 00da14ec8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTBOOLEANCHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYCHECKBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYCHECKBOX.gif Binary files differdeleted file mode 100644 index 2e2370d31..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYCHECKBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYLISTBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYLISTBOX.gif Binary files differdeleted file mode 100644 index a20aed559..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYLISTBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYMENU.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYMENU.gif Binary files differdeleted file mode 100644 index 4cfeaa84b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTMANYMENU.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONELISTBOX.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONELISTBOX.gif Binary files differdeleted file mode 100644 index f6445ed39..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONELISTBOX.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONEMENU.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONEMENU.gif Binary files differdeleted file mode 100644 index 04a0d4304..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONEMENU.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONERADIO.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONERADIO.gif Binary files differdeleted file mode 100644 index 2598367c8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSFHTML/small/JSF_SELECTONERADIO.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DECLARATION.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DECLARATION.gif Binary files differdeleted file mode 100644 index 5403f7229..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DECLARATION.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.INCLUDE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.INCLUDE.gif Binary files differdeleted file mode 100644 index 592667047..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.INCLUDE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.PAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.PAGE.gif Binary files differdeleted file mode 100644 index e21e763b9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.PAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.TAGLIB.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.TAGLIB.gif Binary files differdeleted file mode 100644 index 723a10de7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_DIRECTIVE.TAGLIB.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_EXPRESSION.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_EXPRESSION.gif Binary files differdeleted file mode 100644 index 53a23e102..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_EXPRESSION.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FALLBACK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FALLBACK.gif Binary files differdeleted file mode 100644 index 2507aacd0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FALLBACK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FORWARD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FORWARD.gif Binary files differdeleted file mode 100644 index 774759510..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_FORWARD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_GETPROPERTY.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_GETPROPERTY.gif Binary files differdeleted file mode 100644 index 4d11f8d44..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_GETPROPERTY.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_INCLUDE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_INCLUDE.gif Binary files differdeleted file mode 100644 index 88e62b4cc..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_INCLUDE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAM.gif Binary files differdeleted file mode 100644 index 79e07c22c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAMS.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAMS.gif Binary files differdeleted file mode 100644 index 9f517aeb0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PARAMS.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PLUGIN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PLUGIN.gif Binary files differdeleted file mode 100644 index 2ba7b4b11..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_PLUGIN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_ROOT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_ROOT.gif Binary files differdeleted file mode 100644 index 922b61d03..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_ROOT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SCRIPTLET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SCRIPTLET.gif Binary files differdeleted file mode 100644 index a1d2e61c8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SCRIPTLET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SETPROPERTY.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SETPROPERTY.gif Binary files differdeleted file mode 100644 index 4d11f8d44..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_SETPROPERTY.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_TEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_TEXT.gif Binary files differdeleted file mode 100644 index 4cc147e98..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_TEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_USEBEAN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_USEBEAN.gif Binary files differdeleted file mode 100644 index 9d54e8b0c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/large/JSP_USEBEAN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DECLARATION.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DECLARATION.gif Binary files differdeleted file mode 100644 index 35f48efff..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DECLARATION.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.INCLUDE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.INCLUDE.gif Binary files differdeleted file mode 100644 index 1ef9c8fa9..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.INCLUDE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.PAGE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.PAGE.gif Binary files differdeleted file mode 100644 index 37c1e7cd8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.PAGE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.TAGLIB.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.TAGLIB.gif Binary files differdeleted file mode 100644 index 33ef3d820..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_DIRECTIVE.TAGLIB.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_EXPRESSION.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_EXPRESSION.gif Binary files differdeleted file mode 100644 index 66fd649da..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_EXPRESSION.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FALLBACK.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FALLBACK.gif Binary files differdeleted file mode 100644 index 4fb415010..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FALLBACK.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FORWARD.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FORWARD.gif Binary files differdeleted file mode 100644 index 1d3bafb31..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_FORWARD.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_GETPROPERTY.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_GETPROPERTY.gif Binary files differdeleted file mode 100644 index af4450a4b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_GETPROPERTY.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_INCLUDE.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_INCLUDE.gif Binary files differdeleted file mode 100644 index 2584c3185..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_INCLUDE.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAM.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAM.gif Binary files differdeleted file mode 100644 index b3e0727e8..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAM.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAMS.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAMS.gif Binary files differdeleted file mode 100644 index 40759226c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PARAMS.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PLUGIN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PLUGIN.gif Binary files differdeleted file mode 100644 index 04bab8e34..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_PLUGIN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_ROOT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_ROOT.gif Binary files differdeleted file mode 100644 index f6d19d4a0..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_ROOT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SCRIPTLET.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SCRIPTLET.gif Binary files differdeleted file mode 100644 index 1753b9627..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SCRIPTLET.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SETPROPERTY.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SETPROPERTY.gif Binary files differdeleted file mode 100644 index af4450a4b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_SETPROPERTY.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_TEXT.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_TEXT.gif Binary files differdeleted file mode 100644 index 7f506d902..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_TEXT.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_USEBEAN.gif b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_USEBEAN.gif Binary files differdeleted file mode 100644 index ba33db70f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/icons/palette/JSP/small/JSP_USEBEAN.gif +++ /dev/null diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.properties deleted file mode 100644 index 6a0ee5502..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.properties +++ /dev/null @@ -1,96 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -A.display-label=Link -A.description=This element allows the user to navigate the content of the document - -BR.display-label=Line Break -BR.description=This element is used to enforce a line break - -INPUT.BUTTON.display-label=Button -INPUT.BUTTON.description=An INPUT element with TYPE=SUBMIT represents an input option, typically a button, that instructs the user agent to submit the form - -INPUT.CHECKBOX.display-label=Checkbox -INPUT.CHECKBOX.description=An INPUT element with TYPE=CHECKBOX represents a boolean choice. A set of such elements with the same name represents an n-of-many choice field - -INPUT.HIDDEN.display-label=Hidden Field -INPUT.HIDDEN.description=An INPUT element with TYPE=HIDDEN represents a hidden field.The user does not interact with this field; instead, the VALUE attribute specifies the value of the field - -INPUT.IMAGE.display-label=Image Button -INPUT.IMAGE.description=An INPUT element with TYPE=IMAGE specifies an image resource to display, and allows input of two form fields: the x and y coordinate of a pixel chosen from the image - -INPUT.PASSWORD.display-label=Password Field -INPUT.PASSWORD.description=An INPUT element with TYPE=PASSWORD is a text field as above, except that the value is obscured as it is entered - -INPUT.RADIO.display-label=Radio Button -INPUT.RADIO.description=An INPUT element with TYPE=RADIO represents a boolean choice. A set of such elements with the same name represents a 1-of-many choice field - -INPUT.TEXT.display-label=Text Field -INPUT.TEXT.description=The default vaule of the TYPE attribute is TEXT, indicating a single line text entry field - -FORM.display-label=Form -FORM.description=The FORM element contains a sequence of input elements, along with document structuring elements - -HR.display-label=Horizontal Rule -HR.description=The HR element is a divider between sections of text; typically a full width horizontal rule or equivalent graphic - -IMG.display-label=Image -IMG.description=The IMG element refers to an image or icon via a hyperlink - -SELECT.display-label=Select -SELECT.description=The SELECT element constrains the form field to an enumerated list of values - -TABLE.display-label=Table -TABLE.description=HTML Tables are contained within a TABLE element. The TABLE element denotes the range of the table, and uses attribute to define properties of it - -TEXTAREA.display-label=Text Area -TEXTAREA.description=The TEXTAREA element represents a multi-line text field - - -any.dir.displayed-values.ltr=ltr (left-to-right) -any.dir.displayed-values.rtl=rtl (right-to-left) - -any.frame.displayed-values.none=none (no sides, default value) -any.frame.displayed-values.above=above (top side only) -any.frame.displayed-values.below=below (bottom side only) -any.frame.displayed-values.hsides=hsides (top and bottom sides only) -any.frame.displayed-values.vsides=vsides (right and left sides only) -any.frame.displayed-values.lhs=lhs (left hand side only) -any.frame.displayed-values.rhs=rhs (right hand side only) -any.frame.displayed-values.box=box (all four sides) -any.frame.displayed-values.border=border (all four sides) - -any.rules.displayed-values.none=none (no rules, default value) -any.rules.displayed-values.groups=groups (between row groups) -any.rules.displayed-values.rows=rows (between rows only) -any.rules.displayed-values.cols=cols (between columns only) -any.rules.displayed-values.all=all (between all rows and columns) - -any.shape.displayed-values.default=default (entire region) -any.shape.displayed-values.rect=rect (rectangular region) -any.shape.displayed-values.circle=circle (circular region) -any.shape.displayed-values.poly=poly (polygonal region) - -#categories -property.category.event=Event -property.category.language=Language -property.category.html=HTML -property.category.css=CSS -property.category.general=General -property.category.accessibility=Accessibility -property.category.visualProperty=VisualProperty -property.category.browser.specific=Browser Specific -property.category.core=Core -property.category.content=Content -property.category.data.binding=Data Binding -property.category.dynamic=Dynamic -property.category.file=File -property.category.image=Image - diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml deleted file mode 100644 index b069be651..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/html.xml +++ /dev/null @@ -1,729 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - xmlns:pi="http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore" - xmlns:qe="http://org.eclipse.jsf.pagedesigner/quickEditTabSections.ecore" - id="HTML" - type="tagFile"> - <trait id="paletteInfos" > - <value xsi:type="pi:PaletteInfos"> - <item id="BR"/> - <item id="INPUT.TEXT" tag="INPUT"/> - <item id="INPUT.BUTTON" tag="INPUT"> - <display-label>%INPUT.BUTTON.display-label</display-label> - <description>%INPUT.BUTTON.description</description> - <small-icon>small/HTML_INPUT_BUTTON.gif</small-icon> - <large-icon>small/HTML_INPUT_BUTTON.gif</large-icon> - <tag-create> - <attribute id="type" value="submit"/> - </tag-create> - </item> - <item id="INPUT.CHECKBOX" tag="INPUT"> - <display-label>%INPUT.CHECKBOX.display-label</display-label> - <description>%INPUT.CHECKBOX.description</description> - <small-icon>small/HTML_INPUT_CHECKBOX.gif</small-icon> - <large-icon>small/HTML_INPUT_CHECKBOX.gif</large-icon> - <tag-create> - <attribute id="type" value="checkbox"/> - </tag-create> - </item> - <item id="FORM"/> - <item id="INPUT.HIDDEN" tag="INPUT"> - <display-label>%INPUT.HIDDEN.display-label</display-label> - <description>%INPUT.HIDDEN.description</description> - <small-icon>small/HTML_INPUT_HIDDEN.gif</small-icon> - <large-icon>small/HTML_INPUT_HIDDEN.gif</large-icon> - <tag-create> - <attribute id="type" value="hidden"/> - </tag-create> - </item> - <item id="HR"/> - <item id="IMG"/> - <item id="INPUT.IMAGE" tag="INPUT"> - <display-label>%INPUT.IMAGE.display-label</display-label> - <description>%INPUT.IMAGE.description</description> - <small-icon>small/HTML_INPUT_IMAGE.gif</small-icon> - <large-icon>small/HTML_INPUT_IMAGE.gif</large-icon> - <tag-create> - <attribute id="type" value="image"/> - </tag-create> - </item> - <item id="A"/> - <item id="INPUT.PASSWORD" tag="INPUT"> - <display-label>%INPUT.PASSWORD.display-label</display-label> - <description>%INPUT.PASSWORD.description</description> - <small-icon>small/HTML_INPUT_PASSWORD.gif</small-icon> - <large-icon>small/HTML_INPUT_PASSWORD.gif</large-icon> - <tag-create> - <attribute id="type" value="password"/> - </tag-create> - </item> - <item id="INPUT.RADIO" tag="INPUT"> - <display-label>%INPUT.RADIO.display-label</display-label> - <description>%INPUT.RADIO.description</description> - <small-icon>small/HTML_INPUT_RADIO.gif</small-icon> - <large-icon>small/HTML_INPUT_RADIO.gif</large-icon> - <tag-create> - <attribute id="type" value="radio"/> - </tag-create> - </item> - <item id="SELECT"/> - <item id="TABLE"/> - <item id="TEXTAREA"/> - </value> - </trait> - - <trait id="images-base-path"> - <value>$nl$/icons/palette/HTML</value> - </trait> - - <trait id="display-label"> - <value>HTML 4.0</value> - </trait> - - <entity id="A"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%A.display-label</value> - </trait> - <trait id="description"> - <value>%A.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_A.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_A.gif</value> - </trait> - </entity> - <entity id="BODY"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <include-entity-group id="common-html-attributes"/> - </entity> - <entity id="BR"> - <include-entity-group id="common-core-attributes"/> - <trait id="display-label"> - <value>%BR.display-label</value> - </trait> - <trait id="description"> - <value>%BR.description</value> - </trait> - <trait id="expert"> - <value>true</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_BR.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_BR.gif</value> - </trait> - </entity> - <entity id="INPUT"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%INPUT.TEXT.display-label</value> - </trait> - <trait id="description"> - <value>%INPUT.TEXT.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_INPUT_TEXT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_INPUT_TEXT.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="FORM"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <include-entity-group id="form-event-attributes"/> - <trait id="display-label"> - <value>%FORM.display-label</value> - </trait> - <trait id="description"> - <value>%FORM.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_FORM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_FORM.gif</value> - </trait> - </entity> - <entity id="HEAD"> - <include-entity-group id="common-language-attributes"/> - </entity> - <entity id="HR"> - <include-entity-group id="common-core-attributes"/> - <trait id="display-label"> - <value>%HR.display-label</value> - </trait> - <trait id="description"> - <value>%HR.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_HR.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_HR.gif</value> - </trait> - </entity> - <entity id="HTML"> - <include-entity-group id="common-language-attributes"/> - </entity> - <entity id="IMG"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%IMG.display-label</value> - </trait> - <trait id="description"> - <value>%IMG.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_IMG.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_IMG.gif</value> - </trait> - </entity> - <entity id="LINK"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LinkType</value> - </trait> - </entity> - </entity> - <entity id="META"> - <include-entity-group id="common-language-attributes"/> - <entity id="content"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ContentType</value> - </trait> - </entity> - </entity> - <entity id="OBJECT"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="small-icon"> - <value>small/HTML_OBJECT.gif</value> - </trait> - </entity> - <entity id="SELECT"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%SELECT.display-label</value> - </trait> - <trait id="description"> - <value>%SELECT.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_SELECT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_SELECT.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="TABLE"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%TABLE.display-label</value> - </trait> - <trait id="description"> - <value>%TABLE.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_TABLE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_TABLE.gif</value> - </trait> - </entity> - <entity id="TEXTAREA"> - <include-entity-group id="common-core-attributes"/> - <include-entity-group id="common-language-attributes"/> - <include-entity-group id="common-event-attributes"/> - <trait id="display-label"> - <value>%TEXTAREA.display-label</value> - </trait> - <trait id="description"> - <value>%TEXTAREA.description</value> - </trait> - <trait id="small-icon"> - <value>small/HTML_TEXTAREA.gif</value> - </trait> - <trait id="large-icon"> - <value>large/HTML_TEXTAREA.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="TITLE"> - <include-entity-group id="common-language-attributes"/> - </entity> - <entityGroup id="common-html-attributes"> - <entity id="align"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>right</item> - <item>char</item> - <item>left</item> - <item>center</item> - <item>justify</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - - <entity id="alt"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="src"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="accesskey"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CharacterType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="accept"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="accept-charset"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="border"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="disabled"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="height"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LengthType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="ismap"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="longdesc"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.URIType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="maxlength"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="readonly"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - </entity> - <entity id="rel"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LinkType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="rev"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LinkType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="rows"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="shape"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>default</item> - <item>rect</item> - <item>circle</item> - <item>poly</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%any.shape.displayed-values.default</item> - <item>%any.shape.displayed-values.rect</item> - <item>%any.shape.displayed-values.circle</item> - <item>%any.shape.displayed-values.poly</item> - </value> - </trait> - <trait id="default-value"> - <value>default</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="size"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="tabindex"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="valid-maximum"><value>32767</value></trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="target"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>_self</item> - <item>_blank</item> - <item>_parent</item> - <item>_top</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="usemap"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="valign"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>middle</item> - <item>top</item> - <item>baseline</item> - <item>bottom</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - <entity id="width"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LengthType</value> - </trait> - <trait id="category"> - <value>%property.category.html</value> - </trait> - </entity> - - </entityGroup> - <entityGroup id="common-core-attributes"> - <entity id="id"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.core</value> - </trait> - </entity> - <entity id="class"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.core</value> - </trait> - </entity> - <entity id="style"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSStyleType</value> - </trait> - <trait id="category"> - <value>%property.category.core</value> - </trait> - </entity> - <entity id="title"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.core</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="common-event-attributes"> - <entity id="onclick"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="ondblclick"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onmousedown"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onmouseup"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onmouseover"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onmousemove"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onmouseout"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onkeypress"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onkeydown"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onkeyup"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <!--almost common events - should be refactored--> - <entity id="onblur"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onchange"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onfocus"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onselect"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="form-event-attributes"> - <entity id="onsubmit"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - <entity id="onreset"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ScriptType</value> - </trait> - <trait id="category"> - <value>%property.category.event</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="common-language-attributes" > - <entity id="dir"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>ltr</item> - <item>rtl</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%any.dir.displayed-values.ltr</item> - <item>%any.dir.displayed-values.rtl</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.language</value> - </trait> - </entity> - <entity id="lang"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LanguageCodeType</value> - </trait> - <trait id="category"> - <value>%property.category.language</value> - </trait> - </entity> - </entityGroup> -</md:metadatamodel>
\ No newline at end of file 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 deleted file mode 100644 index 3ca4a9899..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml +++ /dev/null @@ -1,509 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - xmlns:cnst="http://org.eclipse.jst.jsf.core/constraints.ecore" - xmlns:qe="http://org.eclipse.jsf.pagedesigner/QuickEditTabSections.ecore" - id="http://java.sun.com/jsf/core" - type="tagFile"> - - <entity id="actionListener" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="type"/> - </value> - </trait> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.JavaClassType - </value> - </trait> - <trait id="valid-interfaces"> - <value>javax.faces.event.ActionListener</value> - </trait> - </entity> - </entity> - <entity id="attribute" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="name"/> - <section id="value"/> - </value> - </trait> - </entity> - <entity id="convertDateTime" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="section.general.convertDateTime" type="SECTION"/> - </value> - </trait> - <entity id="dateStyle"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.StringType - </value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>default</item> - <item>short</item> - <item>medium</item> - <item>long</item> - <item>full</item> - </value> - </trait> - <trait id="default-value"> - <value>default</value> - </trait> - </entity> - <entity id="timeStyle"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.StringType - </value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>default</item> - <item>short</item> - <item>medium</item> - <item>long</item> - <item>full</item> - </value> - </trait> - <trait id="default-value"> - <value>default</value> - </trait> - </entity> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.StringType - </value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>date</item> - <item>time</item> - <item>both</item> - </value> - </trait> - <trait id="default-value"> - <value>both</value> - </trait> - </entity> - <entity id="pattern"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.DateTimePatternType - </value> - </trait> - </entity> - <entity id="locale"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LocaleType - </value> - </trait> - </entity> - </entity> - <entity id="convertNumber" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="section.general.convertNumber" type="SECTION"/> - </value> - </trait> - <entity id="groupingUsed"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.BooleanType - </value> - </trait> - <trait id="default-value"> - <value>true</value> - </trait> - </entity> - <entity id="integerOnly"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.BooleanType - </value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - </entity> - <entity id="maxFractionDigits"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.IntegerType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - <entity id="maxIntegerDigits"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.IntegerType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - <entity id="minFractionDigits"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.IntegerType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - <entity id="minIntegerDigits"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.IntegerType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.StringType - </value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>number</item> - <item>currency</item> - <item>percent</item> - </value> - </trait> - <trait id="default-value"> - <value>number</value> - </trait> - </entity> - <entity id="locale"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LocaleType - </value> - </trait> - </entity> - <entity id="pattern"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.NumberPatternType - </value> - </trait> - </entity> - <entity id="currencyCode"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.CurrencyCodeType - </value> - </trait> - </entity> - </entity> - <entity id="converter" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="converterId"/> - </value> - </trait> - <entity id="converterId"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.FacesConfigConverterIDType - </value> - </trait> - <trait id="config-type"> - <value>javax.faces.convert.Converter</value> - </trait> - </entity> - </entity> - <entity id="facet" type="tag"> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="name"/> - </value> - </trait> - </entity> - <entity id="loadBundle" type="tag"> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="basename"/> - <section id="var"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="var"> - <trait id="contributes-value-binding"> - <value>true</value> - </trait> - <trait id="value-binding-scope"> - <value>request</value> - </trait> - <trait id="value-binding-symbol-factory"> - <value>org.eclipse.jst.jsf.designtime.core.loadBundle</value> - </trait> - </entity> - <entity id="basename"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.ResourceBundleType - </value> - </trait> - </entity> - </entity> - <entity id="param" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="name"/> - <section id="value"/> - <section id="binding"/> - </value> - </trait> - </entity> - <entity id="selectItem" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="itemLabel"/> - <section id="itemValue"/> - </value> - </trait> - <entity id="itemDisabled"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.BooleanType - </value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - </entity> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.ValueBindingType - </value> - </trait> - <trait id="runtime-return-type"> - <value>javax.faces.model.SelectItem</value> - </trait> - </entity> - </entity> - <entity id="selectItems" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="binding"/> - </value> - </trait> - </entity> - <entity id="subview" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - </value> - </trait> - <entity id="rendered"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.BooleanType - </value> - </trait> - </entity> - </entity> - <entity id="validateDoubleRange" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="minimum"/> - <section id="maximum"/> - </value> - </trait> - <entity id="maximum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.DoubleType - </value> - </trait> - </entity> - <entity id="minimum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.DoubleType - </value> - </trait> - </entity> - </entity> - <entity id="validateLength" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="minimum"/> - <section id="maximum"/> - </value> - </trait> - <entity id="maximum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LongType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - <entity id="minimum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LongType - </value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - </entity> - </entity> - <entity id="validateLongRange" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="minimum"/> - <section id="maximum"/> - </value> - </trait> - <entity id="maximum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LongType - </value> - </trait> - </entity> - <entity id="minimum"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.LongType - </value> - </trait> - </entity> - </entity> - <entity id="validator" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="validatorId"/> - </value> - </trait> - <entity id="validatorId"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.FacesConfigValidatorIDType - </value> - </trait> - <trait id="config-type"> - <value>javax.faces.validator.Validator</value> - </trait> - </entity> - </entity> - <entity id="valueChangeListener" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="type"/> - </value> - </trait> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.JavaClassType - </value> - </trait> - <trait id="valid-interfaces"> - <value>javax.faces.event.ValueChangeListener</value> - </trait> - </entity> - </entity> - <entity id="verbatim" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="escape"/> - </value> - </trait> - <entity id="escape"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.BooleanType - </value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - </entity> - </entity> - <entity id="view" type="tag"> - <include-entity-group id="common-core-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="locale"/> - </value> - </trait> - <entity id="locale"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LocaleType </value> - </trait> - </entity> - </entity> - - <entityGroup id="common-core-attributes" type="tag"> - <entity id="binding"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.ComponentBindingType - </value> - </trait> - <trait id="runtime-return-type"> - <value>javax.faces.component.UIComponent</value> - </trait> - </entity> - <entity id="id"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.ComponentIDType - </value> - </trait> - </entity> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value> - org.eclipse.jst.jsf.core.attributevalues.ValueBindingType - </value> - </trait> - </entity> - </entityGroup> -</md:metadatamodel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_dti.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_dti.xml deleted file mode 100644 index 975d15382..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_dti.xml +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:dti="http://org.eclipse.jsf.pagedesigner/dtinfo.ecore" - id="http://java.sun.com/jsf/core" - type="tagFile"> - - <entity id="actionListener" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_ACTIONLISTENER.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="attribute" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_ATTRIBUTE.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="convertDateTime" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_CONVERTDATETIME.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="converter" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_CONVERTER.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="convertNumber" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_CONVERTNUMBER.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="facet" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="span"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - minHeight="10" - minWidth="10" - multiLevel="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="loadBundle" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.LoadBundleOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="param" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_PARAM.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="selectItem" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_SELECTITEM.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="selectItems" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_SELECTITEMS.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="subview" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_SUBVIEW.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="validateDoubleRange" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_VALIDATEDOUBLERANGE.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="validateLength" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_VALIDATELENGTH.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="validateLongRange" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_VALIDATELONGRANGE.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="validator" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_VALIDATOR.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="valueChangeListener" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFCORE/small/JSF_VALUECHANGELISTENER.gif" - widget="true" - - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="verbatim" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="span"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - minHeight="10" - minWidth="10" - multiLevel="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="view" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="div"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.properties deleted file mode 100644 index 1faabda84..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.properties +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -JSFCORE.display-label=JSF Core
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.xml deleted file mode 100644 index 227a40e91..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core_pi.xml +++ /dev/null @@ -1,188 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:pi="http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore" - id="http://java.sun.com/jsf/core" - type="tagFile"> - - <trait id="is-jsf-component-library"> - <value>true</value> - </trait> - - <trait id="paletteInfos" > - <value xsi:type="pi:PaletteInfos"> - <item id="view"/> - <item id="validator"/> - <item id="valueChangeListener"/> - <item id="actionListener"/> - <item id="convertDateTime"/> - <item id="converter"/> - <item id="convertNumber"/> - <item id="facet"/> - <item id="attribute"/> - <item id="loadBundle"/> - <item id="param"/> - <item id="selectItem"/> - <item id="selectItems"/> - <item id="subview"/> - <item id="validateDoubleRange"/> - <item id="validateLength"/> - <item id="validateLongRange"/> - <item id="verbatim"/> - </value> - </trait> - - <trait id="images-base-path"> - <value>icons/palette/JSFCORE</value> - </trait> - - <trait id="display-label"> - <value>%JSFCORE.display-label</value> - </trait> - - <entity id="actionListener" type="tag"> - <trait id="small-icon"> - <value>small/JSF_ACTIONLISTENER.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_ACTIONLISTENER.gif</value> - </trait> - </entity> - <entity id="attribute" type="tag"> - <trait id="small-icon"> - <value>small/JSF_ATTRIBUTE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_ATTRIBUTE.gif</value> - </trait> - </entity> - <entity id="convertDateTime" type="tag"> - <trait id="small-icon"> - <value>small/JSF_CONVERTDATETIME.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_CONVERTDATETIME.gif</value> - </trait> - </entity> - <entity id="convertNumber" type="tag"> - <trait id="small-icon"> - <value>small/JSF_CONVERTNUMBER.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_CONVERTNUMBER.gif</value> - </trait> - </entity> - <entity id="converter" type="tag"> - <trait id="small-icon"> - <value>small/JSF_CONVERTER.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_CONVERTER.gif</value> - </trait> - </entity> - <entity id="facet" type="tag"> - <trait id="small-icon"> - <value>small/JSF_FACET.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_FACET.gif</value> - </trait> - </entity> - <entity id="loadBundle" type="tag"> - <trait id="small-icon"> - <value>small/JSF_LOADBUNDLE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_LOADBUNDLE.gif</value> - </trait> - </entity> - <entity id="param" type="tag"> - <trait id="small-icon"> - <value>small/JSF_PARAM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_PARAM.gif</value> - </trait> - </entity> - <entity id="selectItem" type="tag"> - <trait id="small-icon"> - <value>small/JSF_SELECTITEM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTITEM.gif</value> - </trait> - </entity> - <entity id="selectItems" type="tag"> - <trait id="small-icon"> - <value>small/JSF_SELECTITEMS.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTITEMS.gif</value> - </trait> - </entity> - <entity id="subview" type="tag"> - <trait id="small-icon"> - <value>small/JSF_SUBVIEW.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SUBVIEW.gif</value> - </trait> - </entity> - <entity id="validateDoubleRange" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VALIDATEDOUBLERANGE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VALIDATEDOUBLERANGE.gif</value> - </trait> - </entity> - <entity id="validateLength" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VALIDATELENGTH.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VALIDATELENGTH.gif</value> - </trait> - </entity> - <entity id="validateLongRange" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VALIDATELONGRANGE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VALIDATELONGRANGE.gif</value> - </trait> - </entity> - <entity id="validator" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VALIDATOR.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VALIDATOR.gif</value> - </trait> - </entity> - <entity id="valueChangeListener" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VALUECHANGELISTENER.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VALUECHANGELISTENER.gif</value> - </trait> - </entity> - <entity id="verbatim" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VERBATIM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VERBATIM.gif</value> - </trait> - </entity> - <entity id="view" type="tag"> - <trait id="small-icon"> - <value>small/JSF_VIEW.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_VIEW.gif</value> - </trait> - </entity> -</md:metadatamodel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.properties deleted file mode 100644 index 7279b8b88..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.properties +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -messages.layout.displayed-values.list=list (an HTML list) -messages.layout.displayed-values.table=table (an HTML table) - -selectManyCheckbox.layout.displayed-values.pageDirection=pageDirection (list is laid out vertically) -selectManyCheckbox.layout.displayed-values.lineDirection=lineDirection (list is laid out horizontally) - -selectOneRadio.layout.displayed-values.pageDirection=pageDirection (list is laid out vertically) -selectOneRadio.layout.displayed-values.lineDirection=lineDirection (list is laid out horizontally) - -any.frame.displayed-values.none=none (no sides, default value) -any.frame.displayed-values.above=above (top side only) -any.frame.displayed-values.below=below (bottom side only) -any.frame.displayed-values.hsides=hsides (top and bottom sides only) -any.frame.displayed-values.vsides=vsides (right and left sides only) -any.frame.displayed-values.lhs=lhs (left hand side only) -any.frame.displayed-values.rhs=rhs (right hand side only) -any.frame.displayed-values.box=box (all four sides) -any.frame.displayed-values.border=border (all four sides) - -any.rules.displayed-values.none=none (no rules, default value) -any.rules.displayed-values.groups=groups (between row groups) -any.rules.displayed-values.rows=rows (between rows only) -any.rules.displayed-values.cols=cols (between columns only) -any.rules.displayed-values.all=all (between all rows and columns) - -property.category.event=Event -property.category.language=Language -property.category.html=HTML -property.category.css=CSS -property.category.jsf=JSF -property.category.general=General -property.category.accessibility=Accessibility -property.category.visualProperty=VisualProperty -property.category.browser.specific=Browser Specific -property.category.core=Core -property.category.content=Content -property.category.data.binding=Data Binding -property.category.dynamic=Dynamic -property.category.file=File -property.category.image=Image diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.xml deleted file mode 100644 index 53054127a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.xml +++ /dev/null @@ -1,1244 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - xmlns:cnst="http://org.eclipse.jst.jsf.core/constraints.ecore" - xmlns:qe="http://org.eclipse.jsf.pagedesigner/QuickEditTabSections.ecore" - id="http://java.sun.com/jsf/html" - type="tagFile"> - - <entity id="column" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - </value> - </trait> - </entity> - <entity id="commandButton" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="action"/> - <section id="type"/> - <section id="style"/> - <section id="section.general.commandButton.listener" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - <tagId> - <uri>http://java.sun.com/jsf/html</uri> - <name>form</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="type"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>button</item> - <item>reset</item> - <item>submit</item> - </value> - </trait> - <trait id="default-value"> - <value>submit</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="image"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.WebPathType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - </entity> - <entity id="commandLink" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="action"/> - <section id="style"/> - <section id="section.general.commandLink.listener" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - <tagId> - <uri>http://java.sun.com/jsf/html</uri> - <name>form</name> - </tagId> - </satisfies-set> - </value> - </trait> - </entity> - <entity id="dataTable" type="tag"> - <include-entity-group id="jsf-table-attributes"/> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="var"/> - <section id="width"/> - <section id="border"/> - <section id="bgcolor"/> - <section id="style"/> - <section id="section.general.dataTable.columns" type="SECTION"/> - </value> - </trait> - <entity id="bgcolor"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ColorType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="var"> - <trait id="contributes-value-binding"> - <value>true</value> - </trait> - <trait id="value-binding-scope"> - <value>request</value> - </trait> - <trait id="value-binding-symbol-factory"> - <value>org.eclipse.jst.jsf.designtime.core.loadBundle</value> - </trait> - <trait id="category"><value>%property.category.jsf</value></trait> - </entity> - </entity> - <entity id="form" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <include-entity-group id="form-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="graphicImage" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="url"/> - <section id="binding"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="inputHidden" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <!-- <section id="section.general.inputHidden.type" type="SECTION"/> --> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="inputSecret" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <!-- <section id="section.general.inputSecret.type" type="SECTION"/> --> - <section id="section.general.inputText.others" type="SECTION"/> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="inputText" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <!-- <section id="section.general.inputText.type" type="SECTION"/> --> - <section id="section.general.inputText.others" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="inputTextarea" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <!-- <section id="section.general.inputTextarea.type" type="SECTION"/> --> - <section id="section.general.inputTextarea.others" type="SECTION"/> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="message" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="for-entity"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="for"/> - </value> - </trait> - </entity> - <entity id="messages" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="layout"/> - <section id="style"/> - </value> - </trait> - <entity id="layout"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>list</item> - <item>table</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%messages.layout.displayed-values.list</item> - <item>%messages.layout.displayed-values.table</item> - </value> - </trait> - <trait id="default-value"> - <value>list</value> - </trait> - </entity> - </entity> - <entity id="outputFormat" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <section id="section.general.outputFormat.params" type="SECTION"/> - </value> - </trait> - </entity> - <entity id="outputLabel" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <include-entity-group id="for-entity"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="for"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="outputLink" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="outputText" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="binding"/> - <section id="style"/> - <section id="section.general.outputText.converter" type="SECTION"/> - </value> - </trait> - </entity> - <entity id="panelGrid" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="jsf-table-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="columns"/> - <section id="border"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="panelGroup" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - </value> - </trait> - </entity> - <entity id="selectBooleanCheckbox" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectManyCheckbox" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="layout"/> - <section id="style"/> - <section id="section.general.selectManyCheckbox.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="layout"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>pageDirection</item> - <item>lineDirection</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%selectManyCheckbox.layout.displayed-values.pageDirection</item> - <item>%selectManyCheckbox.layout.displayed-values.lineDirection</item> - </value> - </trait> - <trait id="default-value"> - <value>lineDirection</value> - </trait> - </entity> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectManyListbox" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="size"/> - <section id="style"/> - <section id="section.general.selectManyListbox.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectManyMenu" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <section id="section.general.selectManyMenu.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectOneListbox" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="size"/> - <section id="style"/> - <section id="section.general.selectOneListbox.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectOneMenu" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="style"/> - <section id="section.general.selectOneMenu.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - </entity> - <entity id="selectOneRadio" type="tag"> - <include-entity-group id="basic-jsf-html-attributes"/> - <include-entity-group id="common-jsf-html-attributes"/> - <include-entity-group id="common-html-attributes" uri="HTML"/> - <include-entity-group id="common-language-attributes" uri="HTML"/> - <include-entity-group id="common-core-attributes" uri="HTML"/> - <include-entity-group id="common-event-attributes" uri="HTML"/> - <trait id="quick-edit-tab"> - <value xsi:type="qe:QuickEditTabSections"> - <section id="id"/> - <section id="value"/> - <section id="layout"/> - <section id="style"/> - <section id="section.general.selectOneRadio.choices" type="SECTION"/> - </value> - </trait> - <trait id="containment-constraint"> - <value xsi:type="cnst:ContainsTagConstraint"> - <set-generator> - <algorithm>xpath</algorithm> - <expression>ancestor::*</expression> - </set-generator> - <satisfies-set> - <tagId> - <uri>http://java.sun.com/jsf/core</uri> - <name>view</name> - </tagId> - </satisfies-set> - </value> - </trait> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueType</value> - </trait> - <trait id="runtime-type-setter-required"> - <value>true</value> - </trait> - </entity> - <entity id="layout"> - <include-entity-group>common-attributes</include-entity-group> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>pageDirection</item> - <item>lineDirection</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%selectOneRadio.layout.displayed-values.pageDirection</item> - <item>%selectOneRadio.layout.displayed-values.lineDirection</item> - </value> - </trait> - <trait id="default-value"> - <value>lineDirection</value> - </trait> - </entity> - </entity> - <entityGroup id="basic-jsf-html-attributes"> - <entity id="id"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ComponentIDType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="binding"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ComponentBindingType</value> - </trait> - <trait id="runtime-return-type"> - <value>javax.faces.component.UIComponent</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="converter"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.FacesConfigConverterIDType</value> - </trait> - <trait id="config-type"> - <value>javax.faces.convert.Converter</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="rendered"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="required"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="styleClass"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="value"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ValueBindingType</value> - </trait> - <trait id="runtime-return-type"> - <value>java.lang.String</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="valueChangeListener"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.MethodBindingType</value> - </trait> - <trait id="runtime-return-type"> - <value>void</value> - </trait> - <trait id="runtime-param-types"> - <value>javax.faces.event.ValueChangeEvent</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="validator"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.MethodBindingType</value> - </trait> - <trait id="runtime-return-type"> - <value>void</value> - </trait> - <trait id="runtime-param-types"> - <value xsi:type="mdt:ListOfValues"> - <item>javax.faces.context.FacesContext</item> - <item>javax.faces.component.UIComponent</item> - <item>java.lang.Object</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="common-jsf-html-attributes"> - <!-- This group will be refactored --> - <entity id="action"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.ActionType</value> - </trait> - <trait id="runtime-return-type"> - <value>java.lang.String</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="actionListener"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.MethodBindingType</value> - </trait> - <trait id="runtime-return-type"> - <value>void</value> - </trait> - <trait id="runtime-param-types"> - <value>javax.faces.event.ActionEvent</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="cols"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="escape"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="default-value"> - <value>true</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="globalOnly"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="immediate"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="readonly"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="redisplay"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - - <entity id="showDetail"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="default-value"> - <value>true</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="dalign"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>right</item> - <item>left</item> - <item>center</item> - <item>justify</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="ialign"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>bottom</item> - <item>middle</item> - <item>top</item> - <item>right</item> - <item>left</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="linktype"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.LinkType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>index</item> - <item>subsection</item> - <item>bookmark</item> - <item>start</item> - <item>next</item> - <item>stylesheet</item> - <item>chapter</item> - <item>help</item> - <item>alternate</item> - <item>appendix</item> - <item>contents</item> - <item>section</item> - <item>prev</item> - <item>previous</item> - <item>glossary</item> - <item>copyright</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="media"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>tv</item> - <item>braille</item> - <item>tty</item> - <item>print</item> - <item>all</item> - <item>projection</item> - <item>handheld</item> - <item>screen</item> - <item>aural</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="scope"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>row</item> - <item>col</item> - <item>rowgroup</item> - <item>colgroup</item> - </value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="jsf-table-attributes"> - <entity id="bgcolor"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="border"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="cellpadding"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="cellspacing"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"><value>0</value></trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="columns"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"> - <value>0</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="columnClasses"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="first"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.IntegerType</value> - </trait> - <trait id="valid-minimum"> - <value>0</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="footerClass"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="frame"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>none</item> - <item>above</item> - <item>below</item> - <item>hsides</item> - <item>vsides</item> - <item>lhs</item> - <item>rhs</item> - <item>box</item> - <item>border</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%any.frame.displayed-values.none</item> - <item>%any.frame.displayed-values.above</item> - <item>%any.frame.displayed-values.below</item> - <item>%any.frame.displayed-values.hsides</item> - <item>%any.frame.displayed-values.vsides</item> - <item>%any.frame.displayed-values.lhs</item> - <item>%any.frame.displayed-values.rhs</item> - <item>%any.frame.displayed-values.box</item> - <item>%any.frame.displayed-values.border</item> - </value> - </trait> - <trait id="default-value"> - <value>none</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="headerClass"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="rowClasses"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.CSSClassType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="rules"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="valid-values"> - <value xsi:type="mdt:ListOfValues"> - <item>none</item> - <item>groups</item> - <item>rows</item> - <item>cols</item> - <item>all</item> - </value> - </trait> - <trait id="displayed-values"> - <value xsi:type="mdt:ListOfValues"> - <item>%any.rules.displayed-values.none</item> - <item>%any.rules.displayed-values.groups</item> - <item>%any.rules.displayed-values.rows</item> - <item>%any.rules.displayed-values.cols</item> - <item>%any.rules.displayed-values.all</item> - </value> - </trait> - <trait id="default-value"> - <value>none</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="showSummary"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.BooleanType</value> - </trait> - <trait id="default-value"> - <value>false</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - <entity id="summary"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - </entityGroup> - <entityGroup id="for-entity"> - <entity id="for"> - <trait id="attribute-value-runtime-type"> - <value>org.eclipse.jst.jsf.core.attributevalues.StringType</value> - </trait> - <trait id="category"> - <value>%property.category.jsf</value> - </trait> - </entity> - </entityGroup> -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_dti.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_dti.xml deleted file mode 100644 index 8841c0b11..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_dti.xml +++ /dev/null @@ -1,842 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:dti="http://org.eclipse.jsf.pagedesigner/dtinfo.ecore" - id="http://java.sun.com/jsf/html" - type="tagFile"> - - <entity id="column" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.ColumnOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - /> - </value> - </trait> - </entity> - - <entity id="commandButton" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="input"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <!-- if image attribute exists --> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@image"/> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="type"/> - <parameter value="image"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="image"/> - <parameter value="src"/> - </operation> - </operation> - <!-- if image attribute does not exist --> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@image"/> - <!-- create default type attribute (submit) --> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="type"/> - <parameter value="submit"/> - </operation> - <!-- override default if type attribute is set (e.g. reset) --> - <operation id="org.eclipse.jst.pagedesigner.CopyAttributeOperation"> - <parameter value="type"/> - </operation> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview"> - <resolve-attribute-value attributeName="value"/> - </tag-decorate-info> - </value> - </trait> - </entity> - - <entity id="commandLink" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="a"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="href"/> - <parameter value="#"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.ConvertAttributeToTextOperation"> - <parameter value="value"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - needBorderDecorator="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - resolveChildText="true" - /> - </value> - </trait> - </entity> - - <entity id="dataTable" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.DataTableOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - needBorderDecorator="true" - needTableDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="form" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="form"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="graphicImage" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="img"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="url"/> - <parameter value="src"/> - </operation> - <!-- - if both "value" and "url" source attributes exist, - "value" overrides "url" as destination "src" attribute - --> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="value"/> - <parameter value="src"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - > - <resolve-attribute-value attributeName="src"/> - </tag-decorate-info> - <tag-decorate-info id="vpd-decorate-preview"> - <resolve-attribute-value attributeName="src"/> - </tag-decorate-info> - </value> - </trait> - </entity> - - <entity id="inputHidden" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gif" - widget="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="inputSecret" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="input"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="type"/> - <parameter value="password"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview"> - <resolve-attribute-value attributeName="value"/> - </tag-decorate-info> - </value> - </trait> - </entity> - - <entity id="inputText" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="input"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="type"/> - <parameter value="text"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview"> - <resolve-attribute-value attributeName="value"/> - </tag-decorate-info> - </value> - </trait> - </entity> - - <entity id="inputTextarea" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="textarea"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.ConvertAttributeToTextOperation"> - <parameter value="value"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - resolveChildText="true" - /> - </value> - </trait> - </entity> - - <entity id="message" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFHTML/small/JSF_MESSAGE.gif" - widget="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="messages" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-decorate-info id="vpd-decorate-design" - nonVisual="true" - nonVisualImagePath="icons/palette/JSFHTML/small/JSF_MESSAGES.gif" - widget="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - nonVisual="true" - /> - </value> - </trait> - </entity> - - <entity id="outputFormat" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="span"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.ConvertAttributeToTextOperation"> - <parameter value="value"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - needBorderDecorator="true" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - resolveChildText="true" - /> - </value> - </trait> - </entity> - - <entity id="outputLabel" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="label"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.ConvertAttributeToTextOperation"> - <parameter value="value"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - needBorderDecorator="true" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - resolveChildText="true" - /> - </value> - </trait> - </entity> - - <entity id="outputLink" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="a"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="href"/> - <parameter value="#"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="value"/> - <parameter value="href"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="outputText" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="span"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.ConvertAttributeToTextOperation"> - <parameter value="value"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - needBorderDecorator="true" - multiLevel="true" - widget="true" - setNonVisualChildElements="true" - /> - <tag-decorate-info id="vpd-decorate-preview" - resolveChildText="true" - /> - </value> - </trait> - </entity> - - <entity id="panelGrid" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.PanelGridOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - needBorderDecorator="true" - needTableDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="panelGroup" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="div"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyChildrenOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="selectBooleanCheckbox" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="input"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="type"/> - <parameter value="checkbox"/> - </operation> - <!-- if value attribute exists and is "true" --> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="self::node()[@value='true']"/> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="checked"/> - <parameter value="checked"/> - </operation> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - /> - </value> - </trait> - </entity> - - <entity id="selectManyCheckbox" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.SelectManyCheckboxOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - - <entity id="selectManyListbox" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="select"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="id"/> - <parameter value="name"/> - </operation> - <!-- multiple select allowed --> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="multiple"/> - <parameter value="multiple"/> - </operation> - <!-- if no "size" attribute --> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@size"/> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeFromXPathOperation"> - <parameter value="size"/> - <parameter value="count(selectItem)"/> - </operation> - </operation> - <!-- iterate over "selectItem" children --> - <operation id="org.eclipse.jst.pagedesigner.IterateOverElementsOperation"> - <parameter value="selectItem"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildElementOperation"> - <parameter value="option"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAttributeOperation"> - <parameter value="itemValue"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="itemValue"/> - <parameter value="value"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemLabel"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@value"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemValue"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextOperation"> - <parameter value="selectItem"/> - </operation> - </operation> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.MakeParentElementCurrentOperation"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - /> - </value> - </trait> - </entity> - - <entity id="selectManyMenu" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="select"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="id"/> - <parameter value="name"/> - </operation> - <!-- multiple select allowed --> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="multiple"/> - <parameter value="multiple"/> - </operation> - <!-- size fixed at 1 --> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="size"/> - <parameter value="1"/> - </operation> - <!-- iterate over "selectItem" children --> - <operation id="org.eclipse.jst.pagedesigner.IterateOverElementsOperation"> - <parameter value="selectItem"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildElementOperation"> - <parameter value="option"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAttributeOperation"> - <parameter value="itemValue"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="itemValue"/> - <parameter value="value"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemLabel"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@value"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemValue"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextOperation"> - <parameter value="selectItem"/> - </operation> - </operation> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.MakeParentElementCurrentOperation"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - /> - </value> - </trait> - </entity> - - <entity id="selectOneListbox" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="select"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="id"/> - <parameter value="name"/> - </operation> - <!-- if no "size" attribute --> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@size"/> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeFromXPathOperation"> - <parameter value="size"/> - <parameter value="count(selectItem)"/> - </operation> - </operation> - <!-- iterate over "selectItem" children --> - <operation id="org.eclipse.jst.pagedesigner.IterateOverElementsOperation"> - <parameter value="selectItem"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildElementOperation"> - <parameter value="option"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAttributeOperation"> - <parameter value="itemValue"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="itemValue"/> - <parameter value="value"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemLabel"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@value"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemValue"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextOperation"> - <parameter value="selectItem"/> - </operation> - </operation> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.MakeParentElementCurrentOperation"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - /> - </value> - </trait> - </entity> - - <entity id="selectOneMenu" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.CreateElementOperation"> - <parameter value="select"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAllAttributesOperation"/> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="styleClass"/> - <parameter value="class"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="id"/> - <parameter value="name"/> - </operation> - <!-- size fixed at 1 --> - <operation id="org.eclipse.jst.pagedesigner.CreateAttributeOperation"> - <parameter value="size"/> - <parameter value="1"/> - </operation> - <!-- iterate over "selectItem" children --> - <operation id="org.eclipse.jst.pagedesigner.IterateOverElementsOperation"> - <parameter value="selectItem"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildElementOperation"> - <parameter value="option"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.CopyAttributeOperation"> - <parameter value="itemValue"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.RenameAttributeOperation"> - <parameter value="itemValue"/> - <parameter value="value"/> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemLabel"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemLabel"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@value"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@value"/> - <operation id="org.eclipse.jst.pagedesigner.IfOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextFromXPathOperation"> - <parameter value="@itemValue"/> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.IfNotOperation"> - <parameter value="@itemValue"/> - <operation id="org.eclipse.jst.pagedesigner.AppendChildTextOperation"> - <parameter value="selectItem"/> - </operation> - </operation> - </operation> - </operation> - <operation id="org.eclipse.jst.pagedesigner.MakeParentElementCurrentOperation"/> - </operation> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - /> - </value> - </trait> - </entity> - - <entity id="selectOneRadio" type="tag"> - <trait id="dt-info"> - <value xsi:type="dti:DTInfo"> - <tag-convert-info> - <operation id="org.eclipse.jst.pagedesigner.jsf.ui.SelectOneRadioOperation"/> - </tag-convert-info> - <tag-decorate-info id="vpd-decorate-design" - multiLevel="true" - widget="true" - needBorderDecorator="true" - /> - </value> - </trait> - </entity> - -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.properties deleted file mode 100644 index eb6947479..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.properties +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -JSFHTML.display-label=JSF HTML -commandButton.display-label=Command Button -commandLink.display-label=Command Link -dataTable.display-label=Data Table -form.display-label=Form -graphicImage.display-label=Graphic Image -inputHidden.display-label=Hidden Input -inputSecret.display-label=Secret Input -inputText.display-label=Text Input -inputTextarea.display-label=Textarea Input -message.display-label=Message -messages.display-label=Messages -outputFormat.display-label=Output Format -outputLabel.display-label=Output Label -outputLink.display-label=Output Link -outputText.display-label=Output Text -panelGrid.display-label=Panel Grid -panelGroup.display-label=Panel Group -selectBooleanCheckbox.display-label=Select Boolean Checkbox -selectManyCheckbox.display-label=Select Many Checkbox -selectManyListbox.display-label=Select Many Listbox -selectManyMenu.display-label=Select Many Menu -selectOneListbox.display-label=Select One Listbox -selectOneMenu.display-label=Select One Menu -selectOneRadio.display-label=Select One Radio -column.display-label=Column
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.xml deleted file mode 100644 index d4b216e58..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html_pi.xml +++ /dev/null @@ -1,443 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - xmlns:pi="http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore" - id="http://java.sun.com/jsf/html" - type="tagFile"> - - <trait id="is-jsf-component-library"> - <value>true</value> - </trait> - - <trait id="paletteInfos" > - <value xsi:type="pi:PaletteInfos"> - <item id="outputLabel"/> - <item id="inputText"/> - <item id="commandButton"/> - <item id="inputTextarea"/> - <item id="outputText"/> - <item id="form"/> - <item id="inputHidden"/> - <item id="inputSecret"/> - <item id="column"/> - <item id="commandLink"/> - <item id="message"/> - <item id="messages"/> - <item id="outputFormat"/> - <item id="panelGrid"/> - <item id="panelGroup"/> - <item id="selectBooleanCheckbox"/> - <item id="selectManyCheckbox"/> - <item id="selectManyListbox"/> - <item id="selectManyMenu"/> - <item id="selectOneListbox"/> - <item id="selectOneMenu"/> - <item id="selectOneRadio"/> - <item id="dataTable"/> - <item id="graphicImage"/> - </value> - </trait> - - <trait id="images-base-path"> - <value>/icons/palette/JSFHTML/</value> - </trait> - - <trait id="display-label"> - <value>%JSFHTML.display-label</value> - </trait> - - <entity id="commandButton" type="tag"> - <trait id="display-label"> - <value>%commandButton.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_COMMANDBUTTON.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_COMMANDBUTTON.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="commandLink" type="tag"> - <trait id="display-label"> - <value>%commandLink.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_COMMANDLINK.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_COMMANDLINK.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <template><![CDATA[ - <outputText value="CommandLink" - _uri_="http://java.sun.com/jsf/html" /> - ]]></template> - </value> - </trait> - </entity> - <entity id="dataTable" type="tag"> - <trait id="display-label"> - <value>%dataTable.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_DATATABLE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_DATATABLE.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <template><![CDATA[ - <column id="column1" - _uri_="http://java.sun.com/jsf/html"> - <facet name="header" - _uri_="http://java.sun.com/jsf/core"> - <outputText value="column1" - _uri_="http://java.sun.com/jsf/html" /> - </facet> - </column> - <column id="column2" - _uri_="http://java.sun.com/jsf/html"> - <facet name="header" - _uri_="http://java.sun.com/jsf/core"> - <outputText value="column2" - _uri_="http://java.sun.com/jsf/html" /> - </facet> - </column> - ]]></template> - <attribute id="border" value="1" /> - </value> - </trait> - </entity> - <entity id="form" type="tag"> - <trait id="display-label"> - <value>%form.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_FORM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_FORM.gif</value> - </trait> - </entity> - - <entity id="graphicImage" type="tag"> - <trait id="display-label"> - <value>%graphicImage.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_GRAPHICIMAGE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_GRAPHICIMAGE.gif</value> - </trait> - </entity> - <entity id="inputHidden" type="tag"> - <trait id="display-label"> - <value>%inputHidden.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_INPUTHIDDEN.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_INPUTHIDDEN.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="inputSecret" type="tag"> - <trait id="display-label"> - <value>%inputSecret.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_INPUTSECRET.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_INPUTSECRET.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="inputText" type="tag"> - <trait id="display-label"> - <value>%inputText.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_INPUTTEXT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_INPUTTEXT.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="inputTextarea" type="tag"> - <trait id="display-label"> - <value>%inputTextarea.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_INPUTTEXTAREA.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_INPUTTEXTAREA.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="message" type="tag"> - <trait id="display-label"> - <value>%message.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_MESSAGE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_MESSAGE.gif</value> - </trait> - </entity> - <entity id="messages" type="tag"> - <trait id="display-label"> - <value>%messages.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_MESSAGES.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_MESSAGES.gif</value> - </trait> - </entity> - <entity id="outputFormat" type="tag"> - <trait id="display-label"> - <value>%outputFormat.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_OUTPUTFORMAT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_OUTPUTFORMAT.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <template><![CDATA[ - <param value="" - _uri_="http://java.sun.com/jsf/core" /> - ]]> - </template> - <attribute id="value" value="outputFormat" /> - </value> - </trait> - </entity> - <entity id="outputLabel" type="tag"> - <trait id="display-label"> - <value>%outputLabel.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_OUTPUTLABEL.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_OUTPUTLABEL.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <attribute id="value" value="outputLabel" /> - </value> - </trait> - </entity> - <entity id="outputLink" type="tag"> - <trait id="display-label"> - <value>%outputLink.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_OUTPUTLINK.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_OUTPUTLINK.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <template><![CDATA[ - <outputText value="outputLink" - _$uri$="http://java.sun.com/jsf/html" /> - ]]></template> - - </value> - </trait> - </entity> - <entity id="outputText" type="tag"> - <trait id="display-label"> - <value>%outputText.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_OUTPUTTEXT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_OUTPUTTEXT.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <attribute id="value" value="outputText" /> - </value> - </trait> - </entity> - <entity id="panelGrid" type="tag"> - <trait id="display-label"> - <value>%panelGrid.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_PANELGRID.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_PANELGRID.gif</value> - </trait> - <trait id="tag-create"> - <value xsi:type="pi:TagCreationInfo"> - <template><![CDATA[ - <outputText value="item1" - _uri_="http://java.sun.com/jsf/html" /> - <outputText value="item2" - _uri_="http://java.sun.com/jsf/html" /> - <outputText value="item3" - _uri_="http://java.sun.com/jsf/html" /> - <outputText value="item4" - _uri_="http://java.sun.com/jsf/html" /> - ]]></template> - <attribute id="border" value="1" /> - <attribute id="columns" value="2" /> - </value> - </trait> - </entity> - <entity id="panelGroup" type="tag"> - <trait id="display-label"> - <value>%panelGroup.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_PANELGROUP.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_PANELGROUP.gif</value> - </trait> - </entity> - <entity id="selectBooleanCheckbox" type="tag"> - <trait id="display-label"> - <value>%selectBooleanCheckbox.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTBOOLEANCHECKBOX.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTBOOLEANCHECKBOX.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectManyCheckbox" type="tag"> - <trait id="display-label"> - <value>%selectManyCheckbox.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTMANYCHECKBOX.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTMANYCHECKBOX.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectManyListbox" type="tag"> - <trait id="display-label"> - <value>%selectManyListbox.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTMANYLISTBOX.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTMANYLISTBOX.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectManyMenu" type="tag"> - <trait id="display-label"> - <value>%selectManyMenu.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTMANYMENU.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTMANYMENU.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectOneListbox" type="tag"> - <trait id="display-label"> - <value>%selectOneListbox.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTONELISTBOX.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTONELISTBOX.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectOneMenu" type="tag"> - <trait id="display-label"> - <value>%selectOneMenu.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTONEMENU.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTONEMENU.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="selectOneRadio" type="tag"> - <trait id="display-label"> - <value>%selectOneRadio.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_SELECTONERADIO.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_SELECTONERADIO.gif</value> - </trait> - <trait id="requires-html-form"> - <value>true</value> - </trait> - </entity> - <entity id="column" type="tag"> - <trait id="display-label"> - <value>%column.display-label</value> - </trait> - <trait id="small-icon"> - <value>small/JSF_COLUMN.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSF_COLUMN.gif</value> - </trait> - </entity> -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.properties deleted file mode 100644 index 33b2269a4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.properties +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2008 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### -plugin.display-label=Plugin -plugin.description=Causes the execution of an applet or bean. The applet or bean executes in the specified plugin. If the plugin is not available, displays a dialog to initiate the download of the plugin software - -fallback.display-label=Fallback -fallback.description=The element provides a message for the user if the plugin does not start - -root.display-label=Root -root.description=Defines standard elements and namespace attributes of tag libraries - -text.display-label=Text -text.description=Encloses template data - -expression.display-label=Expression -expression.description=Contains an expression valid in the scripting language used in the page - -scriptlet.display-label=Scriptlet -scriptlet.description=Contains a code fragment valid in the scripting language used in the page - -declaration.display-label=Declaration -declaration.description=Declares a variable or method valid in the scripting language used in the page - -forward.display-label=Forward -forward.description=Forwards a request to an HTML file, JSP page, or servlet - -param.display-label=Param -param.description=The element passes the name and value of a parameter to the resource - -params.display-label=Params -params.description=The element sends parameter names and values to an applet or Bean at startup - -include.display-label=Include -include.description=Includes a static resource or the result from another web component - -useBean.display-label=UseBean -useBean.description=Instantiates or references a bean with a specific name and scope - -getProperty.display-label=GetProperty -getProperty.description=Inserts the value of a bean property into the response - -setProperty.display-label=SetProperty -setProperty.description=Sets a bean property value or values - -directive.include.display-label=Directive.Include -directive.include.description=Includes a resource of text or code when the JSP page is translated - -directive.page.display-label=Directive.Page -directive.page.description=Defines attributes that apply to an entire JSP page - -directive.taglib.display-label=Directive.Taglib -directive.taglib.description=Defines a tag library and prefix for the custom tags used in the JSP page diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.xml deleted file mode 100644 index 1cd7345a7..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsp11.xml +++ /dev/null @@ -1,282 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:pi="http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore" - id="jsp11" - type="tagFile"> - - <trait id="paletteInfos"> - <value xsi:type="pi:PaletteInfos"> - <item id="jsp:directive.include"/> - <item id="jsp:directive.taglib"/> - <item id="jsp:expression"/> - <item id="jsp:declaration"/> - <item id="jsp:useBean"/> - <item id="jsp:getProperty"/> - <item id="jsp:setProperty"/> - <item id="jsp:include"/> - <item id="jsp:text"/> - <item id="jsp:root"/> - <item id="jsp:forward"/> - <item id="jsp:param"/> - <item id="jsp:params"/> - <item id="jsp:plugin"/> - <item id="jsp:fallback"/> - <item id="jsp:scriptlet"/> - <item id="jsp:directive.page"/> - </value> - </trait> - - <trait id="images-base-path"> - <value>$nl$/icons/palette/JSP</value> - </trait> - - <trait id="display-label"> - <value>JSP</value> - </trait> - - <entity id="jsp:directive.include"> - <trait id="display-label"> - <value>%directive.include.display-label</value> - </trait> - <trait id="description"> - <value>%directive.include.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_DIRECTIVE.INCLUDE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_DIRECTIVE.INCLUDE.gif</value> - </trait> - </entity> - <entity id="jsp:directive.page"> - <trait id="display-label"> - <value>%directive.page.display-label</value> - </trait> - <trait id="description"> - <value>%directive.page.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_DIRECTIVE.PAGE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_DIRECTIVE.PAGE.gif</value> - </trait> - </entity> - - <entity id="jsp:directive.taglib"> - <trait id="display-label"> - <value>%directive.taglib.display-label</value> - </trait> - <trait id="description"> - <value>%directive.taglib.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_DIRECTIVE.TAGLIB.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_DIRECTIVE.TAGLIB.gif</value> - </trait> - </entity> - <entity id="jsp:expression"> - <trait id="display-label"> - <value>%expression.display-label</value> - </trait> - <trait id="description"> - <value>%expression.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_EXPRESSION.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_EXPRESSION.gif</value> - </trait> - </entity> - <entity id="jsp:declaration"> - <trait id="display-label"> - <value>%declaration.display-label</value> - </trait> - <trait id="description"> - <value>%declaration.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_DECLARATION.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_DECLARATION.gif</value> - </trait> - </entity> - <entity id="jsp:useBean"> - <trait id="display-label"> - <value>%useBean.display-label</value> - </trait> - <trait id="description"> - <value>%useBean.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_USEBEAN.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_USEBEAN.gif</value> - </trait> - </entity> - - <entity id="jsp:getProperty"> - <trait id="display-label"> - <value>%getProperty.display-label</value> - </trait> - <trait id="description"> - <value>%getProperty.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_GETPROPERTY.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_GETPROPERTY.gif</value> - </trait> - </entity> - - <entity id="jsp:setProperty"> - <trait id="display-label"> - <value>%setProperty.display-label</value> - </trait> - <trait id="description"> - <value>%setProperty.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_SETPROPERTY.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_SETPROPERTY.gif</value> - </trait> - </entity> - <entity id="jsp:include"> - <trait id="display-label"> - <value>%include.display-label</value> - </trait> - <trait id="description"> - <value>%include.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_INCLUDE.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_INCLUDE.gif</value> - </trait> - </entity> - - <entity id="jsp:text"> - <trait id="display-label"> - <value>%text.display-label</value> - </trait> - <trait id="description"> - <value>%text.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_TEXT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_TEXT.gif</value> - </trait> - </entity> - <entity id="jsp:root"> - <trait id="display-label"> - <value>%root.display-label</value> - </trait> - <trait id="description"> - <value>%root.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_ROOT.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_ROOT.gif</value> - </trait> - </entity> - <entity id="jsp:forward"> - <trait id="display-label"> - <value>%forward.display-label</value> - </trait> - <trait id="description"> - <value>%forward.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_FORWARD.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_FORWARD.gif</value> - </trait> - </entity> - - <entity id="jsp:param"> - <trait id="display-label"> - <value>%param.display-label</value> - </trait> - <trait id="description"> - <value>%param.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_PARAM.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_PARAM.gif</value> - </trait> - </entity> - <entity id="jsp:params"> - <trait id="display-label"> - <value>%params.display-label</value> - </trait> - <trait id="description"> - <value>%params.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_PARAMS.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_PARAMS.gif</value> - </trait> - </entity> - <entity id="jsp:plugin"> - <trait id="display-label"> - <value>%plugin.display-label</value> - </trait> - <trait id="description"> - <value>%plugin.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_PLUGIN.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_PLUGIN.gif</value> - </trait> - </entity> - <entity id="jsp:fallback"> - <trait id="display-label"> - <value>%fallback.display-label</value> - </trait> - <trait id="description"> - <value>%fallback.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_FALLBACK.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_FALLBACK.gif</value> - </trait> - </entity> - <entity id="jsp:scriptlet"> - <trait id="display-label"> - <value>%scriptlet.display-label</value> - </trait> - <trait id="description"> - <value>%scriptlet.description</value> - </trait> - <trait id="small-icon"> - <value>small/JSP_SCRIPTLET.gif</value> - </trait> - <trait id="large-icon"> - <value>large/JSP_SCRIPTLET.gif</value> - </trait> - </entity> -</md:metadatamodel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/symbolInfoMetadata.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/symbolInfoMetadata.xml deleted file mode 100644 index 5c6686aa5..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/symbolInfoMetadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - xmlns:mdt="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - id="http://java.sun.com/jsf/core" - type="tagFile"> - - - <entity id="view" type="tag"> - <entity id="locale"> - <trait id="sets-locale"> - <value>true</value> - </trait> - </entity> - </entity> -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_core.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_core.xml deleted file mode 100644 index f32d1335b..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_core.xml +++ /dev/null @@ -1,188 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:viewMap="http://org.eclipse.jst.jsf.core/componentMapping.ecore" xsi:noNamespaceSchemaLocation="http://org.eclipse.jst.jsf.core/componentMapping.ecore" xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" id="http://java.sun.com/jsf/core" type="tagFile"> - <entity id="view" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UIViewRoot</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.ViewRoot</componentType> - <componentFamily>javax.faces.ViewRoot</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="validateDoubleRange" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ValidatorTypeInfo_"> - <className>javax.faces.validator.DoubleRangeValidator</className> - <validatorId>javax.faces.DoubleRange</validatorId> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="subview" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UINamingContainer</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <interfaces>javax.faces.component.NamingContainer</interfaces> - <componentType>javax.faces.NamingContainer</componentType> - <componentFamily>javax.faces.NamingContainer</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="converter" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ConverterTypeInfo_"/> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="convertNumber" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ConverterTypeInfo_"> - <className>javax.faces.convert.NumberConverter</className> - <converterId>javax.faces.Number</converterId> - <forClass>java.lang.Number</forClass> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="validateLongRange" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ValidatorTypeInfo_"> - <className>javax.faces.validator.LongRangeValidator</className> - <validatorId>javax.faces.LongRange</validatorId> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="validateLength" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ValidatorTypeInfo_"> - <className>javax.faces.validator.LengthValidator</className> - <validatorId>javax.faces.Length</validatorId> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="convertDateTime" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ConverterTypeInfo_"> - <className>javax.faces.convert.DateTimeConverter</className> - <converterId>javax.faces.DateTime</converterId> - <forClass>java.util.Date</forClass> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="validator" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ValidatorTypeInfo_"/> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="verbatim" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UIOutput</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <componentType>javax.faces.Output</componentType> - <componentFamily>javax.faces.Output</componentFamily> - <renderType>javax.faces.Text</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectItem" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UISelectItem</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.SelectItem</componentType> - <componentFamily>javax.faces.SelectItem</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectItems" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UISelectItems</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.SelectItems</componentType> - <componentFamily>javax.faces.SelectItems</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="param" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UIParameter</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.Parameter</componentType> - <componentFamily>javax.faces.Parameter</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> -</md:metadatamodel>
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_html.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_html.xml deleted file mode 100644 index 9c94c712f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/viewMappings_html.xml +++ /dev/null @@ -1,558 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<md:metadatamodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:viewMap="http://org.eclipse.jst.jsf.core/componentMapping.ecore" xmlns:md="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" xsi:noNamespaceSchemaLocation="http://org.eclipse.jst.jsf.core/componentMapping.ecore" id="http://java.sun.com/jsf/html" type="tagFile"> - <entity id="selectOneMenu" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectOneMenu</className> - <superClasses>javax.faces.component.UISelectOne</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectOneMenu</componentType> - <componentFamily>javax.faces.SelectOne</componentFamily> - <renderType>javax.faces.Menu</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectManyListbox" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectManyListbox</className> - <superClasses>javax.faces.component.UISelectMany</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectManyListbox</componentType> - <componentFamily>javax.faces.SelectMany</componentFamily> - <renderType>javax.faces.Listbox</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="form" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlForm</className> - <superClasses>javax.faces.component.UIForm</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.NamingContainer</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlForm</componentType> - <componentFamily>javax.faces.Form</componentFamily> - <renderType>javax.faces.Form</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="message" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlMessage</className> - <superClasses>javax.faces.component.UIMessage</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlMessage</componentType> - <componentFamily>javax.faces.Message</componentFamily> - <renderType>javax.faces.Message</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="graphicImage" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlGraphicImage</className> - <superClasses>javax.faces.component.UIGraphic</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlGraphicImage</componentType> - <componentFamily>javax.faces.Graphic</componentFamily> - <renderType>javax.faces.Image</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="column" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.UIColumn</className> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.Column</componentType> - <componentFamily>javax.faces.Column</componentFamily> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="outputFormat" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <beanMappedProperties>value</beanMappedProperties> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlOutputFormat</className> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlOutputFormat</componentType> - <componentFamily>javax.faces.Output</componentFamily> - <renderType>javax.faces.Format</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectManyMenu" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectManyMenu</className> - <superClasses>javax.faces.component.UISelectMany</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectManyMenu</componentType> - <componentFamily>javax.faces.SelectMany</componentFamily> - <renderType>javax.faces.Menu</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectOneRadio" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectOneRadio</className> - <superClasses>javax.faces.component.UISelectOne</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectOneRadio</componentType> - <componentFamily>javax.faces.SelectOne</componentFamily> - <renderType>javax.faces.Radio</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="panelGroup" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlPanelGroup</className> - <superClasses>javax.faces.component.UIPanel</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlPanelGroup</componentType> - <componentFamily>javax.faces.Panel</componentFamily> - <renderType>javax.faces.Group</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectOneListbox" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectOneListbox</className> - <superClasses>javax.faces.component.UISelectOne</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectOneListbox</componentType> - <componentFamily>javax.faces.SelectOne</componentFamily> - <renderType>javax.faces.Listbox</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="commandButton" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlCommandButton</className> - <superClasses>javax.faces.component.UICommand</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ActionSource</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlCommandButton</componentType> - <componentFamily>javax.faces.Command</componentFamily> - <renderType>javax.faces.Button</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="inputText" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlInputText</className> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlInputText</componentType> - <componentFamily>javax.faces.Input</componentFamily> - <renderType>javax.faces.Text</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="dataTable" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlDataTable</className> - <superClasses>javax.faces.component.UIData</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.NamingContainer</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlDataTable</componentType> - <componentFamily>javax.faces.Data</componentFamily> - <renderType>javax.faces.Table</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectBooleanCheckbox" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectBooleanCheckbox</className> - <superClasses>javax.faces.component.UISelectBoolean</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectBooleanCheckbox</componentType> - <componentFamily>javax.faces.SelectBoolean</componentFamily> - <renderType>javax.faces.Checkbox</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="outputText" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlOutputText</className> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlOutputText</componentType> - <componentFamily>javax.faces.Output</componentFamily> - <renderType>javax.faces.Text</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="selectManyCheckbox" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlSelectManyCheckbox</className> - <superClasses>javax.faces.component.UISelectMany</superClasses> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlSelectManyCheckbox</componentType> - <componentFamily>javax.faces.SelectMany</componentFamily> - <renderType>javax.faces.Checkbox</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="inputSecret" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlInputSecret</className> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlInputSecret</componentType> - <componentFamily>javax.faces.Input</componentFamily> - <renderType>javax.faces.Secret</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="panelGrid" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlPanelGrid</className> - <superClasses>javax.faces.component.UIPanel</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlPanelGrid</componentType> - <componentFamily>javax.faces.Panel</componentFamily> - <renderType>javax.faces.Grid</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="commandLink" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlCommandLink</className> - <superClasses>javax.faces.component.UICommand</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ActionSource</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlCommandLink</componentType> - <componentFamily>javax.faces.Command</componentFamily> - <renderType>javax.faces.Link</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="inputHidden" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlInputHidden</className> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlInputHidden</componentType> - <componentFamily>javax.faces.Input</componentFamily> - <renderType>javax.faces.Hidden</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="inputTextarea" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlInputTextarea</className> - <superClasses>javax.faces.component.UIInput</superClasses> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.EditableValueHolder</interfaces> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlInputTextarea</componentType> - <componentFamily>javax.faces.Input</componentFamily> - <renderType>javax.faces.Textarea</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="outputLabel" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlOutputLabel</className> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlOutputLabel</componentType> - <componentFamily>javax.faces.Output</componentFamily> - <renderType>javax.faces.Label</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="outputLink" type="tag"> - <include-entity-group id="common-valueholder-attributes"/> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlOutputLink</className> - <superClasses>javax.faces.component.UIOutput</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.ValueHolder</interfaces> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlOutputLink</componentType> - <componentFamily>javax.faces.Output</componentFamily> - <renderType>javax.faces.Link</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entity id="messages" type="tag"> - <trait id="viewElementMapping"> - <md:value xsi:type="viewMap:TagMapping"> - <versionedTagToViewMappings> - <typeInfo xsi:type="viewMap:ComponentTypeInfo_"> - <className>javax.faces.component.html.HtmlMessages</className> - <superClasses>javax.faces.component.UIMessages</superClasses> - <superClasses>javax.faces.component.UIComponentBase</superClasses> - <superClasses>javax.faces.component.UIComponent</superClasses> - <superClasses>java.lang.Object</superClasses> - <interfaces>javax.faces.component.StateHolder</interfaces> - <componentType>javax.faces.HtmlMessages</componentType> - <componentFamily>javax.faces.Messages</componentFamily> - <renderType>javax.faces.Messages</renderType> - </typeInfo> - </versionedTagToViewMappings> - </md:value> - </trait> - </entity> - <entityGroup id="common-valueholder-attributes"> - <entity id="value"> - <trait id="attributeMapping"> - <md:value xsi:type="viewMap:AttributeToPropertyMapping"> - <propertyName>value</propertyName> - <elAllowed>true</elAllowed> - </md:value> - </trait> - </entity> - <entity id="converter"> - <trait id="attributeMapping"> - <md:value xsi:type="viewMap:AttributeToPropertyMapping"> - <customConversionFactoryId>org.eclipse.jst.jsf.core.valueHolderAttributeMapper</customConversionFactoryId> - <elAllowed>true</elAllowed> - </md:value> - </trait> - </entity> - </entityGroup> -</md:metadatamodel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties deleted file mode 100644 index 4ab821a20..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################### -# Copyright (c) 2001, 2007 Oracle Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Oracle Corporation - initial API and implementation -############################################################################### - - -# ==================================================================== -# To code developer: -# Do NOT change the properties between this line and the -# "%%% END OF TRANSLATED PROPERTIES %%%" line. -# Make a new property name, append to the end of the file and change -# the code to use the new property. -# ==================================================================== - -# ==================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# ==================================================================== - -pluginName = JavaServer Faces Tools - Taglibrary Metadata -pluginProvider = Eclipse.org - diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.xml deleted file mode 100644 index d68e875d4..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension - point="org.eclipse.jst.jsf.common.standardMetaDataFiles"> - <standardMetaDataFile - location="$nl$/metadata/html.xml" - uri="HTML"/> - <standardMetaDataFile - location="$nl$/metadata/jsp11.xml" - uri="JSP11"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_html.xml" - uri="http://java.sun.com/jsf/html"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_html_pi.xml" - uri="http://java.sun.com/jsf/html"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_html_dti.xml" - uri="http://java.sun.com/jsf/html"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_core.xml" - uri="http://java.sun.com/jsf/core"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_core_pi.xml" - uri="http://java.sun.com/jsf/core"/> - <standardMetaDataFile - location="$nl$/metadata/jsf_core_dti.xml" - uri="http://java.sun.com/jsf/core"/> - <standardMetaDataFile - location="$nl$/metadata/symbolInfoMetadata.xml" - uri="http://java.sun.com/jsf/core"/> - <standardMetaDataFile - location="$nl$/metadata/viewMappings_core.xml" - uri="http://java.sun.com/jsf/core"> - </standardMetaDataFile> - <standardMetaDataFile - location="$nl$/metadata/viewMappings_html.xml" - uri="http://java.sun.com/jsf/html"> - </standardMetaDataFile> - </extension> - -</plugin> diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/src/org/eclipse/jst/jsf/standard/tagsupport/StandardTagSupportPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/src/org/eclipse/jst/jsf/standard/tagsupport/StandardTagSupportPlugin.java deleted file mode 100644 index 005f4e447..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/src/org/eclipse/jst/jsf/standard/tagsupport/StandardTagSupportPlugin.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2007 Oracle Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.jsf.standard.tagsupport; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class StandardTagSupportPlugin extends AbstractUIPlugin { - - /** - * the plugin id - */ - public static final String PLUGIN_ID = "org.eclipse.jst.jsf.standard.tagsupport"; - - // The shared instance - private static StandardTagSupportPlugin plugin; - - /** - * The constructor - */ - public StandardTagSupportPlugin() { - // do nothing - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static StandardTagSupportPlugin getDefault() { - return plugin; - } - -} |
