diff options
Diffstat (limited to 'jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf')
220 files changed, 2513 insertions, 2691 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/JSFVersion.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/JSFVersion.java index 322894e6c..e1d3aaf81 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/JSFVersion.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/JSFVersion.java @@ -44,9 +44,9 @@ public enum JSFVersion { case V1_2: return IJSFCoreConstants.JSF_VERSION_1_2; case UNKNOWN: - return "unknown"; //$NON-NLS-1$ + return "unknown"; default: - throw new IllegalStateException("Missing string conversion: "+this.name()); //$NON-NLS-1$ + throw new IllegalStateException("Missing string conversion: "+this.name()); } } @@ -68,7 +68,7 @@ public enum JSFVersion { { return V1_2; } - else if ("unknown".equals(valueAsString)) //$NON-NLS-1$ + else if ("unknown".equals(valueAsString)) { return UNKNOWN; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java index 48ad8a109..a7112b033 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/CompositeTagRegistryFactory.java @@ -82,7 +82,7 @@ public final class CompositeTagRegistryFactory } catch (TagRegistryFactoryException e) { - JSFCorePlugin.log(e, "While trying to acquire a registry"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "While trying to acquire a registry"); } } else diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java index 5eb1c5162..eb6ca1eac 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java @@ -46,7 +46,7 @@ public class JSFCorePlugin extends WTPPlugin /** * The plugin id */ - public static final String PLUGIN_ID = "org.eclipse.jst.jsf.core"; // org.eclipse.jst.jsf.core.internal.JSFCorePlugin"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.jst.jsf.core"; // org.eclipse.jst.jsf.core.internal.JSFCorePlugin"; // //$NON-NLS-1$ // The shared instance. @@ -83,7 +83,7 @@ public class JSFCorePlugin extends WTPPlugin } else { - log("Error adding tag resolver delegate", new Throwable()); //$NON-NLS-1$ + log("Error adding tag resolver delegate", new Throwable()); } } @@ -346,7 +346,7 @@ public class JSFCorePlugin extends WTPPlugin * @return the preference store for this bundle TODO: this is copied from * AbstractUIPlugin; need to upgrade to new IPreferencesService */ - public synchronized IPreferenceStore getPreferenceStore() + public IPreferenceStore getPreferenceStore() { // Create the preference store lazily. if (this.preferenceStore == null) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCoreTraceOptions.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCoreTraceOptions.java index 4beb9e3b0..0f2731721 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCoreTraceOptions.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCoreTraceOptions.java @@ -63,23 +63,23 @@ public final class JSFCoreTraceOptions */ public static final boolean TRACE_JSPTAGREGISTRY_PERF; - private static final String KEY_DEBUG_ENABLED = "/debug"; //$NON-NLS-1$ - private static final String KEY_DESIGNTIME = "/designtime"; //$NON-NLS-1$ - private static final String KEY_DESIGNTIME_VIEW = KEY_DESIGNTIME + "/view"; //$NON-NLS-1$ + private static final String KEY_DEBUG_ENABLED = "/debug"; + private static final String KEY_DESIGNTIME = "/designtime"; + private static final String KEY_DESIGNTIME_VIEW = KEY_DESIGNTIME + "/view"; private static final String KEY_VIEW_JSPTAGINTROSPECTOR = KEY_DESIGNTIME_VIEW - + "/jsptagintrospection"; //$NON-NLS-1$ + + "/jsptagintrospection"; private static final String KEY_VIEW_JSPTAGINTROSPECTOR_PERF = - KEY_VIEW_JSPTAGINTROSPECTOR + "/perf"; //$NON-NLS-1$ + KEY_VIEW_JSPTAGINTROSPECTOR + "/perf"; private static final String KEY_VIEW_JSPTAGREGISTRY = KEY_DESIGNTIME_VIEW - + "/jsptagregistry"; //$NON-NLS-1$ + + "/jsptagregistry"; private static final String KEY_VIEW_JSPTAGPERSISTENCE = KEY_DESIGNTIME_VIEW - + "/jsptagpersistence"; //$NON-NLS-1$ + + "/jsptagpersistence"; private static final String KEY_VIEW_JSPTAGREGISTRY_CHANGES = - KEY_VIEW_JSPTAGREGISTRY + "/changes"; //$NON-NLS-1$ + KEY_VIEW_JSPTAGREGISTRY + "/changes"; private static final String KEY_VIEW_JSPTAGREGISTRY_PERF = - KEY_VIEW_JSPTAGREGISTRY + "/perf"; //$NON-NLS-1$ + KEY_VIEW_JSPTAGREGISTRY + "/perf"; private static final String KEY_VIEW_TLDREGISTRYMANAGER = - KEY_DESIGNTIME_VIEW + "/tldregistrymanager"; //$NON-NLS-1$ + KEY_DESIGNTIME_VIEW + "/tldregistrymanager"; static @@ -133,9 +133,9 @@ public final class JSFCoreTraceOptions */ public static void log(final String msg, final Throwable t) { - System.out.printf("%s: Exception Trace:\n\n",msg); //$NON-NLS-1$ + System.out.printf("%s: Exception Trace:\n\n",msg); t.printStackTrace(System.out); - System.out.print("\n\n\n"); //$NON-NLS-1$ + System.out.print("\n\n\n"); } private JSFCoreTraceOptions() diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java index b0fd7e5ee..cc3689c76 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java @@ -24,6 +24,11 @@ public class Messages extends NLS { /** * see messages.properties */ + public static String JSFFacetInstallDataModelProvider_ClientImplValidationMsg; + + /** + * see messages.properties + */ public static String JSFFacetInstallDataModelProvider_DupeJarValidation; /** @@ -95,6 +100,10 @@ public class Messages extends NLS { /** * see messages.properties */ + public static String JSFFacetInstallDataModelProvider_ValidateJSFImpl; + /** + * see messages.properties + */ public static String JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty; /** * see messages.properties @@ -226,16 +235,8 @@ public class Messages extends NLS { * see messages.properties */ public static String RegistryMigrationStartupHandler_Launch_Migration_Doc_On_Confirm; - /** - * see messages.properties - */ - public static String RegistryUpgradeCommitHandler_Text; - /** - * see messages.properties - */ - public static String RegistryUpgradeCommitHandler_Title; - - /** + + /** * see messages.properties */ public static String JSFFacet11_presetLabel; @@ -264,11 +265,7 @@ public class Messages extends NLS { /** * see messages.properties */ - public static String JSFFacetUninstallDelegate_NonUpdateableWebXML; - /** - * see messages.properties - */ - public static String JSFLibraryValidator_MISSING_JSF_IMPLEMENTATION_CLASSES; + public static String JSFFacetUninstallDelegate_NonUpdateableWebXML; static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryUpgradeCommitHandler.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryUpgradeCommitHandler.java index 075cecebc..8e3f0f711 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryUpgradeCommitHandler.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryUpgradeCommitHandler.java @@ -65,7 +65,7 @@ public class RegistryUpgradeCommitHandler public void run() { final Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell(); - MessageDialog.openError(shell, Messages.RegistryUpgradeCommitHandler_Title, Messages.RegistryUpgradeCommitHandler_Text); + MessageDialog.openError(shell, "Serious Error Encountered!", "An unrecoverable error occurred while trying to migrate your JSF Library Registry to a newer version. This may cause your library references to be broken in your JSF projects."); } }); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagLibraryRegistryLoader.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagLibraryRegistryLoader.java index 5bb43a94b..8acca06dd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagLibraryRegistryLoader.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagLibraryRegistryLoader.java @@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IExtensionPoint; */ /* package */class TagLibraryRegistryLoader { - private final static String EXTENSION_ID = "tagregistry"; //$NON-NLS-1$ - private final static String ELEMENT_NAME = "tagRegistry"; //$NON-NLS-1$ + private final static String EXTENSION_ID = "tagregistry"; + private final static String ELEMENT_NAME = "tagRegistry"; private static Set<TagRegistryFactoryInfo> _extensions; @@ -73,9 +73,9 @@ import org.eclipse.core.runtime.IExtensionPoint; catch (CoreException e) { JSFCorePlugin.log(e, - "Error loading tag registry extension: " //$NON-NLS-1$ + "Error loading tag registry extension: " + element.getContributor().getName() - + "." + element.getAttribute("id")); //$NON-NLS-1$ //$NON-NLS-2$ + + "." + element.getAttribute("id")); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagRegistryFactoryInfo.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagRegistryFactoryInfo.java index 9112b300c..ba2901b18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagRegistryFactoryInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/TagRegistryFactoryInfo.java @@ -41,15 +41,15 @@ public final class TagRegistryFactoryInfo { // do this first since it has highest potential to fail _tagRegistry = (TagRegistryFactory) element - .createExecutableExtension("class"); //$NON-NLS-1$ + .createExecutableExtension("class"); - final String localId = element.getAttribute("id"); //$NON-NLS-1$ - _id = element.getContributor().getName() + "." + localId; //$NON-NLS-1$ + final String localId = element.getAttribute("id"); + _id = element.getContributor().getName() + "." + localId; - _description = element.getAttribute("description"); //$NON-NLS-1$ + _description = element.getAttribute("description"); final IConfigurationElement[] contentTypes = element - .getChildren("content-type"); //$NON-NLS-1$ + .getChildren("content-type"); final IContentTypeManager typeManager = Platform .getContentTypeManager(); @@ -57,7 +57,7 @@ public final class TagRegistryFactoryInfo for (IConfigurationElement contentTypeElement : contentTypes) { final String contentTypeId = contentTypeElement - .getAttribute("contentTypeId"); //$NON-NLS-1$ + .getAttribute("contentTypeId"); final IContentType contentType = typeManager .getContentType(contentTypeId); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java index ff58d1b5c..1be8de4a7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java @@ -157,7 +157,7 @@ public class FunctionCompletionStrategy extends ContentAssistStrategy // see to do this // if it's an array, we must check if we need to replace a // preceding '.' - if (replacementText.startsWith("[")) //$NON-NLS-1$ + if (replacementText.startsWith("[")) { ITextRegionContextResolver textResolver = IStructuredDocumentContextResolverFactory.INSTANCE.getTextRegionResolver(_context); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jem/BeanProxyUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jem/BeanProxyUtil.java index 4e2b79b4a..ec26cacd8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jem/BeanProxyUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jem/BeanProxyUtil.java @@ -10,12 +10,6 @@ *******************************************************************************/ package org.eclipse.jst.jsf.core.internal.jem; -import org.eclipse.core.resources.IProject; -import org.eclipse.jdt.core.IField; -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.jem.internal.proxy.core.IBeanProxy; import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy; import org.eclipse.jem.internal.proxy.core.IFieldProxy; @@ -23,8 +17,6 @@ import org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy; import org.eclipse.jem.internal.proxy.core.IMethodProxy; import org.eclipse.jem.internal.proxy.core.IStringBeanProxy; import org.eclipse.jem.internal.proxy.core.ThrowableProxy; -import org.eclipse.jst.jsf.common.util.TypeUtil; -import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; /** * Convenience methods for using bean proxies @@ -45,18 +37,15 @@ public final class BeanProxyUtil private final static IBeanTypeProxy[] NO_ARG_TYPES = new IBeanTypeProxy[0]; private final IBeanTypeProxy _typeProxy; - private final IProject _project; private IBeanProxy _instance; /** - * @param project * @param typeProxy */ - public BeanProxyWrapper(final IProject project, final IBeanTypeProxy typeProxy) + public BeanProxyWrapper(final IBeanTypeProxy typeProxy) { super(); _typeProxy = typeProxy; - _project = project; } /** @@ -97,6 +86,8 @@ public final class BeanProxyUtil _instance = null; init(); } + + /** * @return the instance proxy @@ -125,14 +116,12 @@ public final class BeanProxyUtil { try { - final IMethodProxy method = getMethodProxy(methodName, argTypes); - /*(argTypes.length == 0) ? _typeProxy + final IMethodProxy method = (argTypes.length == 0) ? _typeProxy .getMethodProxy(methodName) : _typeProxy - .getMethodProxy(methodName, argTypes);*/ + .getMethodProxy(methodName, argTypes); if (method != null) { - method.setAccessible(true); return method.invoke(_instance, args); } } @@ -262,13 +251,6 @@ public final class BeanProxyUtil public IBeanProxy getFieldValue(final String fieldName, final IBeanTypeProxy typeProxy) throws ProxyException { - // avoid having JEM log a warning if we can prove the call to find - // the field will fail - if (!hasField(fieldName)) - { - return null; - } - try { final IFieldProxy fieldProxy = typeProxy @@ -307,7 +289,7 @@ public final class BeanProxyUtil { IBeanTypeProxy curType = typeProxy; - PARENT_LOOP: while (curType != null) + while (curType != null) { final IBeanProxy field = getFieldValue(fieldName, curType); if (field != null) @@ -317,15 +299,7 @@ public final class BeanProxyUtil try { - IBeanTypeProxy oldType = curType; curType = curType.getSuperBeanTypeProxy(); - // avoid infinite loop: if the parent of curType can't - // be resolved, JEM returns the same type, so curType - // never becomes null - if (oldType == curType) - { - break PARENT_LOOP; - } } catch (final NullPointerException npe) { @@ -346,133 +320,6 @@ public final class BeanProxyUtil { return _instance; } - - private IMethodProxy getMethodProxy(final String methodName, final IBeanTypeProxy[] argTypes) - { - IBeanTypeProxy curType = _typeProxy; - - PARENT_LOOP: while (curType != null) - { - final IMethodProxy[] declaredMethods = curType.getDeclaredMethods(); - final IMethodProxy foundMethod = findMethodInList(methodName, argTypes, declaredMethods); - if (foundMethod != null) - { - return foundMethod; - } - // avoid infinite loop: if the parent of curType can't - // be resolved, JEM returns the same type, so curType - // never becomes null - IBeanTypeProxy oldType = curType; - curType = _typeProxy.getSuperBeanTypeProxy(); - if (oldType == curType) - { - break PARENT_LOOP; - } - } - return null; - } - - private IMethodProxy findMethodInList(final String methodName, final IBeanTypeProxy[] argTypes, - final IMethodProxy[] listOfMethods) - { - METHODS_LOOP: for (final IMethodProxy methodProxy : listOfMethods) - { - if (methodName.equals(methodProxy.getName())) - { - final IBeanTypeProxy[] parameterTypes = - methodProxy.getParameterTypes(); - if (argTypes.length == parameterTypes.length) - { - for (int i = 0; i < argTypes.length; i++) - { - if (!argTypes[i].getTypeName().equals(parameterTypes[i].getTypeName())) - { - // if we find a parameter type mismatch, then - // skip this method; it's not it - continue METHODS_LOOP; - } - } - // if we get to here, we have a method with right name - // and parameters - return methodProxy; - } - } - } - return null; - } - - private boolean hasField(final String fieldName) - { - final IType type = lazilyCalculateType(); - if (type != null) - { - final IField field = type.getField(fieldName); - return field.exists(); - } - return false; - } - - private IType _type; - private boolean _checkedType; - private IType lazilyCalculateType() - { - if (!_checkedType) - { - _checkedType = true; - final String typeName = _typeProxy.getTypeName(); - final IJavaProject javaProject = JavaCore.create(_project); - if (typeName != null && typeName.startsWith("L")) //$NON-NLS-1$ - { - _type = TypeUtil.resolveType(javaProject, typeName); - } - else - { - try - { - _type = javaProject.findType(typeName); - } - catch (JavaModelException e) - { - JSFCorePlugin.log(e, "While loading type: "+typeName); //$NON-NLS-1$ - } - } - } - return _type; - } - -// private Map<String, List<IMethod>> _methods; -// -// private Map<String, List<IMethod>> lazilyCalculateMethods(final IType type) -// { -// if (_methods == null) -// { -// _methods = new HashMap<String, List<IMethod>>(); -// final JDTBeanIntrospector introspector = new JDTBeanIntrospector(type); -// final IMethod[] methods = introspector.getAllMethods(); -// -// for (final IMethod method : methods) -// { -// List<IMethod> byName = _methods.get(method.getElementName()); -// if (byName == null) -// { -// byName = new ArrayList<IMethod>(); -// _methods.put(method.getElementName(), byName); -// } -// -// try { -// if (method.exists() -// && Flags.isPublic(method.getFlags())) -// { -// byName.add(method); -// } -// } catch (JavaModelException e) { -// JSFCorePlugin.log(e, "While getting flags on method: "+method.getElementName()); -// } -// } -// } -// return _methods; -// } - } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigDialogSettingData.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigDialogSettingData.java index 2b7f26379..90a04c89f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigDialogSettingData.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigDialogSettingData.java @@ -13,46 +13,89 @@ package org.eclipse.jst.jsf.core.internal.jsflibraryconfig; import java.util.ArrayList; import java.util.List; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE; + /** * To construct implementation library and component libraries from sticky values * in DialogSettings as saved libraries. * * @author Justin Chen - Oracle - * @deprecated */ -public class JSFLibraryConfigDialogSettingData { +public class JSFLibraryConfigDialogSettingData implements JSFLibraryConfiglModelSource { /** * Delimintor for parsing a persistent property string. */ final protected static String SEPARATOR =":"; //$NON-NLS-1$ - /** - * Parsing delimnitor for elements in a tuple. - */ - final protected static String SPTR_TUPLE = ":"; //$NON-NLS-1$ - /** - * Parsing delimintor for tuples in a persistent property string. - */ - final protected static String EO_TUPLE = ";"; //$NON-NLS-1$ - final private JSFLibraryRegistryUtil jsfLibReg; + final private boolean dftImplLibDeployFlag; private String[] savedCompLibs; + private JSFLibraryInternalReference selJSFLibImpl; // lazy initialized private List selJSFLibComp; // lazy initialized + + private IMPLEMENTATION_TYPE implType; /** * Constructor where implementation type was chosen to be USER_SPECIFIED. Created for backwards compatibilty when server supplied was not an option. + * @param implLibDeployFlag * @param compLibs */ - public JSFLibraryConfigDialogSettingData( String[] compLibs) { + public JSFLibraryConfigDialogSettingData(boolean implLibDeployFlag, String[] compLibs) { + this(IMPLEMENTATION_TYPE.USER_SPECIFIED, implLibDeployFlag, compLibs); + } + + /** + * Constructor + * @param implType {@link IMPLEMENTATION_TYPE} + * @param implLibDeployFlag String valid options are "true" or "false" + * @param compLibs String[] saved component library settings in string array + * + public JSFLibraryConfigDialogSettingData(String implLibDeployFlag, String[] compLibs) { + this.jsfLibReg = JSFLibraryRegistryUtil.getInstance(); + this.dftImplLibDeployFlag = implLibDeployFlag; + this.savedCompLibs = compLibs; + + // Verify and log a message if a saved component library no longer exists. + verifySavedLibAvailability(); + } + */ + public JSFLibraryConfigDialogSettingData(IMPLEMENTATION_TYPE implType, boolean implLibDeployFlag, String[] compLibs) { + this.jsfLibReg = JSFLibraryRegistryUtil.getInstance(); + this.dftImplLibDeployFlag = implLibDeployFlag; this.savedCompLibs = compLibs; + this.implType = implType; // Verify and log a message if a saved component library no longer exists. verifySavedLibAvailability(); } /** + * There is no saved JSFImplLibrary per se if initializing from DialogSettings + * since default implementation library is always selected and only the + * deployment flag is saved. + * + * A null is returned when there is no default + * implementation library in registry. + * + * @return selJSFLibImpl JSFLibraryInternalReference return default implementation library with updated deployment flag + */ + public JSFLibraryInternalReference getJSFImplementationLibrary() { + if (selJSFLibImpl == null) { + // To instanciate a JSFLibraryReferenceUserSpecified object from default impl lib as the saved library. + JSFLibraryInternalReference dftImplLib = jsfLibReg.getDefaultJSFImplementationLibrary(); + if (dftImplLib != null) { + selJSFLibImpl = new JSFLibraryInternalReference(dftImplLib.getLibrary(), + true, // selected + dftImplLibDeployFlag); + } + } + return selJSFLibImpl; + } + + /** * Return the list of saved component libraries and their deployment settings. * * @return selJSFLibComp List @@ -118,4 +161,11 @@ public class JSFLibraryConfigDialogSettingData { } + + /** + * @return {@link IMPLEMENTATION_TYPE} + */ + public IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE getImplementationType(){ + return implType; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java index 3d1e7e674..63213534b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java @@ -13,7 +13,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.core.resources.IProject; import org.eclipse.jst.jsf.core.internal.Messages; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE; /** * Model for the custom control <b>JSFLibraryConfigControl</b>. @@ -21,23 +23,60 @@ import org.eclipse.jst.jsf.core.internal.Messages; * selected implementation and component libraries when selections are changed. * * @author Justin Chen - Oracle - * @deprecated */ public class JSFLibraryConfigModel { - final private JSFLibraryConfigDialogSettingData data; + final private JSFLibraryConfiglModelSource data; final private JSFLibraryRegistryUtil jsfLibReg; + private List colJSFImplLib; private List colJSFCompLib; /** * Private constructor. * @param data */ - private JSFLibraryConfigModel(JSFLibraryConfigDialogSettingData data) { + private JSFLibraryConfigModel(JSFLibraryConfiglModelSource data) { this.data = data; this.jsfLibReg = JSFLibraryRegistryUtil.getInstance(); } /** + * @return IMPLEMENTATION_TYPE + */ + public IMPLEMENTATION_TYPE getImplementationType() { + return data.getImplementationType(); + } + /** + * Return JSF implementation libraries. + * + * This list is initialized from JSF library registry and updated with persistent configuration data. + * + * @return List + * see also org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFImplementationLibraries() + */ + public List getJSFImplementationLibraries() { + if (colJSFImplLib == null) { + /* To initialze an implementation library list from registry + * and then update the list with saved implementation library. + */ + colJSFImplLib = jsfLibReg.getJSFImplementationLibraries(); +// colJSFImplLib.add(JSFLibraryRegistryUtil.getInstance().getServerSuppliedJSFLibrary()); + JSFLibraryInternalReference targetLib = data.getJSFImplementationLibrary(); + if (targetLib == null) { + // no saved implementation, get default implementation library + targetLib = jsfLibReg.getDefaultJSFImplementationLibrary(); + } + if (targetLib != null) { + JSFLibraryInternalReference srcLib = jsfLibReg.getJSFLibraryReferencebyID(targetLib.getID()); + if (srcLib != null) { + srcLib.setSelected(true); + srcLib.setToBeDeployed(targetLib.isCheckedToBeDeployed()); + } + } + } + return colJSFImplLib; + } + + /** * Return JSF component libraries. * * This list is initialized from JSF library registry and updated with persistent @@ -68,6 +107,24 @@ public class JSFLibraryConfigModel { } /** + * Return the selected JSF implementation library currently. + * A null is returned if none is selected. + * + * @return JSFLibraryInternalReference + */ + public JSFLibraryInternalReference getCurrentJSFImplementationLibrarySelection() { + Iterator it = getJSFImplementationLibraries().iterator(); + JSFLibraryInternalReference crtItem = null; + while (it.hasNext()) { + crtItem = (JSFLibraryInternalReference) it.next(); + if (crtItem.isSelected()) { + return crtItem; + } + } + return null; + } + + /** * Return the selected JSF component libraries currently. * An empty list is returned when no component libraries are selected. * @@ -88,6 +145,16 @@ public class JSFLibraryConfigModel { } /** + * Returned a saved implementation library which was persisted as + * DialogSettings or as project properties. + * + * @return JSFLibraryInternalReference + */ + public JSFLibraryInternalReference getSavedJSFImplementationLibrary() { + return data.getJSFImplementationLibrary(); + } + + /** * Returned saved component libraries which were persisted as * DialogSettings or project persistent properties. * @@ -98,6 +165,30 @@ public class JSFLibraryConfigModel { } /** + * Update the selected JSF implementation library. + * + * Note: The library parameter won't be not added into the collection + * if it does not exist already. + * + * @param library JSFLibraryInternalReference + */ + public void setCurrentJSFImplementationLibrarySelection(final JSFLibraryInternalReference library) { + if (library != null) { + Iterator it = getJSFImplementationLibraries().iterator(); + JSFLibraryInternalReference crtjsflib = null; + while (it.hasNext()) { + crtjsflib = (JSFLibraryInternalReference) it.next(); + if (crtjsflib.getID().equals(library.getID())) { + crtjsflib.setSelected(true); + crtjsflib.setToBeDeployed(library.isCheckedToBeDeployed()); + } else { + crtjsflib.setSelected(false); + } + } + } + } + + /** * Update the JSF library component libraries selection. * * @param libraries List @@ -125,6 +216,20 @@ public class JSFLibraryConfigModel { } /** + * To save current configuration of implementation and component libraries + * as project properties. + * + * @param project IProject + */ + public void saveData(final IProject project) { + // Instantiate one to make sure it is for a project. + JSFLibraryConfigProjectData data_ = new JSFLibraryConfigProjectData(project); + List implLibs = new ArrayList(); + implLibs.add(getCurrentJSFImplementationLibrarySelection()); + data_.saveData(implLibs, getCurrentJSFComponentLibrarySelection(), getImplementationType()); + } + + /** * Set selection state to given state to each libray in the collection. * * @param libs List @@ -150,7 +255,7 @@ public class JSFLibraryConfigModel { * @param source JSFLibraryConfiglModelSource * @return JSFLibraryConfigModel */ - public static JSFLibraryConfigModel createInstance(final JSFLibraryConfigDialogSettingData source) { + public static JSFLibraryConfigModel createInstance(final JSFLibraryConfiglModelSource source) { if (source == null) { throw new NullPointerException(Messages.JSFLibraryConfigModel_Null_Data_Source); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigProjectData.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigProjectData.java new file mode 100644 index 000000000..70d36dc0d --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigProjectData.java @@ -0,0 +1,305 @@ +/******************************************************************************* + * 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: Oracle + *******************************************************************************/ +package org.eclipse.jst.jsf.core.internal.jsflibraryconfig; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; +import org.eclipse.jst.jsf.core.internal.Messages; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils; +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE; +import org.eclipse.osgi.util.NLS; + +/** + * To construct implementation library and component libraries + * from persistent project properties as saved libraries. + * + * @author Justin Chen - Oracle + */ +public class JSFLibraryConfigProjectData implements JSFLibraryConfiglModelSource { + final static String QUALIFIEDNAME = "org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryConfigProjectData"; + /** + * Parsing delimnitor for elements in a tuple. + */ + final protected static String SPTR_TUPLE = ":"; //$NON-NLS-1$ + /** + * Parsing delimintor for tuples in a persistent property string. + */ + final protected static String EO_TUPLE = ";"; //$NON-NLS-1$ + + final private IProject project; + final private JSFLibraryRegistryUtil jsfLibReg; + private JSFLibraryInternalReference selJSFLibImpl; + private List selJSFLibComp; + + /** + * Constructor + * @param project + */ + public JSFLibraryConfigProjectData(IProject project) { + this.project = project; + this.jsfLibReg = JSFLibraryRegistryUtil.getInstance(); + + /* logging message when object is instantiated instead of at method call to + * reduce log entries. + */ + if (!isProjectFirstCreated()) { + verifySavedLibAvailability(); + } + } + + public IMPLEMENTATION_TYPE getImplementationType() { + try { + String type = ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, + JSFUtils.PP_JSF_IMPLEMENTATION_TYPE)); + return IMPLEMENTATION_TYPE.getValue(type); + } catch (CoreException e) {// + } + return IMPLEMENTATION_TYPE.UNKNOWN; + } + + /** + * Return the previously selected JSF implementation library from project persistent properties. + * Return null if none exists. + * + * @return selJSFLibImpl JSFLibraryDecorator + */ + public JSFLibraryInternalReference getJSFImplementationLibrary() { + try { + if (!isProjectFirstCreated() && + selJSFLibImpl == null ) { + String strImplLibs = ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, + JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES)); + selJSFLibImpl = getJSFImplLibfromPersistentProperties(getTuples(strImplLibs)); + } + } catch (CoreException e) { + JSFCorePlugin.log(e, "Exception occured while returning reference to the JSF implementation library"); + } + return selJSFLibImpl; + } + + /** + * Return the selected JSF component libraries from project persistent properties. + * An empty List is returned if no JSF component libraries were saved or + * if the project is newly created. + * + * @return selJSFLibComp List + */ + public List getJSFComponentLibraries() { + try { + if (!isProjectFirstCreated()) { + if ( selJSFLibComp == null ) { + selJSFLibComp = new ArrayList(); + + String strCompLibs = ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_COMPONENT_LIBRARIES)); + List savedList = getTuples(strCompLibs); + + Iterator it = savedList.iterator(); + Tuple crtTuple = null; + JSFLibraryInternalReference srcItem = null; + while (it.hasNext()) { + crtTuple = (Tuple) it.next(); + + srcItem = jsfLibReg.getJSFLibraryReferencebyID(crtTuple.getID()); + if (srcItem != null) { + selJSFLibComp.add( new JSFLibraryInternalReference(srcItem.getLibrary(), + true, + crtTuple.needDeploy()) ); + } /*else { + // already logged a message for a missing library + }*/ + } + } + } else { + selJSFLibComp = new ArrayList(0); + } + } catch (CoreException e) { + JSFCorePlugin.log(e, "Exception occured while returning references to the JSF component libraries."); + } + return selJSFLibComp; + } + + /** + * To save configuration data as a project persistent properties. + * + * @param implementation + * @param component + */ + void saveData(final List implementation, final List component, final IMPLEMENTATION_TYPE implType) { + try { + ((IResource)project).setPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES), generatePersistString(implementation)); + ((IResource)project).setPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_COMPONENT_LIBRARIES), generatePersistString(component)); + ((IResource)project).setPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_IMPLEMENTATION_TYPE), IMPLEMENTATION_TYPE.getStringValue(implType)); + + /* Flush the selection so that they can be reconstructed from + * persistent properties when getSavedJSFImplLib and getSavedJSFCompLibs + * called next time. + */ + selJSFLibImpl = null; + selJSFLibComp = null; + + } catch (CoreException e) { + JSFCorePlugin.log(e, "Exception occured while persisting the JSF Library preferences"); + } + } + + /** + * Check if a project is just created by inspecting persistent properties + * if there is any. ? + */ + private boolean isProjectFirstCreated() { + boolean isNew = false; + try { + ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, + JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES)); + } catch (CoreException e) { + isNew = true; + } + return isNew; + } + + private void verifySavedLibAvailability() { + try { + String strImplLibs = ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES)); + String strCompLibs = ((IResource)project).getPersistentProperty(new QualifiedName(QUALIFIEDNAME, JSFUtils.PP_JSF_COMPONENT_LIBRARIES)); + + logMissingLib(getTuples(strImplLibs), true); + logMissingLib(getTuples(strCompLibs), false); + + } catch (CoreException e) { + JSFCorePlugin.log(e, "Exception occured while verifying saved JSF Library preferences"); + } + } + + private void logMissingLib(final List jsfLibTuples, final boolean isVerifyImpl) { + if (jsfLibReg != null) { + Iterator itTuple = jsfLibTuples.iterator(); + while(itTuple.hasNext()) { + Tuple tuple = (Tuple)itTuple.next(); + JSFLibraryInternalReference jsfLib = jsfLibReg.getJSFLibraryReferencebyID(tuple.getID()); + /* Information logged when saved JSF lib is removed from registry. + * One log entry is created for each missing library. + */ + if (jsfLib == null) { + String prjName = project.getName(); + String msg = (isVerifyImpl) ? + Messages.JSFLibraryConfigPersistData_SAVED_IMPLLIB_NOT_FOUND : + Messages.JSFLibraryConfigPersistData_SAVED_COMPLIB_NOT_FOUND; + JSFCorePlugin.log(IStatus.INFO, NLS.bind(msg, prjName)); + } + } + } + } + + private JSFLibraryInternalReference getJSFImplLibfromPersistentProperties(final List jsfLibTuples) { + if (jsfLibReg != null) { + Tuple tuple = null; + JSFLibraryInternalReference lib = null; + Iterator itTuple = jsfLibTuples.iterator(); + while(itTuple.hasNext()) { + tuple = (Tuple) itTuple.next(); + lib = jsfLibReg.getJSFLibraryReferencebyID(tuple.id); + if (lib != null) { + return new JSFLibraryInternalReference(lib.getLibrary(), + tuple.selected, + tuple.deploy); + } /*else { + // already logged a message for a missing library + }*/ + } + } + return null; + } + + private String generatePersistString(List list) { + JSFLibraryInternalReference jsfLibItem; + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < list.size(); i++) { + jsfLibItem = (JSFLibraryInternalReference)list.get(i); + sb = sb.append(jsfLibItem.generatePersistString()); + sb.append(JSFLibraryConfigProjectData.EO_TUPLE); + } + return sb.toString(); + } + + private List getTuples(String strJSFLibs) { + List list = new ArrayList(); + + if (strJSFLibs != null) { + String patternStr = JSFLibraryConfigProjectData.EO_TUPLE; + String[] fields = strJSFLibs.split(patternStr); + if (strJSFLibs.length() > 0) { + Tuple tuple; + for (int i = 0; i < fields.length; i++) { + tuple = new Tuple(fields[i]); + list.add(tuple); + } + } + } + return list; + } + + /** + * Inner class for parsing project persistent properties. + * + * To Do: Take out selected attribute since it is not needed. + * Add the library name as an attribute. + * Provide code path to migrate earlier project. + * + * NOTE: this class should no longer be used except to support + * legacy (pre-2.0M6 library registries) + */ + static class Tuple { + final private String id; + final private boolean selected; + final private boolean deploy; + + Tuple(String id, boolean selected, boolean deploy) { + this.id = id; + this.selected = selected; + this.deploy = deploy; + } + // parse tuple = ID:selected:deploy + Tuple(String tuple) { + String[] fields = tuple.split(JSFLibraryConfigProjectData.SPTR_TUPLE); + + if (fields.length >= 3) + { + this.id = fields[0]; + this.selected = Boolean.valueOf(fields[1]).booleanValue(); + this.deploy = Boolean.valueOf(fields[2]).booleanValue(); + } + else + { + throw new IllegalStateException("Library registry is corrupt"); + } + } + + String getID() { + return id; + } + + boolean isSelected() { + return selected; + } + + boolean needDeploy() { + return deploy; + } + } + +} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfiglModelSource.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfiglModelSource.java new file mode 100644 index 000000000..557583573 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfiglModelSource.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * 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: + * Justin Chen + *******************************************************************************/ +package org.eclipse.jst.jsf.core.internal.jsflibraryconfig; + +import java.util.List; + +import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE; + +/** + * Interface for data source to instanciate a <b>JSFLibraryConfigModel</b> object. + * + * @author Justin Chen - Oracle + */ +public interface JSFLibraryConfiglModelSource { + /** + * Return a saved JSF implementation library. + * Depends on the model source, it could be sticky values from DialogSettings or + * project property values. + * + * A null could be returned when creating first web project in a new workspace. + * + * @return JSFLibraryInternalReference + */ + public JSFLibraryInternalReference getJSFImplementationLibrary(); + + /** + * Return a list of saved JSF component libraries. + * Otheriwse, return an empty list. + * + * @return List + */ + public List getJSFComponentLibraries(); + + /** + * Return type of implementation + * + * @return {@link IMPLEMENTATION_TYPE} + */ + public IMPLEMENTATION_TYPE getImplementationType(); +} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryInternalReference.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryInternalReference.java index 8c8481b1f..aca5bf540 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryInternalReference.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryInternalReference.java @@ -17,7 +17,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary; * to a JSF library when it is referenced by a project. * * @author Justin Chen - Oracle - * @deprecated */ public class JSFLibraryInternalReference { final private JSFLibrary jsfLib; @@ -90,8 +89,8 @@ public class JSFLibraryInternalReference { * @return String */ protected String generatePersistString() { - return (getID() + JSFLibraryConfigDialogSettingData.SPTR_TUPLE + - String.valueOf(isSelected()) + JSFLibraryConfigDialogSettingData.SPTR_TUPLE + + return (getID() + JSFLibraryConfigProjectData.SPTR_TUPLE + + String.valueOf(isSelected()) + JSFLibraryConfigProjectData.SPTR_TUPLE + String.valueOf(isCheckedToBeDeployed())); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryRegistryUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryRegistryUtil.java index 3fa8d3d1a..131e6d39a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryRegistryUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryRegistryUtil.java @@ -18,8 +18,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IPath; @@ -28,6 +30,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.QualifiedName; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EPackage; @@ -50,6 +53,7 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegis import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceFactoryImpl; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceImpl; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryUpgradeUtil; +import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils; import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryConfigurationHelper; import org.eclipse.jst.jsf.core.jsflibraryregistry.PluginProvidedJSFLibraryCreationHelper; import org.eclipse.jst.jsf.core.jsflibraryregistry.internal.PluginProvidedJSFLibraryCreationHelper2; @@ -64,7 +68,6 @@ import org.eclipse.jst.jsf.core.jsflibraryregistry.internal.PluginProvidedJSFLib * The lists are updated when there are changes in JSF library registry. * * @author Justin Chen, etc. - Oracle - * @deprecated */ @SuppressWarnings("deprecation") public class JSFLibraryRegistryUtil { @@ -405,11 +408,63 @@ public class JSFLibraryRegistryUtil { try { project.setRawClasspath(entries, monitor); } catch (JavaModelException e) { - JSFCorePlugin.log(e, "Unable to set classpath for: "+project.getProject().getName()); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Unable to set classpath for: "+project.getProject().getName()); } } /** + * @param iproject + * @return true if iproject has persistent properties indicating that it may still + * be using V1 JSF Library references + */ + public static boolean doesProjectHaveV1JSFLibraries(IProject iproject) + { + if (iproject == null || !iproject.isAccessible()) + { + return false; // won't be able to get reading on a null or closed project + } + + try + { + Object compLib = iproject.getPersistentProperty(new QualifiedName(JSFLibraryConfigProjectData.QUALIFIEDNAME, JSFUtils.PP_JSF_COMPONENT_LIBRARIES)); + Object implLib = iproject.getPersistentProperty(new QualifiedName(JSFLibraryConfigProjectData.QUALIFIEDNAME, JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES)); + + if (compLib != null || implLib != null) + { + return true; + } + } + catch(CoreException ce) + { + JSFCorePlugin.log(ce, "Error checking age of project"); + } + // by default, fall through to false + return false; + } + + /** + * Removes the persistent property from JSF projects tagged with + * V1 JSF libraries. + * @param projects + */ + public static void removeV1JSFLibraryProperty(List<IProject> projects) + { + for (final Iterator<IProject> it = projects.iterator(); it.hasNext();) + { + IProject project = it.next(); + try { + if (project.isAccessible()) + { + project.setPersistentProperty(new QualifiedName(JSFLibraryConfigProjectData.QUALIFIEDNAME, JSFUtils.PP_JSF_COMPONENT_LIBRARIES), null); + project.setPersistentProperty(new QualifiedName(JSFLibraryConfigProjectData.QUALIFIEDNAME, JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES), null); + } + } catch (CoreException e) { + JSFCorePlugin.log(e, "Error removing JSF library persistent property"); + } + } + } + + /** * Loads the JSFLibraryRegistry EMF object from plugin-specfic workspace * settings location. */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java index f09420f62..01941eae1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java @@ -30,7 +30,6 @@ import org.eclipse.emf.ecore.EObject; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile() * @model * @generated - * @deprecated */ public interface ArchiveFile extends EObject{ /** @@ -38,7 +37,7 @@ public interface ArchiveFile extends EObject{ * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Returns the value of the '<em><b>Source Location</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java index bb6a7d1e1..a50d990f8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java @@ -33,7 +33,6 @@ import org.eclipse.emf.ecore.EObject; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary() * @model * @generated - * @deprecated */ public interface JSFLibrary extends EObject{ /** @@ -41,7 +40,7 @@ public interface JSFLibrary extends EObject{ * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Returns the value of the '<em><b>ID</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java index 1b6b25f4a..73b7057a4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java @@ -31,7 +31,6 @@ import org.eclipse.jst.jsf.core.internal.Messages; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibraryRegistry() * @model * @generated - * @deprecated */ public interface JSFLibraryRegistry extends EObject{ /** @@ -39,7 +38,7 @@ public interface JSFLibraryRegistry extends EObject{ * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Returns the value of the '<em><b>Default Implementation ID</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java index 1a988e7f3..77560bd6e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory; * <!-- end-user-doc --> * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage * @generated - * @deprecated */ public interface JSFLibraryRegistryFactory extends EFactory{ /** @@ -27,7 +26,7 @@ public interface JSFLibraryRegistryFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The singleton instance of the factory. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java index 4acf3f81c..07ba32e12 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java @@ -30,7 +30,6 @@ import org.eclipse.emf.ecore.EReference; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory * @model kind="package" * @generated - * @deprecated */ @SuppressWarnings("hiding") public interface JSFLibraryRegistryPackage extends EPackage{ @@ -39,7 +38,7 @@ public interface JSFLibraryRegistryPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The package name. @@ -47,7 +46,7 @@ public interface JSFLibraryRegistryPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - String eNAME = "jsflibraryregistry"; //$NON-NLS-1$ + String eNAME = "jsflibraryregistry"; /** * The package namespace URI. @@ -55,7 +54,7 @@ public interface JSFLibraryRegistryPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd"; /** * The package namespace name. @@ -63,7 +62,7 @@ public interface JSFLibraryRegistryPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "jsflibreg"; //$NON-NLS-1$ + String eNS_PREFIX = "jsflibreg"; /** * The singleton instance of the package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java index 6954088a6..ad9f7f67f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java @@ -24,7 +24,6 @@ import org.eclipse.emf.common.util.AbstractEnumerator; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFVersion() * @model * @generated - * @deprecated */ public final class JSFVersion extends AbstractEnumerator { /** @@ -32,7 +31,7 @@ public final class JSFVersion extends AbstractEnumerator { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The '<em><b>UNKNOWN</b></em>' literal value. @@ -87,7 +86,7 @@ public final class JSFVersion extends AbstractEnumerator { * @generated * @ordered */ - public static final JSFVersion UNKNOWN_LITERAL = new JSFVersion(UNKNOWN, "UNKNOWN", "UNKNOWN"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final JSFVersion UNKNOWN_LITERAL = new JSFVersion(UNKNOWN, "UNKNOWN", "UNKNOWN"); /** * The '<em><b>V1 1</b></em>' literal object. @@ -97,7 +96,7 @@ public final class JSFVersion extends AbstractEnumerator { * @generated * @ordered */ - public static final JSFVersion V1_1_LITERAL = new JSFVersion(V1_1, "v1_1", "v1_1"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final JSFVersion V1_1_LITERAL = new JSFVersion(V1_1, "v1_1", "v1_1"); /** * The '<em><b>V1 2</b></em>' literal object. @@ -107,7 +106,7 @@ public final class JSFVersion extends AbstractEnumerator { * @generated * @ordered */ - public static final JSFVersion V1_2_LITERAL = new JSFVersion(V1_2, "v1_2", "v1_2"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final JSFVersion V1_2_LITERAL = new JSFVersion(V1_2, "v1_2", "v1_2"); /** * An array of all the '<em><b>JSF Version</b></em>' enumerators. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java index 9ec7a5352..89722da0b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java @@ -27,19 +27,18 @@ package org.eclipse.jst.jsf.core.internal.jsflibraryregistry; * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getPluginProvidedJSFLibrary() * @model * @generated - * @deprecated */ public interface PluginProvidedJSFLibrary extends JSFLibrary{ /** * Separator between plugin id and JSF Library name */ - public static final String ID_SEPARATOR = "$$"; //$NON-NLS-1$ + public static final String ID_SEPARATOR = "$$"; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Returns the value of the '<em><b>Plugin ID</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java index eb3ff119c..f1c76ad50 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java @@ -24,7 +24,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPa * changing of a JSFLibrary instance's implementation property. * * @author Ian Trimble - Oracle - * @deprecated */ public class MaintainDefaultImplementationAdapter extends AdapterImpl { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java index 958378769..6242abe87 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java @@ -58,7 +58,6 @@ import org.osgi.framework.Bundle; * </p> * * @generated - * @deprecated */ public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile { /** @@ -66,7 +65,7 @@ public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The default value of the '{@link #isRelativeToWorkspace() <em>Relative To Workspace</em>}' attribute. @@ -277,7 +276,7 @@ public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile { public void setJSFLibrary(JSFLibrary newJSFLibrary) { if (newJSFLibrary != eInternalContainer() || (eContainerFeatureID != JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY && newJSFLibrary != null)) { if (EcoreUtil.isAncestor(this, newJSFLibrary)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); @@ -693,11 +692,11 @@ public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (RelativeToWorkspace: "); //$NON-NLS-1$ + result.append(" (RelativeToWorkspace: "); result.append(relativeToWorkspace); - result.append(", SourceLocation: "); //$NON-NLS-1$ + result.append(", SourceLocation: "); result.append(sourceLocation); - result.append(", RelativeDestLocation: "); //$NON-NLS-1$ + result.append(", RelativeDestLocation: "); result.append(relativeDestLocation); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java index 40c29b104..2187da7ba 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java @@ -46,7 +46,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter.MaintainDefa * </p> * * @generated - * @deprecated */ public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary { /** @@ -54,7 +53,7 @@ public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The default value of the '{@link #getID() <em>ID</em>}' attribute. @@ -64,7 +63,7 @@ public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary { * @generated * @ordered */ - protected static final String ID_EDEFAULT = ""; //$NON-NLS-1$ + protected static final String ID_EDEFAULT = ""; /** * The cached value of the '{@link #getID() <em>ID</em>}' attribute. @@ -541,15 +540,15 @@ public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (ID: "); //$NON-NLS-1$ + result.append(" (ID: "); result.append(id); - result.append(", Name: "); //$NON-NLS-1$ + result.append(", Name: "); result.append(name); - result.append(", JSFVersion: "); //$NON-NLS-1$ + result.append(", JSFVersion: "); result.append(jsfVersion); - result.append(", Deployed: "); //$NON-NLS-1$ + result.append(", Deployed: "); result.append(deployed); - result.append(", Implementation: "); //$NON-NLS-1$ + result.append(", Implementation: "); result.append(implementation); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java index 14b1ff6c9..0b4846ab7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java @@ -29,7 +29,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * An implementation of the model <b>Factory</b>. * <!-- end-user-doc --> * @generated - * @deprecated */ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLibraryRegistryFactory { /** @@ -37,7 +36,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Creates the default factory implementation. @@ -48,7 +47,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi */ public static JSFLibraryRegistryFactory init() { try { - JSFLibraryRegistryFactory theJSFLibraryRegistryFactory = (JSFLibraryRegistryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd"); //$NON-NLS-1$ + JSFLibraryRegistryFactory theJSFLibraryRegistryFactory = (JSFLibraryRegistryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd"); if (theJSFLibraryRegistryFactory != null) { return theJSFLibraryRegistryFactory; } @@ -83,7 +82,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY: return createPluginProvidedJSFLibrary(); case JSFLibraryRegistryPackage.ARCHIVE_FILE: return createArchiveFile(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } @@ -100,7 +99,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi case JSFLibraryRegistryPackage.JSF_VERSION: return createJSFVersionFromString(eDataType, initialValue); default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -117,7 +116,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi case JSFLibraryRegistryPackage.JSF_VERSION: return convertJSFVersionToString(eDataType, instanceValue); default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -175,7 +174,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi */ public JSFVersion createJSFVersionFromString(EDataType eDataType, String initialValue) { JSFVersion result = JSFVersion.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$ + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java index 8e262636b..6d2964fcd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java @@ -42,7 +42,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * </p> * * @generated - * @deprecated */ public class JSFLibraryRegistryImpl extends EObjectImpl implements JSFLibraryRegistry { /** @@ -50,7 +49,7 @@ public class JSFLibraryRegistryImpl extends EObjectImpl implements JSFLibraryReg * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The default value of the '{@link #getDefaultImplementationID() <em>Default Implementation ID</em>}' attribute. @@ -60,7 +59,7 @@ public class JSFLibraryRegistryImpl extends EObjectImpl implements JSFLibraryReg * @generated * @ordered */ - protected static final String DEFAULT_IMPLEMENTATION_ID_EDEFAULT = ""; //$NON-NLS-1$ + protected static final String DEFAULT_IMPLEMENTATION_ID_EDEFAULT = ""; /** * The cached value of the '{@link #getDefaultImplementationID() <em>Default Implementation ID</em>}' attribute. @@ -424,7 +423,7 @@ public class JSFLibraryRegistryImpl extends EObjectImpl implements JSFLibraryReg if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (DefaultImplementationID: "); //$NON-NLS-1$ + result.append(" (DefaultImplementationID: "); result.append(defaultImplementationID); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java index 514777c13..0532ca94f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java @@ -31,7 +31,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * An implementation of the model <b>Package</b>. * <!-- end-user-doc --> * @generated - * @deprecated */ public class JSFLibraryRegistryPackageImpl extends EPackageImpl implements JSFLibraryRegistryPackage { /** @@ -39,7 +38,7 @@ public class JSFLibraryRegistryPackageImpl extends EPackageImpl implements JSFLi * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * <!-- begin-user-doc --> @@ -427,83 +426,83 @@ public class JSFLibraryRegistryPackageImpl extends EPackageImpl implements JSFLi pluginProvidedJSFLibraryEClass.getESuperTypes().add(this.getJSFLibrary()); // Initialize classes and features; add operations and parameters - initEClass(jsfLibraryRegistryEClass, JSFLibraryRegistry.class, "JSFLibraryRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getJSFLibraryRegistry_DefaultImplementationID(), ecorePackage.getEString(), "DefaultImplementationID", "", 0, 1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEReference(getJSFLibraryRegistry_JSFLibraries(), this.getJSFLibrary(), null, "JSFLibraries", null, 0, -1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEReference(getJSFLibraryRegistry_PluginProvidedJSFLibraries(), this.getPluginProvidedJSFLibrary(), null, "PluginProvidedJSFLibraries", null, 0, -1, JSFLibraryRegistry.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(jsfLibraryRegistryEClass, JSFLibraryRegistry.class, "JSFLibraryRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getJSFLibraryRegistry_DefaultImplementationID(), ecorePackage.getEString(), "DefaultImplementationID", "", 0, 1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getJSFLibraryRegistry_JSFLibraries(), this.getJSFLibrary(), null, "JSFLibraries", null, 0, -1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getJSFLibraryRegistry_PluginProvidedJSFLibraries(), this.getPluginProvidedJSFLibrary(), null, "PluginProvidedJSFLibraries", null, 0, -1, JSFLibraryRegistry.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - EOperation op = addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getJSFLibraryByID", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "ID", 1, 1); //$NON-NLS-1$ + EOperation op = addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getJSFLibraryByID", 1, 1); + addEParameter(op, ecorePackage.getEString(), "ID", 1, 1); - op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getJSFLibrariesByName", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "name", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getJSFLibrariesByName", 1, 1); + addEParameter(op, ecorePackage.getEString(), "name", 1, 1); - addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getImplJSFLibraries", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getImplJSFLibraries", 1, 1); - addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getNonImplJSFLibraries", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getNonImplJSFLibraries", 1, 1); - addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getAllJSFLibraries", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getAllJSFLibraries", 1, 1); - op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "addJSFLibrary", 1, 1); //$NON-NLS-1$ - addEParameter(op, this.getJSFLibrary(), "library", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "addJSFLibrary", 1, 1); + addEParameter(op, this.getJSFLibrary(), "library", 1, 1); - op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "removeJSFLibrary", 1, 1); //$NON-NLS-1$ - addEParameter(op, this.getJSFLibrary(), "library", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "removeJSFLibrary", 1, 1); + addEParameter(op, this.getJSFLibrary(), "library", 1, 1); - addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getDefaultImplementation", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getDefaultImplementation", 1, 1); - op = addEOperation(jsfLibraryRegistryEClass, null, "setDefaultImplementation"); //$NON-NLS-1$ - addEParameter(op, this.getJSFLibrary(), "implementation", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryRegistryEClass, null, "setDefaultImplementation"); + addEParameter(op, this.getJSFLibrary(), "implementation", 1, 1); - initEClass(jsfLibraryEClass, JSFLibrary.class, "JSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getJSFLibrary_ID(), ecorePackage.getEString(), "ID", "", 0, 1, JSFLibrary.class, IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getJSFLibrary_Name(), ecorePackage.getEString(), "Name", null, 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getJSFLibrary_JSFVersion(), this.getJSFVersion(), "JSFVersion", "UNKNOWN", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getJSFLibrary_Deployed(), ecorePackage.getEBoolean(), "Deployed", "true", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getJSFLibrary_Implementation(), ecorePackage.getEBoolean(), "Implementation", "false", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEReference(getJSFLibrary_ArchiveFiles(), this.getArchiveFile(), this.getArchiveFile_JSFLibrary(), "ArchiveFiles", null, 0, -1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(jsfLibraryEClass, JSFLibrary.class, "JSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getJSFLibrary_ID(), ecorePackage.getEString(), "ID", "", 0, 1, JSFLibrary.class, IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getJSFLibrary_Name(), ecorePackage.getEString(), "Name", null, 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getJSFLibrary_JSFVersion(), this.getJSFVersion(), "JSFVersion", "UNKNOWN", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getJSFLibrary_Deployed(), ecorePackage.getEBoolean(), "Deployed", "true", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getJSFLibrary_Implementation(), ecorePackage.getEBoolean(), "Implementation", "false", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getJSFLibrary_ArchiveFiles(), this.getArchiveFile(), this.getArchiveFile_JSFLibrary(), "ArchiveFiles", null, 0, -1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "containsArchiveFile", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "fullPath", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "containsArchiveFile", 1, 1); + addEParameter(op, ecorePackage.getEString(), "fullPath", 1, 1); - addEOperation(jsfLibraryEClass, this.getJSFLibrary(), "getWorkingCopy", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryEClass, this.getJSFLibrary(), "getWorkingCopy", 1, 1); - op = addEOperation(jsfLibraryEClass, null, "updateValues"); //$NON-NLS-1$ - addEParameter(op, this.getJSFLibrary(), "otherLibrary", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryEClass, null, "updateValues"); + addEParameter(op, this.getJSFLibrary(), "otherLibrary", 1, 1); - op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "copyTo", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1); //$NON-NLS-1$ + op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "copyTo", 1, 1); + addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1); - addEOperation(jsfLibraryEClass, ecorePackage.getEString(), "getLabel", 1, 1); //$NON-NLS-1$ + addEOperation(jsfLibraryEClass, ecorePackage.getEString(), "getLabel", 1, 1); - initEClass(pluginProvidedJSFLibraryEClass, PluginProvidedJSFLibrary.class, "PluginProvidedJSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getPluginProvidedJSFLibrary_PluginID(), ecorePackage.getEString(), "pluginID", null, 1, 1, PluginProvidedJSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPluginProvidedJSFLibrary_Label(), ecorePackage.getEString(), "Label", null, 1, 1, PluginProvidedJSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(pluginProvidedJSFLibraryEClass, PluginProvidedJSFLibrary.class, "PluginProvidedJSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPluginProvidedJSFLibrary_PluginID(), ecorePackage.getEString(), "pluginID", null, 1, 1, PluginProvidedJSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPluginProvidedJSFLibrary_Label(), ecorePackage.getEString(), "Label", null, 1, 1, PluginProvidedJSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(archiveFileEClass, ArchiveFile.class, "ArchiveFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getArchiveFile_RelativeToWorkspace(), ecorePackage.getEBoolean(), "RelativeToWorkspace", "true", 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getArchiveFile_SourceLocation(), ecorePackage.getEString(), "SourceLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getArchiveFile_RelativeDestLocation(), ecorePackage.getEString(), "RelativeDestLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEReference(getArchiveFile_JSFLibrary(), this.getJSFLibrary(), this.getJSFLibrary_ArchiveFiles(), "JSFLibrary", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(archiveFileEClass, ArchiveFile.class, "ArchiveFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getArchiveFile_RelativeToWorkspace(), ecorePackage.getEBoolean(), "RelativeToWorkspace", "true", 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getArchiveFile_SourceLocation(), ecorePackage.getEString(), "SourceLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getArchiveFile_RelativeDestLocation(), ecorePackage.getEString(), "RelativeDestLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getArchiveFile_JSFLibrary(), this.getJSFLibrary(), this.getJSFLibrary_ArchiveFiles(), "JSFLibrary", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - addEOperation(archiveFileEClass, ecorePackage.getEString(), "getName", 1, 1); //$NON-NLS-1$ + addEOperation(archiveFileEClass, ecorePackage.getEString(), "getName", 1, 1); - addEOperation(archiveFileEClass, ecorePackage.getEString(), "getPath", 1, 1); //$NON-NLS-1$ + addEOperation(archiveFileEClass, ecorePackage.getEString(), "getPath", 1, 1); - addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "exists", 1, 1); //$NON-NLS-1$ + addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "exists", 1, 1); - op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "equals", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEJavaObject(), "object", 1, 1); //$NON-NLS-1$ + op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "equals", 1, 1); + addEParameter(op, ecorePackage.getEJavaObject(), "object", 1, 1); - addEOperation(archiveFileEClass, ecorePackage.getEInt(), "hashCode", 1, 1); //$NON-NLS-1$ + addEOperation(archiveFileEClass, ecorePackage.getEInt(), "hashCode", 1, 1); - op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "copyTo", 1, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1); //$NON-NLS-1$ + op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "copyTo", 1, 1); + addEParameter(op, ecorePackage.getEString(), "baseDestLocation", 1, 1); - addEOperation(archiveFileEClass, ecorePackage.getEString(), "getResolvedSourceLocation", 1, 1); //$NON-NLS-1$ + addEOperation(archiveFileEClass, ecorePackage.getEString(), "getResolvedSourceLocation", 1, 1); // Initialize enums and add enum literals - initEEnum(jsfVersionEEnum, JSFVersion.class, "JSFVersion"); //$NON-NLS-1$ + initEEnum(jsfVersionEEnum, JSFVersion.class, "JSFVersion"); addEEnumLiteral(jsfVersionEEnum, JSFVersion.UNKNOWN_LITERAL); addEEnumLiteral(jsfVersionEEnum, JSFVersion.V1_1_LITERAL); addEEnumLiteral(jsfVersionEEnum, JSFVersion.V1_2_LITERAL); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java index f4ed9570c..a7b1e37e1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java @@ -34,7 +34,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * </p> * * @generated - * @deprecated */ public class PluginProvidedJSFLibraryImpl extends JSFLibraryImpl implements PluginProvidedJSFLibrary { /** @@ -43,7 +42,7 @@ public class PluginProvidedJSFLibraryImpl extends JSFLibraryImpl implements Plug * @generated */ @SuppressWarnings("hiding") - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The default value of the '{@link #getPluginID() <em>Plugin ID</em>}' attribute. @@ -261,9 +260,9 @@ public class PluginProvidedJSFLibraryImpl extends JSFLibraryImpl implements Plug if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (pluginID: "); //$NON-NLS-1$ + result.append(" (pluginID: "); result.append(pluginID); - result.append(", Label: "); //$NON-NLS-1$ + result.append(", Label: "); result.append(label); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java index 5a89728f7..99729806f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java @@ -28,7 +28,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * <!-- end-user-doc --> * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage * @generated - * @deprecated */ public class JSFLibraryRegistryAdapterFactory extends AdapterFactoryImpl { /** @@ -36,7 +35,7 @@ public class JSFLibraryRegistryAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The cached model package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java index 321c2b756..c865f2be5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; * <!-- end-user-doc --> * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceImpl * @generated - * @deprecated */ public class JSFLibraryRegistryResourceFactoryImpl extends ResourceFactoryImpl { /** @@ -28,7 +27,7 @@ public class JSFLibraryRegistryResourceFactoryImpl extends ResourceFactoryImpl { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Creates an instance of the resource factory. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java index 21ab70186..1bff4c324 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; * <!-- end-user-doc --> * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceFactoryImpl * @generated - * @deprecated */ public class JSFLibraryRegistryResourceImpl extends XMLResourceImpl { /** @@ -27,7 +26,7 @@ public class JSFLibraryRegistryResourceImpl extends XMLResourceImpl { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * Creates an instance of the resource. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java index acda86934..b8ccb5f18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java @@ -33,7 +33,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib * <!-- end-user-doc --> * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage * @generated - * @deprecated */ public class JSFLibraryRegistrySwitch { /** @@ -41,7 +40,7 @@ public class JSFLibraryRegistrySwitch { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** * The cached model package diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java index a46aa5944..f0862125e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java @@ -26,10 +26,9 @@ import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; /** * Utility for checking for, and upgrading the JSF Library Registry when the EMF model changes. - * @deprecated */ public class JSFLibraryRegistryUpgradeUtil { - static String v1Tov2UpgradeURL = "http://www.eclipse.org/JSFxxxxxxxxxxxxxxxxxxxxxx"; //$NON-NLS-1$ + static String v1Tov2UpgradeURL = "http://www.eclipse.org/JSFxxxxxxxxxxxxxxxxxxxxxx"; /** * default state is OK, no upgrade @@ -89,7 +88,7 @@ public class JSFLibraryRegistryUpgradeUtil { */ public static String getBackupFileName(final String originalFile) { - return originalFile.concat(".bkp"); //$NON-NLS-1$ + return originalFile.concat(".bkp"); } /** @@ -118,17 +117,18 @@ public class JSFLibraryRegistryUpgradeUtil { catch (ExecutionException e) { // should never happen since we control the URL's - JSFCorePlugin.log(IStatus.ERROR, "Error during loading JSF Library registry", e); //$NON-NLS-1$ + JSFCorePlugin.log(IStatus.ERROR, "Error during loading JSF Library registry", e); //TODO: flag failure in status upgradeStatus = - new UpgradeStatus(IStatus.ERROR, true, Messages.JSFLibraryRegistryUpgradeUtil_Error); + new UpgradeStatus(IStatus.ERROR, true, "Error detected during upgrade!"); } } else { // TODO: what if can't execute? upgradeStatus = - new UpgradeStatus(IStatus.ERROR, false, Messages.JSFLibraryRegistryUpgradeUtil_Error); } + new UpgradeStatus(IStatus.ERROR, false, "Error detected during upgrade!"); + } } else { @@ -138,7 +138,7 @@ public class JSFLibraryRegistryUpgradeUtil { } catch (MalformedURLException e) { // should never happen since we control the URL's - JSFCorePlugin.log(IStatus.ERROR, "Error during loading JSF Library registry", e); //$NON-NLS-1$ + JSFCorePlugin.log(IStatus.ERROR, "Error during loading JSF Library registry", e); } } @@ -168,12 +168,12 @@ public class JSFLibraryRegistryUpgradeUtil { */ protected UpgradeOperation getUpgradeOperation(int curVersion) throws MalformedURLException { - UpgradeOperation op = new UpgradeOperation(Messages.JSFLibraryRegistryUpgradeUtil_Operation); + UpgradeOperation op = new UpgradeOperation("JSF Registry Upgrade"); switch(curVersion) { case 1: op.addVersionUpgrade( - new MigrateV1toV2Operation(Messages.JSFLibraryRegistryUpgradeUtil_v1Tov2Operation + new MigrateV1toV2Operation("Upgrade v1 to v2" ,getRegistryURI(JSF_LIBRARY_REGISTRY_V1_URL) , getRegistryURI(JSF_LIBRARY_REGISTRY_V2_URL))); } @@ -214,19 +214,19 @@ public class JSFLibraryRegistryUpgradeUtil { while ((bytesRead = from.read(buffer)) != -1) to.write(buffer, 0, bytesRead); // write } catch (IOException ioe){ - JSFCorePlugin.log(ioe, "Error during file copy"); //$NON-NLS-1$ + JSFCorePlugin.log(ioe, "Error during file copy"); } finally { if (from != null) try { from.close(); } catch (IOException e) { - JSFCorePlugin.log(e, "Error during file close"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Error during file close"); } if (to != null) try { to.close(); } catch (IOException e) { - JSFCorePlugin.log(e, "Error during file close"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Error during file close"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryXMLProcessor.java index f2b268b9b..5607893a5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryXMLProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: JSFLibraryRegistryXMLProcessor.java,v 1.4 2008/11/18 22:23:53 gkessler Exp $ + * $Id: JSFLibraryRegistryXMLProcessor.java,v 1.2 2007/04/04 18:50:17 cbateman Exp $ */ package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util; @@ -17,7 +17,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPa * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated - * @deprecated */ public class JSFLibraryRegistryXMLProcessor extends XMLProcessor { /** @@ -25,7 +24,7 @@ public class JSFLibraryRegistryXMLProcessor extends XMLProcessor { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2005 Oracle Corporation"; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/Messages.java deleted file mode 100644 index a06c4f4db..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/Messages.java +++ /dev/null @@ -1,54 +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.core.internal.jsflibraryregistry.util; - -import org.eclipse.osgi.util.NLS; - -/** - * String resource handler. - * - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String JSFLibraryRegistryUpgradeUtil_Error; - /** - * see messages.properties - */ - public static String JSFLibraryRegistryUpgradeUtil_Operation; - /** - * see messages.properties - */ - public static String JSFLibraryRegistryUpgradeUtil_v1Tov2Operation; - /** - * see messages.properties - */ - public static String UpgradeOperation_Success; - /** - * see messages.properties - */ - public static String UpgradeStatus_Error; - /** - * see messages.properties - */ - public static String UpgradeStatus_OK; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/MigrateV1toV2Operation.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/MigrateV1toV2Operation.java index 1b1ace271..7ea633989 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/MigrateV1toV2Operation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/MigrateV1toV2Operation.java @@ -26,9 +26,6 @@ import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryRegistryUtil; -/** - * @deprecated - */ class MigrateV1toV2Operation extends VersionUpgradeOperation { private final URI _v1Registry; @@ -85,11 +82,11 @@ class MigrateV1toV2Operation extends VersionUpgradeOperation { //delete upgraded v1 JSFLibraryRegistryUpgradeUtil.deleteFile(_v1Registry.toFileString()); //restore backup to v1 name - JSFLibraryRegistryUpgradeUtil.copyFile(_v1Registry.toFileString().concat(".bkp"), _v1Registry.toFileString()); //$NON-NLS-1$ + JSFLibraryRegistryUpgradeUtil.copyFile(_v1Registry.toFileString().concat(".bkp"), _v1Registry.toFileString()); //Alert end user return new UpgradeStatus(IStatus.OK, true, Messages.JSFRegistryMigration05_to_10_customMessage); } catch(IOException e) { - JSFCorePlugin.log(IStatus.ERROR, "Error during repository upgrade from v1 to v2", e); //$NON-NLS-1$ + JSFCorePlugin.log(IStatus.ERROR, "Error during repository upgrade from v1 to v2", e); return new UpgradeStatus(IStatus.ERROR, false, Messages.JSFRegistryMigrationCannot05_to_10_customMessage); } @@ -112,13 +109,13 @@ class MigrateV1toV2Operation extends VersionUpgradeOperation { throws ExecutionException { //restore backup to v1 name - JSFLibraryRegistryUpgradeUtil.copyFile(_v1Registry.toFileString().concat(".bkp"), _v1Registry.toFileString()); //$NON-NLS-1$ + JSFLibraryRegistryUpgradeUtil.copyFile(_v1Registry.toFileString().concat(".bkp"), _v1Registry.toFileString()); // delete the new registry JSFLibraryRegistryUpgradeUtil.deleteFile(_v2Registry.toFileString()); //and the backup - JSFLibraryRegistryUpgradeUtil.deleteFile(_v1Registry.toFileString().concat(".bkp")); //$NON-NLS-1$ + JSFLibraryRegistryUpgradeUtil.deleteFile(_v1Registry.toFileString().concat(".bkp")); return Status.OK_STATUS; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeOperation.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeOperation.java index 205f3b88a..130a3581d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeOperation.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Status; * Encapsulates a chain of one or more version steps into a full upgrade. * * @author cbateman - * @deprecated + * */ public class UpgradeOperation extends AbstractOperation { @@ -82,7 +82,7 @@ public class UpgradeOperation extends AbstractOperation { } } - return new UpgradeStatus(IStatus.OK, upgraded, Messages.UpgradeOperation_Success); + return new UpgradeStatus(IStatus.OK, upgraded, "Upgrade succeeded"); } /** @@ -106,7 +106,7 @@ public class UpgradeOperation extends AbstractOperation { } } - return new UpgradeStatus(IStatus.OK, true, Messages.UpgradeOperation_Success); + return new UpgradeStatus(IStatus.OK, true, "Upgrade succeeded"); } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeStatus.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeStatus.java index 30a42e1f2..4a75a1d83 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeStatus.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/UpgradeStatus.java @@ -18,7 +18,7 @@ import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; /** * Communicates the status of the JSF Library Registry - * @deprecated + * */ public class UpgradeStatus extends Status { @@ -29,7 +29,7 @@ public class UpgradeStatus extends Status * All-is-well UpgradeStatus constructor */ public UpgradeStatus(){ - super(IStatus.OK, JSFCorePlugin.getDefault().getPluginID(), Messages.UpgradeStatus_OK); + super(IStatus.OK, JSFCorePlugin.getDefault().getPluginID(), "OK"); this.upgradeOccurred = false; } @@ -78,7 +78,7 @@ public class UpgradeStatus extends Status } catch (ExecutionException e) { - return new Status(IStatus.ERROR, JSFCorePlugin.getDefault().getPluginID(), Messages.UpgradeStatus_Error, e); + return new Status(IStatus.ERROR, JSFCorePlugin.getDefault().getPluginID(), "Error committing status", e); } } return Status.OK_STATUS; @@ -97,7 +97,7 @@ public class UpgradeStatus extends Status } catch (ExecutionException e) { - return new Status(IStatus.ERROR, JSFCorePlugin.getDefault().getPluginID(), Messages.UpgradeStatus_Error, e); + return new Status(IStatus.ERROR, JSFCorePlugin.getDefault().getPluginID(), "Error committing status", e); } } return Status.OK_STATUS; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/VersionUpgradeOperation.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/VersionUpgradeOperation.java index 48f5b4050..bd8f1c288 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/VersionUpgradeOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/VersionUpgradeOperation.java @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus; * API rules * * @author cbateman - * @deprecated + * */ public abstract class VersionUpgradeOperation extends AbstractOperation { @@ -80,7 +80,7 @@ public abstract class VersionUpgradeOperation extends AbstractOperation } return result; } - throw new ExecutionException("Cannot execute"); //$NON-NLS-1$ + throw new ExecutionException("Cannot execute"); } /** @@ -114,7 +114,7 @@ public abstract class VersionUpgradeOperation extends AbstractOperation } return result; } - throw new ExecutionException("Cannot execute"); //$NON-NLS-1$ + throw new ExecutionException("Cannot execute"); } /** @@ -141,7 +141,7 @@ public abstract class VersionUpgradeOperation extends AbstractOperation } return result; } - throw new ExecutionException("Cannot redo"); //$NON-NLS-1$ + throw new ExecutionException("Cannot redo"); } /** @@ -168,7 +168,7 @@ public abstract class VersionUpgradeOperation extends AbstractOperation } return result; } - throw new ExecutionException("Cannot redo"); //$NON-NLS-1$ + throw new ExecutionException("Cannot redo"); } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/messages.properties deleted file mode 100644 index 8595e8582..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/messages.properties +++ /dev/null @@ -1,6 +0,0 @@ -JSFLibraryRegistryUpgradeUtil_Error=Error detected during upgrade\! -JSFLibraryRegistryUpgradeUtil_Operation=JSF Registry Upgrade -JSFLibraryRegistryUpgradeUtil_v1Tov2Operation=Upgrade v1 to v2 -UpgradeOperation_Success=Upgrade successful. -UpgradeStatus_Error=Error committing status -UpgradeStatus_OK=OK diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties index 601476530..86d55d025 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties @@ -14,19 +14,19 @@ JSFLibraryRegistry_NoLoadCreatingNew=Could not load JSF Library Registry; creati JSFLibraryRegistry_ErrorSaving=Error saving JSF Library Registry JSFLibraryRegistry_DEFAULT_IMPL_LABEL=<Default> JSFLibraryConfigModel_Null_Data_Source=Data Source is not provided. -JSFLibraryRegistry_ErrorLoadingFromExtPt=Error while loading JSF Libraries from extension points +JSFLibraryRegistry_ErrorLoadingFromExtPt=Error while loading JSF Libaries from extension points JSFLibraryClasspathContainer_IMPL_LIBRARY=[JSF Library - implementation] -JSFLibraryValidator_MISSING_JSF_IMPLEMENTATION_CLASSES=Selected libraries are missing key JSF implementation classes (javax.faces.*) - JSFFacetInstallDataModelProvider_ValidateServletName=Specify a servlet name to use JSFLibraryConfigPersistData_SAVED_IMPLLIB_NOT_FOUND=Saved JSF implementation library in {0} is unavailable in JSF Library Registry JSFLibraryConfigPersistData_SAVED_COMPLIB_NOT_FOUND=Saved JSF component library in {0} is unavailable in JSF Library Registry JSFLibraryClasspathContainer_NON_IMPL_LIBRARY=[JSF Library] JSFLibrariesContainerInitializer_missing_library=[missing JSF Library] +JSFFacetInstallDataModelProvider_ValidateJSFImpl=A JSF implementation library has not been chosen JSFFacetInstallDataModelProvider_DupeJarValidation=Duplicated jar on classpath: {0} JSFFacetInstallDataModelProvider_ValidateConfigFilePath=The configuration file path is not valid JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty=Specify a valid name and location for JSF configuration file +JSFFacetInstallDataModelProvider_ClientImplValidationMsg=JSF Implementation library must be specified. JSFFacetInstallDataModelProvider_ValidateConfigFileRelative1=Configuration file must be specified relative to the project''s {0} folder JSFFacetInstallDataModelProvider_ValidateConfigFileRelative2=Configuration file must be located in the project''s {0} folder JSFFacetInstallDataModelProvider_INITIAL_VALIDATION_IMPL_TYPE=Select an implementation library. If a server supplied library is chosen , the chosen server adapter must be capable of providing the JSF Implementation jars, or the application will not validate or compile. @@ -79,8 +79,6 @@ RegistryMigrationStartupHandler_Error_Rolling_Back_Migration=Error rolling back RegistryMigrationStartupHandler_Dialog_Confirm_Migration=Confirm RegistryMigrationStartupHandler_Dialog_Abort_And_Exit_Migration=Abort and Exit RegistryMigrationStartupHandler_Launch_Migration_Doc_On_Confirm=Launch Migration Doc on Confirm -RegistryUpgradeCommitHandler_Text=An unrecoverable error occurred while trying to migrate your JSF Library Registry to a newer version. This may cause your library references to be broken in your JSF projects. -RegistryUpgradeCommitHandler_Title=Serious Error Encountered\! JSFFacet11_presetLabel = JavaServer Faces v1.1 Project JSFFacet11_presetDescription = Configures a Dynamic Web application to use JSF v1.1 diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java index 3f5004f6b..866786867 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java @@ -23,6 +23,21 @@ public interface IJSFFacetInstallDataModelProperties extends /** * TODO: */ + public static final String IMPLEMENTATION_TYPE_PROPERTY_NAME = "IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE_PROPERTY_NAME"; //$NON-NLS-1$ + + /** + * TODO: + */ + public static final String IMPLEMENTATION = "IJSFFacetInstallDataModelProperties.IMPLEMENTATION"; //$NON-NLS-1$ + + /** + * TODO: + */ + public static final String DEPLOY_IMPLEMENTATION = "IJSFFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION"; //$NON-NLS-1$ + + /** + * TODO: + */ public static final String CONFIG_PATH = "IJSFFacetInstallDataModelProperties.CONFIG_PATH"; //$NON-NLS-1$ /** @@ -48,11 +63,69 @@ public interface IJSFFacetInstallDataModelProperties extends /** * TODO: */ - public static final String LIBRARY_PROVIDER_DELEGATE = "IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE"; //$NON-NLS-1$ + public static final String DEFAULT_IMPLEMENTATION_LIBRARY = "IJSFFacetInstallDataModelProperties.DEFAULT_IMPLEMENTATION_LIBRARY"; //$NON-NLS-1$ + + /** + * TODO: + */ + public static final String IMPLEMENTATION_LIBRARIES = "IJSFFacetInstallDataModelProperties.IMPLEMENTATION_LIBRARIES"; //$NON-NLS-1$ /** * TODO: */ public static final String COMPONENT_LIBRARIES = "IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES"; //$NON-NLS-1$ + /** + * Enumeration of implementation types + */ + public enum IMPLEMENTATION_TYPE { + + /** + * Unknown + */ + UNKNOWN, + /** + * Server supplied + */ + SERVER_SUPPLIED, + /** + * Not supplied by the server. The user is specifiying. + */ + USER_SPECIFIED, + + /** + * Not supplied by the server. The user is specifiying. Same as USER_SPECIFIED. + * @deprecated use USER_SPECIFIED + */ + CLIENT_SUPPLIED; + + /** + * @param type + * @return String value + */ + public static String getStringValue(final IMPLEMENTATION_TYPE type){ + if (type == null) + return "UNKNOWN"; //$NON-NLS-1$ + if (type == SERVER_SUPPLIED) + return "SERVER_SUPPLIED";//$NON-NLS-1$ + if (type == USER_SPECIFIED || type ==CLIENT_SUPPLIED ) + return "USER_SPECIFIED";//$NON-NLS-1$ + return "UNKNOWN"; //$NON-NLS-1$ + } + + /** + * @param type + * @return IMPLEMENTATION_TYPE + */ + public static IMPLEMENTATION_TYPE getValue(final String type){ + if (type == null) + return UNKNOWN; + if (type.equals("SERVER_SUPPLIED"))//$NON-NLS-1$ + return SERVER_SUPPLIED; + if (type.equals("USER_SPECIFIED") || type.equals("CLIENT_SUPPLIED"))//$NON-NLS-1$// $NON-NLS-2$ + return USER_SPECIFIED; + return UNKNOWN; + } + + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java index 818c20407..3227c38ba 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java @@ -10,8 +10,10 @@ *******************************************************************************/ package org.eclipse.jst.jsf.core.internal.project.facet; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; import org.eclipse.core.resources.IProject; @@ -24,13 +26,12 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryInternalReference; +import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryRegistryUtil; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary; import org.eclipse.osgi.util.NLS; @@ -39,7 +40,6 @@ import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvi import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action; /** @@ -51,54 +51,37 @@ public class JSFFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements IJSFFacetInstallDataModelProperties { - private LibraryInstallDelegate libraryInstallDelegate = null; - - private void initLibraryInstallDelegate() - { - final IFacetedProjectWorkingCopy fpjwc = (IFacetedProjectWorkingCopy) getProperty( FACETED_PROJECT_WORKING_COPY ); - final IProjectFacetVersion fv = (IProjectFacetVersion) getProperty( FACET_VERSION ); - - if( this.libraryInstallDelegate == null && fpjwc != null && fv != null ) - { - this.libraryInstallDelegate = new LibraryInstallDelegate( fpjwc, fv ); - - this.libraryInstallDelegate.addListener - ( - new IPropertyChangeListener() - { - public void propertyChanged( final String property, - final Object oldValue, - final Object newValue ) - { - final IDataModel dm = getDataModel(); - - if( dm != null ) - { - dm.notifyPropertyChange( LIBRARY_PROVIDER_DELEGATE, IDataModel.VALUE_CHG ); - } - } - } - ); - } - } - private String errorMessage; public Set getPropertyNames() { Set names = super.getPropertyNames(); + names.add(IMPLEMENTATION_TYPE_PROPERTY_NAME); + names.add(IMPLEMENTATION); + names.add(DEPLOY_IMPLEMENTATION); names.add(CONFIG_PATH); names.add(SERVLET_NAME); names.add(SERVLET_CLASSNAME); names.add(SERVLET_URL_PATTERNS); names.add(WEBCONTENT_DIR); - names.add(LIBRARY_PROVIDER_DELEGATE); + + names.add(IMPLEMENTATION_LIBRARIES); names.add(COMPONENT_LIBRARIES); + names.add(DEFAULT_IMPLEMENTATION_LIBRARY); return names; } public Object getDefaultProperty(String propertyName) { - if (propertyName.equals(CONFIG_PATH)) { + if (propertyName.equals(IMPLEMENTATION_TYPE_PROPERTY_NAME)){ + return IMPLEMENTATION_TYPE.UNKNOWN; + } + else if (propertyName.equals(IMPLEMENTATION)) { + if (JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry() == null) + return null; + return getDefaultImplementationLibrary();//JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation(); + } else if (propertyName.equals(DEPLOY_IMPLEMENTATION)) { + return Boolean.TRUE; + } else if (propertyName.equals(CONFIG_PATH)) { return JSFUtils.JSF_DEFAULT_CONFIG_PATH; } else if (propertyName.equals(SERVLET_NAME)) { return JSFUtils.JSF_DEFAULT_SERVLET_NAME; @@ -110,36 +93,37 @@ public class JSFFacetInstallDataModelProvider extends return IJSFCoreConstants.JSF_CORE_FACET_ID; } else if (propertyName.equals(WEBCONTENT_DIR)){ return "WebContent"; //not sure I need this //$NON-NLS-1$ - } else if (propertyName.equals(LIBRARY_PROVIDER_DELEGATE)) { - return this.libraryInstallDelegate; } else if (propertyName.equals(COMPONENT_LIBRARIES)) { return new JSFLibraryInternalReference[0]; + } else if (propertyName.equals(IMPLEMENTATION_LIBRARIES)) { + return getDefaultJSFImplementationLibraries(); + } else if (propertyName.equals(DEFAULT_IMPLEMENTATION_LIBRARY)) { + return getDefaultImplementationLibrary(); } return super.getDefaultProperty(propertyName); } - @Override - public boolean propertySet( final String propertyName, - final Object propertyValue ) - { - if( propertyName.equals( FACETED_PROJECT_WORKING_COPY ) || propertyName.equals( FACET_VERSION ) ) - { - initLibraryInstallDelegate(); - } - - return super.propertySet( propertyName, propertyValue ); - } - - public IStatus validate(String name) { + public IStatus validate(String name) { errorMessage = null; - if (name.equals(CONFIG_PATH)) { + if (name.equals(IMPLEMENTATION_TYPE_PROPERTY_NAME)) { + if (getProperty(IMPLEMENTATION_TYPE_PROPERTY_NAME) == IMPLEMENTATION_TYPE.UNKNOWN) { + return createErrorStatus(Messages.JSFFacetInstallDataModelProvider_INITIAL_VALIDATION_IMPL_TYPE); + } + } + else if (name.equals(IMPLEMENTATION)) { + if (getProperty(IMPLEMENTATION_TYPE_PROPERTY_NAME) == IMPLEMENTATION_TYPE.USER_SPECIFIED) { + JSFLibraryInternalReference lib = (JSFLibraryInternalReference)getProperty(IMPLEMENTATION); + IStatus status = validateImpl(lib.getLibrary()); + if (!OK_STATUS.equals(status)) + return status; + + return validateClasspath(); + } + } else if (name.equals(CONFIG_PATH)) { return validateConfigLocation(getStringProperty(CONFIG_PATH)); } else if (name.equals(SERVLET_NAME)) { return validateServletName(getStringProperty(SERVLET_NAME)); } - else if (name.equals(LIBRARY_PROVIDER_DELEGATE)) { - return ((LibraryInstallDelegate) getProperty(LIBRARY_PROVIDER_DELEGATE)).validate(); - } else if (name.equals(COMPONENT_LIBRARIES)) { return validateClasspath(); } @@ -159,6 +143,16 @@ public class JSFFacetInstallDataModelProvider extends return OK_STATUS; } + private IStatus validateImpl(JSFLibrary impl) { + if (impl == null) { + errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateJSFImpl; + } + if (errorMessage != null) { + return createErrorStatus(errorMessage); + } + return OK_STATUS; + } + private IStatus validateConfigLocation(String text) { if (text == null || text.trim().equals("")) { //$NON-NLS-1$ errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty; @@ -226,6 +220,19 @@ public class JSFFacetInstallDataModelProvider extends IStatus status = null; + JSFLibraryInternalReference ref = null; + if (getProperty(IMPLEMENTATION_TYPE_PROPERTY_NAME) == IMPLEMENTATION_TYPE.USER_SPECIFIED) { + ref = ((JSFLibraryInternalReference)getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION)); + if (ref != null){ + status = checkForDupeArchiveFiles(jars, ((JSFLibraryInternalReference)getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION)).getLibrary()); + if (!OK_STATUS.equals(status)){ + return status; + } + } else { + return createErrorStatus(Messages.JSFFacetInstallDataModelProvider_ClientImplValidationMsg); + } + } + JSFLibraryInternalReference[] compLibs = (JSFLibraryInternalReference[]) getProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES); if (compLibs != null){ for (int i=0;i<compLibs.length;i++){ @@ -248,7 +255,7 @@ public class JSFFacetInstallDataModelProvider extends private IProject getProject(){ String projName = (String)getProperty(FACET_PROJECT_NAME); - if (projName == null || "".equals(projName)) //$NON-NLS-1$ + if (projName == null || "".equals(projName)) return null; IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName); @@ -333,7 +340,7 @@ public class JSFFacetInstallDataModelProvider extends IFacetedProjectWorkingCopy projWC = (IFacetedProjectWorkingCopy)getProperty(FACETED_PROJECT_WORKING_COPY); Set<Action> pfas = projWC.getProjectFacetActions(); for (Action action : pfas){ - if (action.getProjectFacetVersion().getProjectFacet().getId().equals("jst.web")){ //$NON-NLS-1$ + if (action.getProjectFacetVersion().getProjectFacet().getId().equals("jst.web")){ IDataModel webFacet = (IDataModel) action.getConfig(); return webFacet.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER ); } @@ -343,4 +350,24 @@ public class JSFFacetInstallDataModelProvider extends return null; } + private List getDefaultJSFImplementationLibraries() { + List list = new ArrayList(); + if (JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry() != null) { + JSFLibrary jsfLib = JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry().getDefaultImplementation(); + if (jsfLib != null){ + JSFLibraryInternalReference prjJSFLib = new JSFLibraryInternalReference(jsfLib, true, true); + list.add(prjJSFLib); + } + } + return list; + } + + private JSFLibraryInternalReference getDefaultImplementationLibrary() { + if (JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry() != null) { + JSFLibrary jsfLib = JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry().getDefaultImplementation(); + return new JSFLibraryInternalReference(jsfLib, true, true); + } + return null; + } + } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java index b0f627581..b96e96f02 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java @@ -20,9 +20,16 @@ import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; +import org.eclipse.jdt.core.IClasspathAttribute; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jst.common.project.facet.core.ClasspathHelper; +import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; +import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.j2ee.model.ModelProviderManager; @@ -31,6 +38,9 @@ import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; +import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryInternalReference; +import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryRegistryUtil; +import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryConfigurationHelper; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -79,17 +89,14 @@ public final class JSFFacetInstallDelegate implements IDelegate { throw new JSFFacetException( NLS.bind(Messages.JSFFacetInstallDelegate_ConfigErr, project.getName())); } else if (!(provider.validateEdit(null, null).isOK())){ if (!(provider.validateEdit(null, null).isOK())) {//checks for web.xml file being read-only and allows user to set writeable - throw new JSFFacetException(NLS.bind(Messages.JSFFacetInstallDelegate_NonUpdateableWebXML, project.getName())); + throw new JSFFacetException(NLS.bind(Messages.JSFFacetInstallDelegate_NonUpdateableWebXML, project.getName())); //$NON-NLS-2$ } } -// // Create JSF Libs as classpath containers and set WTP dependencies -// // as required -// createClasspathEntries(project, fv, config, monitor); - - //Configure libraries - ( (LibraryInstallDelegate) config.getProperty( IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE ) ).execute( new NullProgressMonitor() ); - + // Create JSF Libs as classpath containers and set WTP dependencies + // as required + createClasspathEntries(project, fv, config, monitor); + // Create config file createConfigFile(project, fv, config, monitor); @@ -107,64 +114,84 @@ public final class JSFFacetInstallDelegate implements IDelegate { } } -// /** -// * Adds the JSF Library references specified in the wizard to the project as -// * classpath containers. Marks the containers as J2EE module dependencies as -// * required -// * -// * @param project -// * @param config -// * @param monitor -// */ -// private void createClasspathEntries(final IProject project, final IProjectFacetVersion fv, final IDataModel config, final IProgressMonitor monitor) throws CoreException { -// IJavaProject javaProject = JavaCore.create(project); -// List cpEntries = new ArrayList(); -// try { -// for (int i=0;i<javaProject.getRawClasspath().length;i++){ -// cpEntries.add(javaProject.getRawClasspath()[i]); -// } -// } catch (JavaModelException e) { -// JSFCorePlugin.log(e, "Unable to read classpath"); //$NON-NLS-1$ -// } -// -// IPath path, cp = null; -// IClasspathEntry entry = null; -// JSFLibraryInternalReference libref = null; -// -// JSFLibraryInternalReference[] compLibs = (JSFLibraryInternalReference[])config.getProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES); -// for (int i=0;i<compLibs.length;i++){ -// libref = compLibs[i]; -// cp = new Path(JSFLibraryConfigurationHelper.JSF_LIBRARY_CP_CONTAINER_ID); -// path = cp.append(new Path(libref.getID())); -// entry = getNewCPEntry(path, libref); -// if (entry != null) -// cpEntries.add(entry); -// } -// -// JSFLibraryRegistryUtil.setRawClasspath(javaProject, cpEntries, monitor); -// -// ( (LibraryInstallDelegate) config.getProperty( IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE ) ).execute( new NullProgressMonitor() ); -// } - -// /** -// * @param path -// * @param lib -// * @return creates new IClasspathEntry with WTP dependency attribute set, if required -// */ -// private IClasspathEntry getNewCPEntry(final IPath path, final JSFLibraryInternalReference lib) { -// -// IClasspathEntry entry = null; -// if (lib.isCheckedToBeDeployed()){ -// IClasspathAttribute depAttrib = JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY, -// ClasspathDependencyUtil.getDefaultRuntimePath(true).toString()); -// entry = JavaCore.newContainerEntry(path,null, new IClasspathAttribute[]{depAttrib}, true); -// } -// else { -// entry = JavaCore.newContainerEntry(path); -// } -// -// return entry; -// } + /** + * Adds the JSF Library references specified in the wizard to the project as + * classpath containers. Marks the containers as J2EE module dependencies as + * required + * + * @param project + * @param config + * @param monitor + */ + private void createClasspathEntries(final IProject project, final IProjectFacetVersion fv, final IDataModel config, final IProgressMonitor monitor) { + IJavaProject javaProject = JavaCore.create(project); + List cpEntries = new ArrayList(); + try { + for (int i=0;i<javaProject.getRawClasspath().length;i++){ + cpEntries.add(javaProject.getRawClasspath()[i]); + } + } catch (JavaModelException e) { + JSFCorePlugin.log(e, "Unable to read classpath"); //$NON-NLS-1$ + } + + IPath path, cp = null; + IClasspathEntry entry = null; + JSFLibraryInternalReference libref = null; + + //Implementation + if (config.getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE_PROPERTY_NAME) + == IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE.USER_SPECIFIED){ + cp = new Path(JSFLibraryConfigurationHelper.JSF_LIBRARY_CP_CONTAINER_ID); + libref = (JSFLibraryInternalReference)config.getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION); + path = cp.append(new Path(libref.getID())); + entry = getNewCPEntry(path, libref); + cpEntries.add(entry); + } + + JSFLibraryInternalReference[] compLibs = (JSFLibraryInternalReference[])config.getProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES); + for (int i=0;i<compLibs.length;i++){ + libref = compLibs[i]; + cp = new Path(JSFLibraryConfigurationHelper.JSF_LIBRARY_CP_CONTAINER_ID); + path = cp.append(new Path(libref.getID())); + entry = getNewCPEntry(path, libref); + if (entry != null) + cpEntries.add(entry); + } + + JSFLibraryRegistryUtil.setRawClasspath(javaProject, cpEntries, monitor); + + //allow for the raw classpath to be set from JSF Libs before setting the server supplied impl libs from the server, if available + if (config.getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE_PROPERTY_NAME) + == IJSFFacetInstallDataModelProperties.IMPLEMENTATION_TYPE.SERVER_SUPPLIED) { + try { + ClasspathHelper.removeClasspathEntries(project, fv); + ClasspathHelper.addClasspathEntries(project, fv); + } catch (CoreException e) { + JSFCorePlugin.log(IStatus.ERROR, "Unable to add server supplied implementation to the classpath.", e);//$NON-NLS-1$ + } + } + + } + + /** + * @param path + * @param lib + * @return creates new IClasspathEntry with WTP dependency attribute set, if required + */ + private IClasspathEntry getNewCPEntry(final IPath path, final JSFLibraryInternalReference lib) { + + IClasspathEntry entry = null; + if (lib.isCheckedToBeDeployed()){ + IClasspathAttribute depAttrib = JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY, + ClasspathDependencyUtil.getDefaultRuntimePath(true).toString()); + entry = JavaCore.newContainerEntry(path,null, new IClasspathAttribute[]{depAttrib}, true); + } + else { + entry = JavaCore.newContainerEntry(path); + } + + return entry; + } /** * @param config diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallConfig.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallConfig.java deleted file mode 100644 index f0d06d2df..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.eclipse.jst.jsf.core.internal.project.facet; - -import org.eclipse.jst.common.project.facet.core.libprov.LibraryUninstallDelegate; -import org.eclipse.wst.common.project.facet.core.ActionConfig; -import org.eclipse.wst.common.project.facet.core.IActionConfigFactory; -import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; - -public class JSFFacetUninstallConfig - - extends ActionConfig - -{ - private LibraryUninstallDelegate librariesUninstallDelegate = null; - - public LibraryUninstallDelegate getLibrariesUninstallDelegate() - { - return this.librariesUninstallDelegate; - } - - @Override - public void setFacetedProjectWorkingCopy( final IFacetedProjectWorkingCopy fpjwc ) - { - super.setFacetedProjectWorkingCopy( fpjwc ); - init(); - } - - @Override - public void setProjectFacetVersion( final IProjectFacetVersion fv ) - { - super.setProjectFacetVersion( fv ); - init(); - } - - private void init() - { - final IFacetedProjectWorkingCopy fpjwc = getFacetedProjectWorkingCopy(); - final IProjectFacetVersion fv = getProjectFacetVersion(); - - if( this.librariesUninstallDelegate == null && fpjwc != null && fv != null ) - { - this.librariesUninstallDelegate = new LibraryUninstallDelegate( fpjwc, fv ); - } - } - - public static final class Factory - - implements IActionConfigFactory - - { - public Object create() - { - return new JSFFacetUninstallConfig(); - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java index 2e0db7d24..892f8f356 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java @@ -10,19 +10,29 @@ *******************************************************************************/ package org.eclipse.jst.jsf.core.internal.project.facet; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.j2ee.model.ModelProviderManager; import org.eclipse.jst.javaee.core.ParamValue; import org.eclipse.jst.javaee.web.Servlet; import org.eclipse.jst.javaee.web.WebApp; +import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; +import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryConfigurationHelper; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -58,7 +68,10 @@ public final class JSFFacetUninstallDelegate implements IDelegate { } // Remove JSF Libraries - ( (JSFFacetUninstallConfig) config ).getLibrariesUninstallDelegate().execute( null ); + removeJSFLibraries(project, fv, monitor); + + //Remove Runtime contributed JSF classpath entries + removeRuntimeContributedJSFClasspathEntries(project, fv, monitor); // remove servlet stuff from web.xml uninstallJSFReferencesFromWebApp(project, monitor); @@ -74,6 +87,45 @@ public final class JSFFacetUninstallDelegate implements IDelegate { } } } + + /** + * Removes JSF Lib CP Containers from project + * @param project + * @param monitor + */ + private void removeJSFLibraries(final IProject project, final IProjectFacetVersion fv, final IProgressMonitor monitor) { + final IJavaProject jproj = JavaCore.create(project); + List keptEntries = new ArrayList(); + try { + IClasspathEntry[] entries = jproj.getRawClasspath(); + keptEntries = new ArrayList(); + for (int i=0;i<entries.length;i++){ + IClasspathEntry entry = entries[i]; + if ( !(JSFLibraryConfigurationHelper.isJSFLibraryContainer(entry))) + keptEntries.add(entry); + } + } catch (JavaModelException e) { + JSFCorePlugin.log(e, "Cannot get classpath entries to remove JSF Libraries for: "+project.getName()); //$NON-NLS-1$ + } + + if (keptEntries.size() > 0){ + try { + jproj.setRawClasspath((IClasspathEntry[])keptEntries.toArray(new IClasspathEntry[0]), monitor); + } catch (JavaModelException e) { + JSFCorePlugin.log(e, "Exception occured while removing JSF Libraries during JSF Facet uninstall"); //$NON-NLS-1$ + } + } + + + } + + private void removeRuntimeContributedJSFClasspathEntries(final IProject project, final IProjectFacetVersion fv, final IProgressMonitor monitor) { + try { + ClasspathHelper.removeClasspathEntries(project, fv); + } catch (CoreException e) { + JSFCorePlugin.log(IStatus.ERROR, "Unable to remove server supplied implementation from the classpath.", e);//$NON-NLS-1$ + } + } private void uninstallJSFReferencesFromWebApp(final IProject project, final IProgressMonitor monitor) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFLibraryValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFLibraryValidator.java deleted file mode 100644 index 4a9c7f779..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFLibraryValidator.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.eclipse.jst.jsf.core.internal.project.facet; - -import static org.eclipse.jst.common.project.facet.core.internal.FacetedProjectFrameworkJavaPlugin.PLUGIN_ID; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.common.project.facet.core.libprov.user.KeyClassesValidator; -import org.eclipse.jst.common.project.facet.core.libprov.user.UserLibraryProviderInstallOperationConfig; -import org.eclipse.jst.jsf.core.internal.Messages; - -/** - * Return custom message for JSF Libraries when KeyClassesValidator returns an error status - */ -public class JSFLibraryValidator extends KeyClassesValidator { - - @Override - public IStatus validate(UserLibraryProviderInstallOperationConfig config) { - IStatus status = super.validate(config); - if (status.getSeverity() == IStatus.OK) - return status; - - String message = Messages.JSFLibraryValidator_MISSING_JSF_IMPLEMENTATION_CLASSES; - return new Status( IStatus.ERROR, PLUGIN_ID, message ); - - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java index 73d872069..88e8d610a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java @@ -183,7 +183,7 @@ public abstract class JSFUtils { return false; } - return mapping.charAt(0) == '/' && mapping.endsWith("/*"); //$NON-NLS-1$ + return mapping.charAt(0) == '/' && mapping.endsWith("/*"); } /** @@ -200,7 +200,7 @@ public abstract class JSFUtils { return false; } - return mapping.startsWith("*."); //$NON-NLS-1$ + return mapping.startsWith("*."); } /** @@ -246,14 +246,14 @@ public abstract class JSFUtils { // and which is guaranteed not to match anything // that pass isExtensionMapping if (prefExtMapping == null) { - prefExtMapping = "NOTANEXTENSIONMAPPING"; //$NON-NLS-1$ + prefExtMapping = "NOTANEXTENSIONMAPPING"; } // similarly, guarantee that if the caller has no // preferred prefix mapping, that we set a non-null // comp mapping if (prefPrefixMapping == null) { - prefPrefixMapping = "NOTAPREFIXMAPPING"; //$NON-NLS-1$ + prefPrefixMapping = "NOTAPREFIXMAPPING"; } SEARCH_LOOP: for (String mapping : mappings) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderDetector.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderDetector.java deleted file mode 100644 index e86a3a66a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderDetector.java +++ /dev/null @@ -1,89 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2008 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 - * - * Contributors: - * Konstantin Komissarchik - initial implementation and ongoing maintenance - ******************************************************************************/ - -package org.eclipse.jst.jsf.core.internal.project.facet; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; -import org.eclipse.jst.common.project.facet.core.libprov.LegacyLibraryProviderDetector; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; -import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryRegistryUtil; -import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary; -import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryConfigurationHelper; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; - -/** - * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a> - */ - -public final class LegacyJSFLibraryProviderDetector - - extends LegacyLibraryProviderDetector - -{ - private static final String LEGACY_JSF_LIBRARY_PROVIDER_ID - = "legacy-jsf-library-provider"; //$NON-NLS-1$ - - @Override - public ILibraryProvider detect( final IProject project, - final IProjectFacet facet ) - { - try - { - final IJavaProject jproj = JavaCore.create( project ); - - for( IClasspathEntry cpe : jproj.getRawClasspath() ) - { - if( detect( cpe ) ) - { - return LibraryProviderFramework.getProvider( LEGACY_JSF_LIBRARY_PROVIDER_ID ); - } - } - } - catch( Exception e ) - { - JSFCorePlugin.log( e, e.getMessage() ); - } - - return null; - } - - public static boolean detect( final IClasspathEntry cpe ) - { - if( cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER ) - { - final IPath path = cpe.getPath(); - - if( isJSFLibraryContainer( path ) ) - { - String libId = path.lastSegment(); - JSFLibrary ref = JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry().getJSFLibraryByID(libId); - - if( ref != null && ref.isImplementation() ) - { - return true; - } - } - } - - return false; - } - - private static boolean isJSFLibraryContainer(IPath path) { - return path != null && path.segmentCount() == 2 && JSFLibraryConfigurationHelper.JSF_LIBRARY_CP_CONTAINER_ID.equals(path.segment(0)); - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderUninstallOperation.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderUninstallOperation.java deleted file mode 100644 index daf009a1a..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/LegacyJSFLibraryProviderUninstallOperation.java +++ /dev/null @@ -1,68 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2008 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 - * - * Contributors: - * Konstantin Komissarchik - initial implementation and ongoing maintenance - ******************************************************************************/ - -package org.eclipse.jst.jsf.core.internal.project.facet; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; - -/** - * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a> - */ - -public final class LegacyJSFLibraryProviderUninstallOperation - - extends LibraryProviderOperation - -{ - public void execute( final LibraryProviderOperationConfig config, - final IProgressMonitor monitor ) - - throws CoreException - - { - monitor.beginTask( "", 1 ); //$NON-NLS-1$ - - try - { - final IProject project = config.getFacetedProject().getProject(); - final IJavaProject jproj = JavaCore.create( project ); - final List<IClasspathEntry> newcp = new ArrayList<IClasspathEntry>(); - - for( IClasspathEntry cpe : jproj.getRawClasspath() ) - { - if( ! LegacyJSFLibraryProviderDetector.detect( cpe ) ) - { - newcp.add( cpe ); - } - } - - final IClasspathEntry[] array = newcp.toArray( new IClasspathEntry[ newcp.size() ] ); - jproj.setRawClasspath( array, null ); - - monitor.worked( 1 ); - } - finally - { - monitor.done(); - } - } - -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2AttrAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2AttrAdapter.java index cd29bb9bc..b1c62db9f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2AttrAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2AttrAdapter.java @@ -128,4 +128,14 @@ public class Region2AttrAdapter extends AttrDOMAdapter return ((IDOMAttr) attrAsNode); } + + @Override + public String toString() + { + return String.format("Region2AttrAdapter: attr=%s, owningElement=%s" + , _attr.getNodeName(), getOwningElement().getNodeName()); + + } + + }
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2ElementAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2ElementAdapter.java index 4cd22af82..21b4487af 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2ElementAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/region/Region2ElementAdapter.java @@ -127,7 +127,7 @@ public class Region2ElementAdapter extends ElementDOMAdapter .getType() != DOMRegionContext.XML_TAG_OPEN) { throw new NoElementException( - "Region is not a collection with an open tag"); //$NON-NLS-1$ + "Region is not a collection with an open tag"); } _region = (ITextRegionCollection) region; @@ -141,7 +141,7 @@ public class Region2ElementAdapter extends ElementDOMAdapter if (_context == null) { throw new NoElementException( - "Couldn't acquire structured document context"); //$NON-NLS-1$ + "Couldn't acquire structured document context"); } final IDOMContextResolver resolver = @@ -150,14 +150,14 @@ public class Region2ElementAdapter extends ElementDOMAdapter if (resolver == null) { - throw new NoElementException("Couldn't acquire dom resolver"); //$NON-NLS-1$ + throw new NoElementException("Couldn't acquire dom resolver"); } _node = resolver.getNode(); if (_node == null) { - throw new NoElementException("Couldn't get Node from region"); //$NON-NLS-1$ + throw new NoElementException("Couldn't get Node from region"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java index 509aafdf3..b31f60929 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java @@ -143,7 +143,7 @@ public final class CMUtil { if (tracker.getURI().equals(uri)) { - return (CMElementDeclaration) tracker.getElements().getNamedItem(tracker.getPrefix()+":"+elementName); //$NON-NLS-1$ + return (CMElementDeclaration) tracker.getElements().getNamedItem(tracker.getPrefix()+":"+elementName); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java index 1a069de34..4f2ee35c6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java @@ -22,227 +22,227 @@ public interface IJSFConstants /** * actionListener tagname */ - final static public String TAG_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$ + final static public String TAG_ACTIONLISTENER = "actionListener"; /** * attribute tagname */ - final static public String TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$ + final static public String TAG_ATTRIBUTE = "attribute"; /** * convertDateTime tagname */ - final static public String TAG_CONVERTDATETIME = "convertDateTime"; //$NON-NLS-1$ + final static public String TAG_CONVERTDATETIME = "convertDateTime"; /** * converter tagname */ - final static public String TAG_CONVERTER = "converter"; //$NON-NLS-1$ + final static public String TAG_CONVERTER = "converter"; /** * convertNumber tagname */ - final static public String TAG_CONVERTNUMBER = "convertNumber"; //$NON-NLS-1$ + final static public String TAG_CONVERTNUMBER = "convertNumber"; /** * facet tagname */ - final static public String TAG_FACET = "facet"; //$NON-NLS-1$ + final static public String TAG_FACET = "facet"; /** * loadBundle tagname */ - final static public String TAG_LOADBUNDLE = "loadBundle"; //$NON-NLS-1$ + final static public String TAG_LOADBUNDLE = "loadBundle"; /** * param tagname */ - final static public String TAG_PARAM = "param"; //$NON-NLS-1$ + final static public String TAG_PARAM = "param"; /** * phaseListener tagname */ - final static public String TAG_PHASELISTENER = "phaseListener"; //$NON-NLS-1$ + final static public String TAG_PHASELISTENER = "phaseListener"; /** * selectItem tagname */ - final static public String TAG_SELECTITEM = "selectItem"; //$NON-NLS-1$ + final static public String TAG_SELECTITEM = "selectItem"; /** * selectItems tagname */ - final static public String TAG_SELECTITEMS = "selectItems"; //$NON-NLS-1$ + final static public String TAG_SELECTITEMS = "selectItems"; /** * setPropertyActionListener tagname */ - final static public String TAG_SETPROPERTYACTIONLISTENER = "setPropertyActionListener"; //$NON-NLS-1$ + final static public String TAG_SETPROPERTYACTIONLISTENER = "setPropertyActionListener"; /** * subview tagname */ - final static public String TAG_SUBVIEW = "subview"; //$NON-NLS-1$ + final static public String TAG_SUBVIEW = "subview"; /** * validateDoubleRange tagname */ - final static public String TAG_VALIDATEDOUBLERANGE = "validateDoubleRange"; //$NON-NLS-1$ + final static public String TAG_VALIDATEDOUBLERANGE = "validateDoubleRange"; /** * validateLength tagname */ - final static public String TAG_VALIDATELENGTH = "validateLength"; //$NON-NLS-1$ + final static public String TAG_VALIDATELENGTH = "validateLength"; /** * validateLongRange tagname */ - final static public String TAG_VALIDATELONGRANGE = "validateLongRange"; //$NON-NLS-1$ + final static public String TAG_VALIDATELONGRANGE = "validateLongRange"; /** * validator tagname */ - final static public String TAG_VALIDATOR = "validator"; //$NON-NLS-1$ + final static public String TAG_VALIDATOR = "validator"; /** * valueChangeListener tagname */ - final static public String TAG_VALUECHANGELISTENER = "valueChangeListener"; //$NON-NLS-1$ + final static public String TAG_VALUECHANGELISTENER = "valueChangeListener"; /** * verbatim tagname */ - final static public String TAG_VERBATIM = "verbatim"; //$NON-NLS-1$ + final static public String TAG_VERBATIM = "verbatim"; /** * view tagname */ - final static public String TAG_VIEW = "view"; //$NON-NLS-1$ + final static public String TAG_VIEW = "view"; /** * column tagname */ - final static public String TAG_COLUMN = "column"; //$NON-NLS-1$ + final static public String TAG_COLUMN = "column"; /** * commandButton tagname */ - final static public String TAG_COMMANDBUTTON = "commandButton"; //$NON-NLS-1$ + final static public String TAG_COMMANDBUTTON = "commandButton"; /** * commandLink tagname */ - final static public String TAG_COMMANDLINK = "commandLink"; //$NON-NLS-1$ + final static public String TAG_COMMANDLINK = "commandLink"; /** * dataTable tagname */ - final static public String TAG_DATATABLE = "dataTable"; //$NON-NLS-1$ + final static public String TAG_DATATABLE = "dataTable"; /** * form tagname */ - final static public String TAG_FORM = "form"; //$NON-NLS-1$ + final static public String TAG_FORM = "form"; /** * graphicImage tagname */ - final static public String TAG_GRAPHICIMAGE = "graphicImage"; //$NON-NLS-1$ + final static public String TAG_GRAPHICIMAGE = "graphicImage"; /** * inputHidden tagname */ - final static public String TAG_INPUTHIDDEN = "inputHidden"; //$NON-NLS-1$ + final static public String TAG_INPUTHIDDEN = "inputHidden"; /** * inputSecret tagname */ - final static public String TAG_INPUTSECRET = "inputSecret"; //$NON-NLS-1$ + final static public String TAG_INPUTSECRET = "inputSecret"; /** * inputText tagname */ - final static public String TAG_INPUTTEXT = "inputText"; //$NON-NLS-1$ + final static public String TAG_INPUTTEXT = "inputText"; /** * inputTextarea tagname */ - final static public String TAG_INPUTTEXTAREA = "inputTextarea"; //$NON-NLS-1$ + final static public String TAG_INPUTTEXTAREA = "inputTextarea"; /** * message tagname */ - final static public String TAG_MESSAGE = "message"; //$NON-NLS-1$ + final static public String TAG_MESSAGE = "message"; /** * messages tagname */ - final static public String TAG_MESSAGES = "messages"; //$NON-NLS-1$ + final static public String TAG_MESSAGES = "messages"; /** * outputFormat tagname */ - final static public String TAG_OUTPUTFORMAT = "outputFormat"; //$NON-NLS-1$ + final static public String TAG_OUTPUTFORMAT = "outputFormat"; /** * outputLabel tagname */ - final static public String TAG_OUTPUTLABEL = "outputLabel"; //$NON-NLS-1$ + final static public String TAG_OUTPUTLABEL = "outputLabel"; /** * outputLink tagname */ - final static public String TAG_OUTPUTLINK = "outputLink"; //$NON-NLS-1$ + final static public String TAG_OUTPUTLINK = "outputLink"; /** * outputText tagname */ - final static public String TAG_OUTPUTTEXT = "outputText"; //$NON-NLS-1$ + final static public String TAG_OUTPUTTEXT = "outputText"; /** * panelGrid tagname */ - final static public String TAG_PANELGRID = "panelGrid"; //$NON-NLS-1$ + final static public String TAG_PANELGRID = "panelGrid"; /** * panelGroup tagname */ - final static public String TAG_PANELGROUP = "panelGroup"; //$NON-NLS-1$ + final static public String TAG_PANELGROUP = "panelGroup"; /** * selectBooleanCheckbox tagname */ - final static public String TAG_SELECTBOOLEANCHECKBOX = "selectBooleanCheckbox"; //$NON-NLS-1$ + final static public String TAG_SELECTBOOLEANCHECKBOX = "selectBooleanCheckbox"; /** * selectManyCheckbox tagname */ - final static public String TAG_SELECTMANYCHECKBOX = "selectManyCheckbox"; //$NON-NLS-1$ + final static public String TAG_SELECTMANYCHECKBOX = "selectManyCheckbox"; /** * selectManyListbox tagname */ - final static public String TAG_SELECTMANYLISTBOX = "selectManyListbox"; //$NON-NLS-1$ + final static public String TAG_SELECTMANYLISTBOX = "selectManyListbox"; /** * selectManyMenu tagname */ - final static public String TAG_SELECTMANYMENU = "selectManyMenu"; //$NON-NLS-1$ + final static public String TAG_SELECTMANYMENU = "selectManyMenu"; /** * selectOneListbox tagname */ - final static public String TAG_SELECTONELISTBOX = "selectOneListbox"; //$NON-NLS-1$ + final static public String TAG_SELECTONELISTBOX = "selectOneListbox"; /** * selectOneMenu tagname */ - final static public String TAG_SELECTONEMENU = "selectOneMenu"; //$NON-NLS-1$ + final static public String TAG_SELECTONEMENU = "selectOneMenu"; /** * selectOneMenu tagname */ - final static public String TAG_SELECTONERADIO = "selectOneRadio"; //$NON-NLS-1$ + final static public String TAG_SELECTONERADIO = "selectOneRadio"; // tag identifiers /** @@ -519,461 +519,461 @@ public interface IJSFConstants /** * accept tag attribute name */ - final static public String ATTR_ACCEPT = "accept"; //$NON-NLS-1$ + final static public String ATTR_ACCEPT = "accept"; /** * acceptcharset tag attribute name */ - final static public String ATTR_ACCEPTCHARSET = "acceptcharset"; //$NON-NLS-1$ + final static public String ATTR_ACCEPTCHARSET = "acceptcharset"; /** * accesskey tag attribute name */ - final static public String ATTR_ACCESSKEY = "accesskey"; //$NON-NLS-1$ + final static public String ATTR_ACCESSKEY = "accesskey"; /** * action tag attribute name */ - final static public String ATTR_ACTION = "action"; //$NON-NLS-1$ + final static public String ATTR_ACTION = "action"; /** * actionListener tag attribute name */ - final static public String ATTR_ACTIONLISTENER = "actionListener"; //$NON-NLS-1$ + final static public String ATTR_ACTIONLISTENER = "actionListener"; /** * alt tag attribute name */ - final static public String ATTR_ALT = "alt"; //$NON-NLS-1$ + final static public String ATTR_ALT = "alt"; /** * basename tag attribute name */ - final static public String ATTR_BASENAME = "basename"; //$NON-NLS-1$ + final static public String ATTR_BASENAME = "basename"; /** * bgcolor tag attribute name */ - final static public String ATTR_BGCOLOR = "bgcolor"; //$NON-NLS-1$ + final static public String ATTR_BGCOLOR = "bgcolor"; /** * binding tag attribute name */ - final static public String ATTR_BINDING = "binding"; //$NON-NLS-1$ + final static public String ATTR_BINDING = "binding"; /** * border tag attribute name */ - final static public String ATTR_BORDER = "border"; //$NON-NLS-1$ + final static public String ATTR_BORDER = "border"; /** * cellpadding tag attribute name */ - final static public String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$ + final static public String ATTR_CELLPADDING = "cellpadding"; /** * cellspacing tag attribute name */ - final static public String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$ + final static public String ATTR_CELLSPACING = "cellspacing"; /** * charset tag attribute name */ - final static public String ATTR_CHARSET = "charset"; //$NON-NLS-1$ + final static public String ATTR_CHARSET = "charset"; /** * cols tag attribute name */ - final static public String ATTR_COLS = "cols"; //$NON-NLS-1$ + final static public String ATTR_COLS = "cols"; /** * columnClasses tag attribute name */ - final static public String ATTR_COLUMNCLASSES = "columnClasses"; //$NON-NLS-1$ + final static public String ATTR_COLUMNCLASSES = "columnClasses"; /** * columns tag attribute name */ - final static public String ATTR_COLUMNS = "columns"; //$NON-NLS-1$ + final static public String ATTR_COLUMNS = "columns"; /** * converterId tag attribute name */ - final static public String ATTR_CONVERTERID = "converterId"; //$NON-NLS-1$ + final static public String ATTR_CONVERTERID = "converterId"; /** * coords tag attribute name */ - final static public String ATTR_COORDS = "coords"; //$NON-NLS-1$ + final static public String ATTR_COORDS = "coords"; /** * currencyCode tag attribute name */ - final static public String ATTR_CURRENCYCODE = "currencyCode"; //$NON-NLS-1$ + final static public String ATTR_CURRENCYCODE = "currencyCode"; /** * currencySymbol tag attribute name */ - final static public String ATTR_CURRENCYSYMBOL = "currencySymbol"; //$NON-NLS-1$ + final static public String ATTR_CURRENCYSYMBOL = "currencySymbol"; /** * dateStyle tag attribute name */ - final static public String ATTR_DATESTYLE = "dateStyle"; //$NON-NLS-1$ + final static public String ATTR_DATESTYLE = "dateStyle"; /** * dir tag attribute name */ - final static public String ATTR_DIR = "dir"; //$NON-NLS-1$ + final static public String ATTR_DIR = "dir"; /** * disabled tag attribute name */ - final static public String ATTR_DISABLED = "disabled"; //$NON-NLS-1$ + final static public String ATTR_DISABLED = "disabled"; /** * errorClass tag attribute name */ - final static public String ATTR_ERRORCLASS = "errorClass"; //$NON-NLS-1$ + final static public String ATTR_ERRORCLASS = "errorClass"; /** * errorStyle tag attribute name */ - final static public String ATTR_ERRORSTYLE = "errorStyle"; //$NON-NLS-1$ + final static public String ATTR_ERRORSTYLE = "errorStyle"; /** * escape tag attribute name */ - final static public String ATTR_ESCAPE = "escape"; //$NON-NLS-1$ + final static public String ATTR_ESCAPE = "escape"; /** * fatalClass tag attribute name */ - final static public String ATTR_FATALCLASS = "fatalClass"; //$NON-NLS-1$ + final static public String ATTR_FATALCLASS = "fatalClass"; /** * fatalStyle tag attribute name */ - final static public String ATTR_FATALSTYLE = "fatalStyle"; //$NON-NLS-1$ + final static public String ATTR_FATALSTYLE = "fatalStyle"; /** * first tag attribute name */ - final static public String ATTR_FIRST = "first"; //$NON-NLS-1$ + final static public String ATTR_FIRST = "first"; /** * footerClass tag attribute name */ - final static public String ATTR_FOOTERCLASS = "footerClass"; //$NON-NLS-1$ + final static public String ATTR_FOOTERCLASS = "footerClass"; /** * for tag attribute name */ - final static public String ATTR_FOR = "for"; //$NON-NLS-1$ + final static public String ATTR_FOR = "for"; /** * frame tag attribute name */ - final static public String ATTR_FRAME = "frame"; //$NON-NLS-1$ + final static public String ATTR_FRAME = "frame"; /** * globalOnly tag attribute name */ - final static public String ATTR_GLOBEONLY = "globalOnly"; //$NON-NLS-1$ + final static public String ATTR_GLOBEONLY = "globalOnly"; /** * headerClass tag attribute name */ - final static public String ATTR_HEADERCLASS = "headerClass"; //$NON-NLS-1$ + final static public String ATTR_HEADERCLASS = "headerClass"; /** * hreflang tag attribute name */ - final static public String ATTR_HREFLANG = "hreflang"; //$NON-NLS-1$ + final static public String ATTR_HREFLANG = "hreflang"; /** * id tag attribute name */ - final static public String ATTR_ID = "id"; //$NON-NLS-1$ + final static public String ATTR_ID = "id"; /** * image tag attribute name */ - final static public String ATTR_IMAGE = "image"; //$NON-NLS-1$ + final static public String ATTR_IMAGE = "image"; /** * immediate tag attribute name */ - final static public String ATTR_IMMEDIATE = "immediate"; //$NON-NLS-1$ + final static public String ATTR_IMMEDIATE = "immediate"; /** * infoClass tag attribute name */ - final static public String ATTR_INFOCLASS = "infoClass"; //$NON-NLS-1$ + final static public String ATTR_INFOCLASS = "infoClass"; /** * infoStyle tag attribute name */ - final static public String ATTR_INFOSTYLE = "infoStyle"; //$NON-NLS-1$ + final static public String ATTR_INFOSTYLE = "infoStyle"; /** * itemDescription tag attribute name */ - final static public String ATTR_ITEMDESCRIPTION = "itemDescription"; //$NON-NLS-1$ + final static public String ATTR_ITEMDESCRIPTION = "itemDescription"; /** * itemDisabled tag attribute name */ - final static public String ATTR_ITEMDISABLED = "itemDisabled"; //$NON-NLS-1$ + final static public String ATTR_ITEMDISABLED = "itemDisabled"; /** * itemLabel tag attribute name */ - final static public String ATTR_ITEMLABEL = "itemLabel"; //$NON-NLS-1$ + final static public String ATTR_ITEMLABEL = "itemLabel"; /** * itemValue tag attribute name */ - final static public String ATTR_ITEMVALUE = "itemValue"; //$NON-NLS-1$ + final static public String ATTR_ITEMVALUE = "itemValue"; /** * lang tag attribute name */ - final static public String ATTR_LANG = "lang"; //$NON-NLS-1$ + final static public String ATTR_LANG = "lang"; /** * layout tag attribute name */ - final static public String ATTR_LAYOUT = "layout"; //$NON-NLS-1$ + final static public String ATTR_LAYOUT = "layout"; /** * locale tag attribute name */ - final static public String ATTR_LOCALE = "locale"; //$NON-NLS-1$ + final static public String ATTR_LOCALE = "locale"; /** * maximum tag attribute name */ - final static public String ATTR_MAXIMUM = "maximum"; //$NON-NLS-1$ + final static public String ATTR_MAXIMUM = "maximum"; /** * minimum tag attribute name */ - final static public String ATTR_MINIMUM = "minimum"; //$NON-NLS-1$ + final static public String ATTR_MINIMUM = "minimum"; /** * name tag attribute name */ - final static public String ATTR_NAME = "name"; //$NON-NLS-1$ + final static public String ATTR_NAME = "name"; /** * onblur tag attribute name */ - final static public String ATTR_ONBLUR = "onblur"; //$NON-NLS-1$ + final static public String ATTR_ONBLUR = "onblur"; /** * onchange tag attribute name */ - final static public String ATTR_ONCHANGE = "onchange"; //$NON-NLS-1$ + final static public String ATTR_ONCHANGE = "onchange"; /** * onclick tag attribute name */ - final static public String ATTR_ONCLICK = "onclick"; //$NON-NLS-1$ + final static public String ATTR_ONCLICK = "onclick"; /** * ondblclick tag attribute name */ - final static public String ATTR_ONDBLCLICK = "ondblclick"; //$NON-NLS-1$ + final static public String ATTR_ONDBLCLICK = "ondblclick"; /** * onfocus tag attribute name */ - final static public String ATTR_ONFOCUS = "onfocus"; //$NON-NLS-1$ + final static public String ATTR_ONFOCUS = "onfocus"; /** * onkeydown tag attribute name */ - final static public String ATTR_ONKEYDOWN = "onkeydown"; //$NON-NLS-1$ + final static public String ATTR_ONKEYDOWN = "onkeydown"; /** * onkeypress tag attribute name */ - final static public String ATTR_ONKEYPRESS = "onkeypress"; //$NON-NLS-1$ + final static public String ATTR_ONKEYPRESS = "onkeypress"; /** * onkeyup tag attribute name */ - final static public String ATTR_ONKEYUP = "onkeyup"; //$NON-NLS-1$ + final static public String ATTR_ONKEYUP = "onkeyup"; /** * onmousedown tag attribute name */ - final static public String ATTR_ONMOUSEDOWN = "onmousedown"; //$NON-NLS-1$ + final static public String ATTR_ONMOUSEDOWN = "onmousedown"; /** * onmousemove tag attribute name */ - final static public String ATTR_ONMOUSEMOVE = "onmousemove"; //$NON-NLS-1$ + final static public String ATTR_ONMOUSEMOVE = "onmousemove"; /** * onmouseout tag attribute name */ - final static public String ATTR_ONMOUSEOUT = "onmouseout"; //$NON-NLS-1$ + final static public String ATTR_ONMOUSEOUT = "onmouseout"; /** * onmouseover tag attribute name */ - final static public String ATTR_ONMOUSEOVER = "onmouseover"; //$NON-NLS-1$ + final static public String ATTR_ONMOUSEOVER = "onmouseover"; /** * onmouseup tag attribute name */ - final static public String ATTR_ONMOUSEUP = "onmouseup"; //$NON-NLS-1$ + final static public String ATTR_ONMOUSEUP = "onmouseup"; /** * onselect tag attribute name */ - final static public String ATTR_ONSELECT = "onselect"; //$NON-NLS-1$ + final static public String ATTR_ONSELECT = "onselect"; /** * pattern tag attribute name */ - final static public String ATTR_PATTERN = "pattern"; //$NON-NLS-1$ + final static public String ATTR_PATTERN = "pattern"; /** * readonly tag attribute name */ - final static public String ATTR_READONLY = "readonly"; //$NON-NLS-1$ + final static public String ATTR_READONLY = "readonly"; /** * rel tag attribute name */ - final static public String ATTR_REL = "rel"; //$NON-NLS-1$ + final static public String ATTR_REL = "rel"; /** * rendered tag attribute name */ - final static public String ATTR_RENDERED = "rendered"; //$NON-NLS-1$ + final static public String ATTR_RENDERED = "rendered"; /** * rev tag attribute name */ - final static public String ATTR_REV = "rev"; //$NON-NLS-1$ + final static public String ATTR_REV = "rev"; /** * rowClasses tag attribute name */ - final static public String ATTR_ROWCLASSES = "rowClasses"; //$NON-NLS-1$ + final static public String ATTR_ROWCLASSES = "rowClasses"; /** * rows tag attribute name */ - final static public String ATTR_ROWS = "rows"; //$NON-NLS-1$ + final static public String ATTR_ROWS = "rows"; /** * rules tag attribute name */ - final static public String ATTR_RULES = "rules"; //$NON-NLS-1$ + final static public String ATTR_RULES = "rules"; /** * shape tag attribute name */ - final static public String ATTR_SHAPE = "shape"; //$NON-NLS-1$ + final static public String ATTR_SHAPE = "shape"; /** * showDetail tag attribute name */ - final static public String ATTR_SHOWDETAIL = "showDetail"; //$NON-NLS-1$ + final static public String ATTR_SHOWDETAIL = "showDetail"; /** * showSummary tag attribute name */ - final static public String ATTR_SHOWSUMMARY = "showSummary"; //$NON-NLS-1$ + final static public String ATTR_SHOWSUMMARY = "showSummary"; /** * size tag attribute name */ - final static public String ATTR_SIZE = "size"; //$NON-NLS-1$ + final static public String ATTR_SIZE = "size"; /** * style tag attribute name */ - final static public String ATTR_STYLE = "style"; //$NON-NLS-1$ + final static public String ATTR_STYLE = "style"; /** * styleClass tag attribute name */ - final static public String ATTR_STYLECLASS = "styleClass"; //$NON-NLS-1$ + final static public String ATTR_STYLECLASS = "styleClass"; /** * summary tag attribute name */ - final static public String ATTR_SUMMARY = "summary"; //$NON-NLS-1$ + final static public String ATTR_SUMMARY = "summary"; /** * tabindex tag attribute name */ - final static public String ATTR_TABINDEX = "tabindex"; //$NON-NLS-1$ + final static public String ATTR_TABINDEX = "tabindex"; /** * target tag attribute name */ - final static public String ATTR_TARGET = "target"; //$NON-NLS-1$ + final static public String ATTR_TARGET = "target"; /** * timeStyle tag attribute name */ - final static public String ATTR_TIMESTYLE = "timeStyle"; //$NON-NLS-1$ + final static public String ATTR_TIMESTYLE = "timeStyle"; /** * title tag attribute name */ - final static public String ATTR_TITLE = "title"; //$NON-NLS-1$ + final static public String ATTR_TITLE = "title"; /** * tooltip tag attribute name */ - final static public String ATTR_TOOLTIP = "tooltip"; //$NON-NLS-1$ + final static public String ATTR_TOOLTIP = "tooltip"; /** * type tag attribute name */ - final static public String ATTR_TYPE = "type"; //$NON-NLS-1$ + final static public String ATTR_TYPE = "type"; /** * url tag attribute name */ - final static public String ATTR_URL = "url"; //$NON-NLS-1$ + final static public String ATTR_URL = "url"; /** * validatorId tag attribute name */ - final static public String ATTR_VALIDATORID = "validatorId"; //$NON-NLS-1$ + final static public String ATTR_VALIDATORID = "validatorId"; /** * value tag attribute name */ - final static public String ATTR_VALUE = "value"; //$NON-NLS-1$ + final static public String ATTR_VALUE = "value"; /** * var tag attribute name */ - final static public String ATTR_VAR = "var"; //$NON-NLS-1$ + final static public String ATTR_VAR = "var"; /** * warnClass tag attribute name */ - final static public String ATTR_WARNCLASS = "warnClass"; //$NON-NLS-1$ + final static public String ATTR_WARNCLASS = "warnClass"; /** * warnStyle tag attribute name */ - final static public String ATTR_WARNSTYLE = "warnStyle"; //$NON-NLS-1$ + final static public String ATTR_WARNSTYLE = "warnStyle"; /** * width tag attribute name */ - final static public String ATTR_WIDTH = "width"; //$NON-NLS-1$ + final static public String ATTR_WIDTH = "width"; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java index 445a082a3..daf4e7a82 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java @@ -85,7 +85,7 @@ public class LoadBundleUtil { } private static IPath getFilePath(String baseName) { - IPath path = new Path(baseName.replace('.', '/')); + IPath path = new Path(baseName.replace('.', '/'));//$NON-NLS-1$ path = path.addFileExtension("properties");//$NON-NLS-1$ return path; } @@ -130,7 +130,7 @@ public class LoadBundleUtil { } private static String getPackageName(String baseName) { - int index = baseName.lastIndexOf('.'); + int index = baseName.lastIndexOf('.');//$NON-NLS-1$ if (index == -1) { return "";//$NON-NLS-1$ } @@ -138,9 +138,9 @@ public class LoadBundleUtil { } private static String getFileName(String baseName) { - int index = baseName.lastIndexOf('.'); + int index = baseName.lastIndexOf('.');//$NON-NLS-1$ if (index == -1) { - return baseName + ".properties"; //$NON-NLS-1$ + return baseName + ".properties"; } return baseName.substring(index + 1).concat(".properties");//$NON-NLS-1$ } @@ -270,14 +270,14 @@ public class LoadBundleUtil { final String country = _locale.getCountry(); final String variant = _locale.getVariant(); - possibleSuffices.add(""); //$NON-NLS-1$ - possibleSuffices.add("_"+language); //$NON-NLS-1$ + possibleSuffices.add(""); + possibleSuffices.add("_"+language); if (country != null) { - possibleSuffices.add(0, "_"+language + "_" + country); //$NON-NLS-1$ //$NON-NLS-2$ + possibleSuffices.add(0, "_"+language + "_" + country); if (variant != null) { - possibleSuffices.add(0, "_"+language+"_"+country+"_"+variant); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + possibleSuffices.add(0, "_"+language+"_"+country+"_"+variant); } } _possibleSuffices = Collections.unmodifiableList(possibleSuffices); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java index a95b97818..013a973e5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java @@ -52,7 +52,7 @@ public final class TagIdentifierFactory { if (!(elementDecl.getOwnerDocument() instanceof TLDDocument)) { - throw new IllegalArgumentException("Element decl must have a tlddoc for a parent: "+elementDecl.toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Element decl must have a tlddoc for a parent: "+elementDecl.toString()); } return new TLDTagIdentifier(elementDecl); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java index 6100eb329..7a1e581c5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java @@ -82,14 +82,14 @@ public class ImplicitRuntimeJSFAppConfigProvider extends AbstractJSFAppConfigPro converters.add(createConverter("Number")); //$NON-NLS-1$ converters.add(createConverter("Short")); //$NON-NLS-1$ // converters by for-class (see spec 3.3.3 -- Standard Converter Implementions - converters.add(createForClassConverter("java.lang.Boolean", "javax.faces.convert.BooleanConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Byte", "javax.faces.convert.ByteConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Character", "javax.faces.convert.CharacterConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Double", "javax.faces.convert.DoubleConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Float", "javax.faces.convert.FloatConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Integer", "javax.faces.convert.IntegerConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Long", "javax.faces.convert.LongConverter")); //$NON-NLS-1$ //$NON-NLS-2$ - converters.add(createForClassConverter("java.lang.Short", "javax.faces.converter.ShortConverter")); //$NON-NLS-1$ //$NON-NLS-2$ + converters.add(createForClassConverter("java.lang.Boolean", "javax.faces.convert.BooleanConverter")); + converters.add(createForClassConverter("java.lang.Byte", "javax.faces.convert.ByteConverter")); + converters.add(createForClassConverter("java.lang.Character", "javax.faces.convert.CharacterConverter")); + converters.add(createForClassConverter("java.lang.Double", "javax.faces.convert.DoubleConverter")); + converters.add(createForClassConverter("java.lang.Float", "javax.faces.convert.FloatConverter")); + converters.add(createForClassConverter("java.lang.Integer", "javax.faces.convert.IntegerConverter")); + converters.add(createForClassConverter("java.lang.Long", "javax.faces.convert.LongConverter")); + converters.add(createForClassConverter("java.lang.Short", "javax.faces.converter.ShortConverter")); //create and add validators EList validators = facesConfig.getValidator(); validators.add(createValidator("DoubleRange")); //$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java index 3a49fef48..3d967f97c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java @@ -43,12 +43,12 @@ public class JARFileJSFAppConfigProvider extends AbstractJSFAppConfigProvider { /** * Prefix required to turn filename into a JAR URI. */ - public static final String JARFILE_URI_PREFIX = "jar:file:///"; //$NON-NLS-1$ + public static final String JARFILE_URI_PREFIX = "jar:file:///"; /** * Suffix required to turn filename into a JAR URI. */ - public static final String FACES_CONFIG_IN_JAR_SUFFIX = "!/META-INF/faces-config.xml"; //$NON-NLS-1$ + public static final String FACES_CONFIG_IN_JAR_SUFFIX = "!/META-INF/faces-config.xml"; /** * Name of a JAR file that contains a /META-INF/faces-config.xml entry. @@ -165,13 +165,13 @@ public class JARFileJSFAppConfigProvider extends AbstractJSFAppConfigProvider { try { jarFile = new JarFile(filename, false); - ZipEntry entry = jarFile.getEntry("META-INF/faces-config.xml"); //$NON-NLS-1$ + ZipEntry entry = jarFile.getEntry("META-INF/faces-config.xml"); if (entry != null) { InputStream stream = jarFile.getInputStream(entry); - tempFile = File.createTempFile("tempfile", ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ + tempFile = File.createTempFile("tempfile", ".xml"); tempFileStream = new FileOutputStream(tempFile); int read = 0; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java index 764e02f28..04d2ce4a7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java @@ -469,7 +469,7 @@ public class JSFAppConfigManager implements IResourceChangeListener { if (propClass != null) { propClass = propClass.trim(); - if (!"".equals(propClass)) //$NON-NLS-1$ + if (!"".equals(propClass)) { allPropertyResolvers.add(propClass); } @@ -516,7 +516,7 @@ public class JSFAppConfigManager implements IResourceChangeListener { if (varClass != null) { varClass = varClass.trim(); - if (!"".equals(varClass)) //$NON-NLS-1$ + if (!"".equals(varClass)) { allVariableResolvers.add(varClass); } @@ -585,8 +585,8 @@ public class JSFAppConfigManager implements IResourceChangeListener { IPath pageFilePath = JSFAppConfigUtils.getWebContentFolderRelativePath(pageFile); if (pageFilePath != null) { String pageFileString = pageFilePath.toString(); - if (!pageFileString.startsWith("/")) { //$NON-NLS-1$ - pageFileString = "/" + pageFileString; //$NON-NLS-1$ + if (!pageFileString.startsWith("/")) { + pageFileString = "/" + pageFileString; } List navigationRules = getNavigationRules(); Iterator itNavigationRules = navigationRules.iterator(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryConfigurationHelper.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryConfigurationHelper.java index 2f677d793..dc851a9f2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryConfigurationHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryConfigurationHelper.java @@ -27,13 +27,12 @@ import org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal.JSFLibraryRefer * * <p><b>Provisional API - subject to change</b></p> * @since WTP JSF 1.0 - * @deprecated */ public final class JSFLibraryConfigurationHelper { /** * container id for JSF Library Classpath Containers */ - public static final String JSF_LIBRARY_CP_CONTAINER_ID="org.eclipse.jst.jsf.core.internal.jsflibrarycontainer"; //$NON-NLS-1$ + public static final String JSF_LIBRARY_CP_CONTAINER_ID="org.eclipse.jst.jsf.core.internal.jsflibrarycontainer"; /** * @param project @@ -57,7 +56,7 @@ public final class JSFLibraryConfigurationHelper { results.add(JSFLibraryReferenceFacadeFactory.createServerSuppliedJSFLibRef()); } } catch (JavaModelException e) { - JSFCorePlugin.log(e, "Exception occurred calling getJSFLibraryReferences for "+project.getName()); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Exception occurred calling getJSFLibraryReferences for "+project.getName()); } return results; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReference.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReference.java index 17fe475aa..9c77f03a5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReference.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReference.java @@ -18,7 +18,6 @@ import org.eclipse.jdt.core.IClasspathEntry; * Represents a reference to a JSF Library on a project * * <p><b>Provisional API - subject to change</b></p> - * @deprecated */ public abstract interface JSFLibraryReference { /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferencePluginProvided.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferencePluginProvided.java index efa98e0b7..c12f3c2cc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferencePluginProvided.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferencePluginProvided.java @@ -14,8 +14,6 @@ package org.eclipse.jst.jsf.core.jsflibraryconfiguration; * A reference to a plugin-defined JSF Library * * <p><b>Provisional API - subject to change</b></p> - * - * @deprecated */ @SuppressWarnings("deprecation") public interface JSFLibraryReferencePluginProvided extends JSFLibraryReferenceUserSpecified, JSFLibraryReferenceUserDefined { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceServerSupplied.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceServerSupplied.java index 2ee576b4a..b03ece362 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceServerSupplied.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceServerSupplied.java @@ -15,8 +15,6 @@ package org.eclipse.jst.jsf.core.jsflibraryconfiguration; * server * * <p><b>Provisional API - subject to change</b></p> - * - * @deprecated */ public interface JSFLibraryReferenceServerSupplied extends JSFLibraryReference { @@ -24,6 +22,6 @@ public interface JSFLibraryReferenceServerSupplied extends /** * Constant used for server supplied virtual JSF Library referencew */ - public static final String ID = "_ServerSupplied_"; //$NON-NLS-1$ + public static final String ID = "_ServerSupplied_"; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceUserSpecified.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceUserSpecified.java index a65cbab44..c0ba3a80f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceUserSpecified.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFLibraryReferenceUserSpecified.java @@ -15,8 +15,6 @@ package org.eclipse.jst.jsf.core.jsflibraryconfiguration; * Represents an reference to a user specified JSF Library * * <p><b>Provisional API - subject to change</b></p> - * - * @deprecated */ public interface JSFLibraryReferenceUserSpecified extends JSFLibraryReference { // diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFVersion.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFVersion.java index 244f00c19..b4e14d464 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFVersion.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/JSFVersion.java @@ -14,8 +14,6 @@ package org.eclipse.jst.jsf.core.jsflibraryconfiguration; * Enumeration of JavaServer Faces Versions * * <p><b>Provisional API - subject to change</b></p> - * - * @deprecated */ public enum JSFVersion { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/AbstractJSFLibraryReferenceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/AbstractJSFLibraryReferenceImpl.java index 7251d44e6..ad6d8fedc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/AbstractJSFLibraryReferenceImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/AbstractJSFLibraryReferenceImpl.java @@ -29,7 +29,7 @@ import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryReference; import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFVersion; /** * @author gekessle - * @deprecated + * */ public abstract class AbstractJSFLibraryReferenceImpl implements JSFLibraryReference { @@ -142,15 +142,15 @@ public abstract class AbstractJSFLibraryReferenceImpl implements JSFLibraryRefer } public String toString(){ - StringBuffer buf = new StringBuffer("id: "); //$NON-NLS-1$ + StringBuffer buf = new StringBuffer("id: "); buf.append(getId()); - buf.append(", label: "); //$NON-NLS-1$ + buf.append(", label: "); buf.append(getLabel()); - buf.append(", isDeployed: "); //$NON-NLS-1$ + buf.append(", isDeployed: "); buf.append(isDeployed()); - buf.append(", isImpl: "); //$NON-NLS-1$ + buf.append(", isImpl: "); buf.append(isJSFImplementation()); - buf.append(", version: "); //$NON-NLS-1$ + buf.append(", version: "); buf.append(getMaxSupportedVersion().name()); return buf.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceFacadeFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceFacadeFactory.java index 5205610b1..cb15c6776 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceFacadeFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceFacadeFactory.java @@ -21,7 +21,6 @@ import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryReferenceServe /** * Factory for producing facade objects for references to the internal EMF JSF Library classes - * @deprecated */ public class JSFLibraryReferenceFacadeFactory { /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferencePluginProvidedImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferencePluginProvidedImpl.java index 426ad89c5..bb847ae9c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferencePluginProvidedImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferencePluginProvidedImpl.java @@ -15,7 +15,7 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLib import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryReferencePluginProvided; /** - * @deprecated + * */ public class JSFLibraryReferencePluginProvidedImpl extends AbstractJSFLibraryReferenceImpl implements JSFLibraryReferencePluginProvided { @@ -36,7 +36,7 @@ public class JSFLibraryReferencePluginProvidedImpl extends AbstractJSFLibraryRef } public String toString() { - StringBuffer buf = new StringBuffer("PluginProvided: ("); //$NON-NLS-1$ + StringBuffer buf = new StringBuffer("PluginProvided: ("); buf.append(super.toString()); return buf.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceServerSuppliedImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceServerSuppliedImpl.java index a813bb9cd..6ab76eff9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceServerSuppliedImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceServerSuppliedImpl.java @@ -16,28 +16,24 @@ import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFVersion; /** * @author gekessle - * @deprecated + * */ public class JSFLibraryReferenceServerSuppliedImpl extends AbstractJSFLibraryReferenceImpl implements JSFLibraryReferenceServerSupplied { /** - * Library display Label - */ - public final static String SERVER_SUPPLIED = Messages.JSFLibraryReferenceServerSuppliedImpl_Label; - /** * Constructor */ public JSFLibraryReferenceServerSuppliedImpl(){ //TODO: replace label with constant - super(JSFLibraryReferenceServerSupplied.ID, SERVER_SUPPLIED, true); + super(JSFLibraryReferenceServerSupplied.ID, "Server Supplied", true); } public String toString() { - StringBuffer buf = new StringBuffer("ServerSupplied: ("); //$NON-NLS-1$ + StringBuffer buf = new StringBuffer("ServerSupplied: ("); buf.append(super.toString()); - buf.append(")"); //$NON-NLS-1$ + buf.append(")"); return buf.toString(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceUserSpecifiedImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceUserSpecifiedImpl.java index 4ca7d63df..833ed20b0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceUserSpecifiedImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/JSFLibraryReferenceUserSpecifiedImpl.java @@ -16,7 +16,7 @@ import org.eclipse.jst.jsf.core.jsflibraryconfiguration.JSFLibraryReferenceUserS /** * Implementation of a reference to a user specified JSF Library - * @deprecated + * */ @SuppressWarnings("deprecation") public class JSFLibraryReferenceUserSpecifiedImpl extends AbstractJSFLibraryReferenceImpl implements JSFLibraryReferenceUserSpecified, JSFLibraryReferenceUserDefined{ @@ -34,9 +34,9 @@ public class JSFLibraryReferenceUserSpecifiedImpl extends AbstractJSFLibraryRefe * @see org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal.AbstractJSFLibraryReferenceImpl#toString() */ public String toString() { - StringBuffer buf = new StringBuffer("UserSpecified: ("); //$NON-NLS-1$ + StringBuffer buf = new StringBuffer("UserSpecified: ("); buf.append(super.toString()); - buf.append(")"); //$NON-NLS-1$ + buf.append(")"); return buf.toString(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/Messages.java deleted file mode 100644 index bd5fbe519..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/Messages.java +++ /dev/null @@ -1,33 +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.core.jsflibraryconfiguration.internal; - -import org.eclipse.osgi.util.NLS; - -/** - * String resource handler. - * - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String JSFLibraryReferenceServerSuppliedImpl_Label; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/messages.properties deleted file mode 100644 index 5e97f3894..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryconfiguration/internal/messages.properties +++ /dev/null @@ -1 +0,0 @@ -JSFLibraryReferenceServerSuppliedImpl_Label=Server Supplied diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryArchiveFilesDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryArchiveFilesDelegate.java index a298df4f3..e260f6979 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryArchiveFilesDelegate.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryArchiveFilesDelegate.java @@ -26,7 +26,6 @@ import org.eclipse.jst.jsf.core.jsflibraryregistry.internal.PluginProvidedJSFLib * * <p><b>Provisional API - subject to change</b></p> * - * @deprecated */ public abstract class PluginProvidedJSFLibraryArchiveFilesDelegate { private PluginProvidedJSFLibraryCreationHelper2 helper; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/internal/PluginProvidedJSFLibraryCreationHelper2.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/internal/PluginProvidedJSFLibraryCreationHelper2.java index 723f0cd4b..7c280ea22 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/internal/PluginProvidedJSFLibraryCreationHelper2.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/internal/PluginProvidedJSFLibraryCreationHelper2.java @@ -28,7 +28,6 @@ import org.eclipse.osgi.util.NLS; * <br> * * @author Gerry Kessler - Oracle - * @deprecated */ public final class PluginProvidedJSFLibraryCreationHelper2 { private PluginProvidedJSFLibrary newLib; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/HTMLContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/HTMLContentModelMetaDataTranslator.java index a943bd8c0..64e707e84 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/HTMLContentModelMetaDataTranslator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/HTMLContentModelMetaDataTranslator.java @@ -52,7 +52,7 @@ public class HTMLContentModelMetaDataTranslator extends AbstractTagLibDomainCont * return "HTML 4.0" */ protected String getURIDisplayLabel() { - return Messages.HTMLContentModelMetaDataTranslator_Label; + return "HTML 4.0"; } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/JSPContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/JSPContentModelMetaDataTranslator.java index e49712f40..95ed2a0b4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/JSPContentModelMetaDataTranslator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/JSPContentModelMetaDataTranslator.java @@ -42,12 +42,12 @@ public class JSPContentModelMetaDataTranslator extends AbstractTagLibDomainConte * @see org.eclipse.jst.jsf.common.metadata.internal.AbstractTagLibDomainContentModelMetaDataTranslator#getURIDescription() */ protected String getURIDescription() { - return Messages.JSPContentModelMetaDataTranslator_Desc; + return "JSP Tags"; } @Override protected String getURIDisplayLabel() { - return Messages.JSPContentModelMetaDataTranslator_Label; + return "JSP"; } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/Messages.java deleted file mode 100644 index ce5ef392e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/Messages.java +++ /dev/null @@ -1,43 +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.core.metadata.internal; - - -import org.eclipse.osgi.util.NLS; - -/** - * String resource handler - * - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.core.metadata.internal.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String HTMLContentModelMetaDataTranslator_Label; - /** - * see messages.properties - */ - public static String JSPContentModelMetaDataTranslator_Desc; - /** - * see messages.properties - */ - public static String JSPContentModelMetaDataTranslator_Label; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/messages.properties deleted file mode 100644 index 0bb08f336..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/metadata/internal/messages.properties +++ /dev/null @@ -1,3 +0,0 @@ -HTMLContentModelMetaDataTranslator_Label=HTML 4.0 -JSPContentModelMetaDataTranslator_Desc=JSP Tags -JSPContentModelMetaDataTranslator_Label=JSP diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java index db1ff6044..e6e69ca7d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java @@ -60,7 +60,7 @@ public class MemberConstraint extends AbstractSetConstraint } return new BasicDiagnostic(Diagnostic.ERROR, this.getClass().getName(), - 0, Messages.MemberConstraint_Failure, complement.toArray()); + 0, "Failed membership constraint", complement.toArray()); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/Messages.java deleted file mode 100644 index 5442a637e..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/Messages.java +++ /dev/null @@ -1,34 +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.core.set.constraint; - -import org.eclipse.osgi.util.NLS; - -/** - * String resource handler - * - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.core.set.constraint.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String MemberConstraint_Failure; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/messages.properties deleted file mode 100644 index e2bf87098..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/messages.properties +++ /dev/null @@ -1 +0,0 @@ -MemberConstraint_Failure=Failed membership constraint diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java index 2a4a283b6..11bce8649 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java @@ -67,7 +67,7 @@ public abstract class TagMatchingAlgorithm { if (_isInvalid) { - throw new IllegalStateException("Expression: "+_expression+" has already been determined to be invalid"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalStateException("Expression: "+_expression+" has already been determined to be invalid"); } if (!_isInitialized) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DTAppManagerUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DTAppManagerUtil.java index 5da9efa16..595d48fae 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DTAppManagerUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DTAppManagerUtil.java @@ -106,7 +106,7 @@ public class DTAppManagerUtil } catch (final ViewHandlerException e) { - JSFCorePlugin.log(e, ""); //$NON-NLS-1$ + JSFCorePlugin.log(e, ""); } return null; } @@ -149,13 +149,25 @@ public class DTAppManagerUtil { return null; } + final IResource resource = resolver.getResource(); + if (resource != null) + { + return getViewRootHandle(resource); + } + return null; + } + /** + * @param res + * @return the view root handle for the resource + */ + public static IViewRootHandle getViewRootHandle(final IResource res) + { final DesignTimeApplicationManager manager = DesignTimeApplicationManager - .getInstance(project); + .getInstance(res.getProject()); if (manager != null) { - final IResource res = resolver.getResource(); if (res instanceof IFile) { final DTFacesContext facesContext = manager diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java index 69e8de20d..f3a379018 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java @@ -60,8 +60,8 @@ import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler; */ public final class DesignTimeApplicationManager { - private static final String SETTINGS_DIR_NAME = ".settings"; //$NON-NLS-1$ - private static final String ORG_ECLIPSE_JST_JSF_DESIGNTIME_APPMGR_PREFS = "org.eclipse.jst.jsf.designtime.appmgr.prefs"; //$NON-NLS-1$ + private static final String SETTINGS_DIR_NAME = ".settings"; + private static final String ORG_ECLIPSE_JST_JSF_DESIGNTIME_APPMGR_PREFS = "org.eclipse.jst.jsf.designtime.appmgr.prefs"; private static final String PROPERTY_QUALIFIER = "org.eclipse.jst.jsf.designtime.internal"; //$NON-NLS-1$ private static final String SESSION_PROPERTY_NAME_PROJECT = "DesignTimeApplicationManager"; //$NON-NLS-1$ @@ -632,9 +632,9 @@ public final class DesignTimeApplicationManager { JSFCorePlugin .log( - "A call to a disposed DesignTimeApplicationManager was attempted", //$NON-NLS-1$ + "A call to a disposed DesignTimeApplicationManager was attempted", new Throwable( - "This exception is only to record a stack trace")); //$NON-NLS-1$ + "This exception is only to record a stack trace")); } } @@ -753,9 +753,9 @@ public final class DesignTimeApplicationManager outstream.toByteArray()), true, true, null); } } catch (final CoreException e) { - JSFCorePlugin.log(e, "Problem storing properties"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Problem storing properties"); } catch (final IOException e) { - JSFCorePlugin.log(e, "Problem storing properties"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Problem storing properties"); } } }; @@ -770,7 +770,7 @@ public final class DesignTimeApplicationManager null); } catch (CoreException ce) { - JSFCorePlugin.log(ce, "Problem storing properties"); //$NON-NLS-1$ + JSFCorePlugin.log(ce, "Problem storing properties"); } } @@ -801,11 +801,11 @@ public final class DesignTimeApplicationManager } catch (final CoreException ce) { - JSFCorePlugin.log(ce, "Problem loading properties"); //$NON-NLS-1$ + JSFCorePlugin.log(ce, "Problem loading properties"); } catch (final IOException ce) { - JSFCorePlugin.log(ce, "Problem loading properties"); //$NON-NLS-1$ + JSFCorePlugin.log(ce, "Problem loading properties"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/ViewRootHolder.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/ViewRootHolder.java index d33349622..93821e5ab 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/ViewRootHolder.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/ViewRootHolder.java @@ -108,7 +108,7 @@ import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerEx catch (final ViewHandlerException e) { JSFCorePlugin.log(e, - "While creating dt viewroot for viewId: " //$NON-NLS-1$ + "While creating dt viewroot for viewId: " + viewId); } } @@ -125,7 +125,7 @@ import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerEx if (!Thread.holdsLock(_recalcViewRootExclusion)) { throw new IllegalStateException( - "Must hold _recalcViewRootExclusion to modify view root"); //$NON-NLS-1$ + "Must hold _recalcViewRootExclusion to modify view root"); } _viewRoot = newViewRoot; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/BasicExtensionFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/BasicExtensionFactory.java index fd0b823b4..233a1a6e6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/BasicExtensionFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/BasicExtensionFactory.java @@ -136,7 +136,7 @@ public class BasicExtensionFactory<EXTENSIONTYPE> { return true; } - final String flag = element.getAttribute("instancePerProject"); //$NON-NLS-1$ + final String flag = element.getAttribute("instancePerProject"); // must check for null for backward compatibility, since // this attribute wasn't part of the original. if (flag != null) @@ -194,7 +194,7 @@ public class BasicExtensionFactory<EXTENSIONTYPE> catch (Exception e) { JSFCorePlugin.log(e, - "Instantiating extension class for id: " + getId()); //$NON-NLS-1$ + "Instantiating extension class for id: " + getId()); } } return instance; @@ -240,7 +240,7 @@ public class BasicExtensionFactory<EXTENSIONTYPE> catch (CoreException e) { JSFCorePlugin.log(e, - "Instantiating extension class for id: " + getId()); //$NON-NLS-1$ + "Instantiating extension class for id: " + getId()); } } return _instance; @@ -303,7 +303,7 @@ public class BasicExtensionFactory<EXTENSIONTYPE> */ protected EXTENSIONTYPE createInstance() throws CoreException { - return (EXTENSIONTYPE) _element.createExecutableExtension("class"); //$NON-NLS-1$ + return (EXTENSIONTYPE) _element.createExecutableExtension("class"); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/DecoratableExtensionFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/DecoratableExtensionFactory.java index 249316ffb..15d53086a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/DecoratableExtensionFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/DecoratableExtensionFactory.java @@ -31,7 +31,7 @@ import org.osgi.framework.Bundle; public class DecoratableExtensionFactory<EXTENSIONTYPE> extends BasicExtensionFactory<EXTENSIONTYPE> { - private static final String DECORATOR_ATTRIBUTE_NAME = "forRuntimeClass"; //$NON-NLS-1$ + private static final String DECORATOR_ATTRIBUTE_NAME = "forRuntimeClass"; private final Map<String, List<String>> _forNameToId; /** @@ -94,7 +94,7 @@ public class DecoratableExtensionFactory<EXTENSIONTYPE> extends final ExtensionData data = super.processExtension(element, alwaysPerProject); final String forRuntimeClass = element .getAttribute(DECORATOR_ATTRIBUTE_NAME); - if (forRuntimeClass != null && !"".equals(forRuntimeClass.trim())){ //$NON-NLS-1$ + if (forRuntimeClass != null && !"".equals(forRuntimeClass.trim())){ addRuntimeClassMapping(data.getId(), forRuntimeClass); } return data; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java index 9b1a379c9..fa06bbda0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * 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.designtime.internal; import org.eclipse.osgi.util.NLS; @@ -23,10 +13,6 @@ public class Messages extends NLS { /** * see messages.properties */ - public static String CompositeTagResolvingStrategy_DisplayName; - /** - * see messages.properties - */ public static String DefaultJSPTagResolver_DisplayName; /** * see messages.properties @@ -36,22 +22,6 @@ public class Messages extends NLS { * see messages.properties */ public static String TagIntrospectingStrategy_DisplayName; - /** - * messages.properties - */ - public static String TLDRegistryManager_DisplayName; - /** - * messages.properties - */ - public static String TLDTagRegistry_RefreshJob; - /** - * messages.properties - */ - public static String TLDTagRegistry_UpdateJob; - /** - * messages.properties - */ - public static String UnresolvedJSPTagResolvingStrategy_DisplayName; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java index b669ad19d..71a766d69 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java @@ -274,9 +274,9 @@ public class JSPModelProcessor throw new CoreException (new Status(IStatus.ERROR , "org.eclipse.blah" //$NON-NLS-1$ - , 0 + , 0 //$NON-NLS-1$ ,"model not of expected type" //$NON-NLS-1$ - , new Throwable())); + , new Throwable())); //$NON-NLS-1$ } private void dispose() @@ -566,7 +566,7 @@ public class JSPModelProcessor } } - @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation") //$NON-NLS-1$ private void processSetsLocale(final String uri, final String elementName, Node attribute) { LocaleSetAggregator aggregator = LocaleSetAggregator.create(_file.getProject(), uri, elementName, attribute.getLocalName()); @@ -615,7 +615,7 @@ public class JSPModelProcessor } else { - Platform.getLog(JSFCorePlugin.getDefault().getBundle()).log(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0, "Scope not found: "+scopeName, new Throwable())); //$NON-NLS-1$ + Platform.getLog(JSFCorePlugin.getDefault().getBundle()).log(new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, 0, "Scope not found: "+scopeName, new Exception("Stack Trace Only"))); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties index 4ae3bd097..f4a8f98ef 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties @@ -1,8 +1,3 @@ -CompositeTagResolvingStrategy_DisplayName=Composite Tag Resolving Strategies DefaultJSPTagResolver_DisplayName=Meta-data Driven Resolver PersistedDataTagStrategy_DisplayName=Cached Data Tag Resolver TagIntrospectingStrategy_DisplayName=Introspecting Tag Resolver -TLDRegistryManager_DisplayName=JSP Registry Factory -TLDTagRegistry_RefreshJob=Refreshing JSP tag registry for -TLDTagRegistry_UpdateJob=Update job for project -UnresolvedJSPTagResolvingStrategy_DisplayName=Unresolved Tag Resolver diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/resolver/ViewBasedTaglibResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/resolver/ViewBasedTaglibResolverFactory.java index a702db545..3ed3716cf 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/resolver/ViewBasedTaglibResolverFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/resolver/ViewBasedTaglibResolverFactory.java @@ -120,7 +120,7 @@ IStructuredDocumentContextResolverFactory, IAdaptable if (DTAppManagerUtil.getXMLViewDefnAdapter(project, file) == null) { throw new IllegalArgumentException( - "View definition adapter not found"); //$NON-NLS-1$ + "View definition adapter not found"); } } @@ -203,7 +203,7 @@ IStructuredDocumentContextResolverFactory, IAdaptable } // shouldn't happen since the constuctor throws an exceptino // if can't get the adapter - JSFCorePlugin.log("Unexpected case", //$NON-NLS-1$ + JSFCorePlugin.log("Unexpected case", new Throwable(_file.toString())); return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTPropertyResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTPropertyResolver.java index a48afd3f3..2564e311d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTPropertyResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTPropertyResolver.java @@ -140,7 +140,7 @@ public class ConfigBasedDTPropertyResolver extends DefaultDTPropertyResolver } else { - JSFCorePlugin.log(new Exception(), String.format("resolver %s must implement the IDecorativeResolver interface to be used", id)); //$NON-NLS-1$ + JSFCorePlugin.log(new Exception(), String.format("resolver %s must implement the IDecorativeResolver interface to be used", id)); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTVariableResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTVariableResolver.java index 187d8a643..e39fe1ccb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTVariableResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ConfigBasedDTVariableResolver.java @@ -132,7 +132,7 @@ public class ConfigBasedDTVariableResolver extends DefaultDTVariableResolver } else { - JSFCorePlugin.log(new Exception(), String.format("resolver %s must implement the IDecorativeResolver interface to be used", id)); //$NON-NLS-1$ + JSFCorePlugin.log(new Exception(), String.format("resolver %s must implement the IDecorativeResolver interface to be used", id)); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/AbstractDTViewHandler.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/AbstractDTViewHandler.java index ba605b879..e40b3c403 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/AbstractDTViewHandler.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/AbstractDTViewHandler.java @@ -39,7 +39,7 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler /** * the path separator */ - public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$ + public static final String PATH_SEPARATOR = "/"; public abstract String calculateLocale(DTFacesContext context) throws ViewHandlerException; @@ -49,14 +49,14 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler { if (_isDisposed.get()) { - throw new IllegalStateException("View handler is disposed"); //$NON-NLS-1$ + throw new IllegalStateException("View handler is disposed"); } final DTUIViewRoot viewRoot = internalCreateView(facesContext, viewId); if (viewRoot == null) { - throw new ViewHandlerException("Problem in createView", Cause.UNABLE_TO_CREATE_VIEW); //$NON-NLS-1$ + throw new ViewHandlerException("Problem in createView", Cause.UNABLE_TO_CREATE_VIEW); } viewRoot.setViewId(viewId); final VersionStamp versionStamp = createVersionStamp(facesContext, @@ -64,7 +64,7 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler if (versionStamp == null) { throw new ViewHandlerException(new Throwable( - "Bad version stamp detected"), Cause.BAD_VERSION_STAMP); //$NON-NLS-1$ + "Bad version stamp detected"), Cause.BAD_VERSION_STAMP); } viewRoot.setVersionStamp(versionStamp); @@ -74,7 +74,7 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler if (advisor == null) { throw new ViewHandlerException(new Throwable( - "Bad staleness advisor"), Cause.BAD_STALENESS_ADVISOR); //$NON-NLS-1$ + "Bad staleness advisor"), Cause.BAD_STALENESS_ADVISOR); } viewRoot.setStalenessAdvisor(advisor); @@ -171,7 +171,7 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler public String getViewId(final DTFacesContext context, final IResource res) { // TODO: sync with WebrootUtil? - String strWebrootPath = ""; //$NON-NLS-1$ + String strWebrootPath = ""; final IProject project = res.getProject(); final IPath path = res.getFullPath(); final IPath webContentPath = getWebContentPath(project); @@ -213,7 +213,7 @@ public abstract class AbstractDTViewHandler implements IDTViewHandler */ protected NullViewRoot() { - super(null, null, new ComponentTypeInfo("", "", "","")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + super(null, null, new ComponentTypeInfo("", "", "","")); } @Override diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DTComponentIntrospector.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DTComponentIntrospector.java index 2e1a87bab..589e05f71 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DTComponentIntrospector.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DTComponentIntrospector.java @@ -86,81 +86,70 @@ public final class DTComponentIntrospector final String className, final IProject project, final IConfigurationContributor[] contributors) { - ProxyFactoryRegistry registry = null; - try + final ProxyFactoryRegistry registry = getProxyFactoryRegistry(project, + contributors); + + if (registry != null) { - registry = getProxyFactoryRegistry(project, - contributors); - - if (registry != null) + final IStandardBeanTypeProxyFactory factory = registry + .getBeanTypeProxyFactory(); + final IBeanTypeProxy classTypeProxy = factory + .getBeanTypeProxy(className); + final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper( + classTypeProxy); + + String family = null; + String renderer = null; + try { - final IStandardBeanTypeProxyFactory factory = registry - .getBeanTypeProxyFactory(); - final IBeanTypeProxy classTypeProxy = factory - .getBeanTypeProxy(className); - final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper(project, - classTypeProxy); - - String family = null; - String renderer = null; - try - { - classTypeWrapper.init(); - family = classTypeWrapper.callStringMethod("getFamily"); //$NON-NLS-1$ - renderer = classTypeWrapper.callStringMethod("getRendererType"); //$NON-NLS-1$ - } - catch (ProxyException e1) - { - // fall through - if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) - { - JSFCoreTraceOptions.log("DTComponentIntrospector.getComponent:", e1); //$NON-NLS-1$ - } - } - - IType type = null; - - try + classTypeWrapper.init(); + family = classTypeWrapper.callStringMethod("getFamily"); + renderer = classTypeWrapper.callStringMethod("getRendererType"); + } + catch (ProxyException e1) + { + // fall through + if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) { - type = JavaCore.create(project).findType(className); + JSFCoreTraceOptions.log("DTComponentIntrospector.getComponent:", e1); } - catch (JavaModelException e) + } + + IType type = null; + + try + { + type = JavaCore.create(project).findType(className); + } + catch (JavaModelException e) + { + // fall through; + } + + List<String> interfaces = new ArrayList<String>(); + List<String> superClasses = new ArrayList<String>(); + + if (type != null) + { + TypeInfoCache typeCache = getSharedTypeCache(); + + IType[] interfaceTypes = typeCache.cacheInterfaceTypesFor(type); + for (IType interfaze : interfaceTypes) { - // fall through; + interfaces.add(interfaze.getFullyQualifiedName()); } - - List<String> interfaces = new ArrayList<String>(); - List<String> superClasses = new ArrayList<String>(); - - if (type != null) + + IType[] superClassTypes = typeCache.cacheSupertypesFor(type); + + for (IType superClass : superClassTypes) { - TypeInfoCache typeCache = getSharedTypeCache(); - - IType[] interfaceTypes = typeCache.cacheInterfaceTypesFor(type); - for (IType interfaze : interfaceTypes) - { - interfaces.add(interfaze.getFullyQualifiedName()); - } - - IType[] superClassTypes = typeCache.cacheSupertypesFor(type); - - for (IType superClass : superClassTypes) - { - superClasses.add(superClass.getFullyQualifiedName()); - } + superClasses.add(superClass.getFullyQualifiedName()); } - - return new ComponentTypeInfo(classType, className, superClasses - .toArray(new String[0]), interfaces.toArray(new String[0]), - family, renderer); - } - } - finally - { - if (registry != null) - { - registry.terminateRegistry(true); } + + return new ComponentTypeInfo(classType, className, superClasses + .toArray(new String[0]), interfaces.toArray(new String[0]), + family, renderer); } return null; } @@ -364,7 +353,7 @@ public final class DTComponentIntrospector } catch (JavaModelException e) { - JSFCorePlugin.log("Error finding component type", e); //$NON-NLS-1$ + JSFCorePlugin.log("Error finding component type", e); } return properties; @@ -387,7 +376,7 @@ public final class DTComponentIntrospector } catch (final CoreException e) { - JSFCorePlugin.log("Error starting vm for project: " //$NON-NLS-1$ + JSFCorePlugin.log("Error starting vm for project: " + project.getName(), e); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTUIViewRoot.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTUIViewRoot.java index 02ba0eb38..29a4219cf 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTUIViewRoot.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTUIViewRoot.java @@ -34,8 +34,8 @@ public class DefaultDTUIViewRoot extends DTUIViewRoot public DefaultDTUIViewRoot() { // TODO: refactor constants - super(null, null, new ComponentTypeInfo("javax.faces.ViewRoot", //$NON-NLS-1$ - "javax.faces.component.UIViewRoot", "javax.faces.ViewRoot", //$NON-NLS-1$ //$NON-NLS-2$ + super(null, null, new ComponentTypeInfo("javax.faces.ViewRoot", + "javax.faces.component.UIViewRoot", "javax.faces.ViewRoot", null)); _defaultServices = new DefaultServices(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTViewHandler.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTViewHandler.java index d081f91f0..537355ad5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTViewHandler.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/DefaultDTViewHandler.java @@ -140,7 +140,7 @@ public class DefaultDTViewHandler extends AbstractDTViewHandler } catch (final ViewHandlerException vhe) { - JSFCorePlugin.log(vhe, "While acquiring view adapter"); //$NON-NLS-1$ + JSFCorePlugin.log(vhe, "While acquiring view adapter"); } // not found or failed @@ -176,7 +176,7 @@ public class DefaultDTViewHandler extends AbstractDTViewHandler IStatus.WARNING, String .format( - "Could not get view adapter to construct design time view root for %s", //$NON-NLS-1$ + "Could not get view adapter to construct design time view root for %s", viewId)); } else @@ -186,13 +186,13 @@ public class DefaultDTViewHandler extends AbstractDTViewHandler IStatus.WARNING, String .format( - "Could not get view adapter factory toconstruct design time view root for %s", //$NON-NLS-1$ + "Could not get view adapter factory toconstruct design time view root for %s", viewId)); } } catch (final ViewHandlerException e) { - JSFCorePlugin.log(e, "While acquiring view defn adapter factory"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "While acquiring view defn adapter factory"); // fall-through } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/JSPViewDefnAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/JSPViewDefnAdapter.java index da8825cf2..13d9e2911 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/JSPViewDefnAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/JSPViewDefnAdapter.java @@ -79,11 +79,11 @@ public class JSPViewDefnAdapter extends TaglibBasedViewDefnAdapter } catch (final IOException e) { - JSFCorePlugin.log(e, "Acquiring model for view root"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Acquiring model for view root"); } catch (final CoreException e) { - JSFCorePlugin.log(e, "Acquiring model for view root"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Acquiring model for view root"); } finally { @@ -201,7 +201,7 @@ public class JSPViewDefnAdapter extends TaglibBasedViewDefnAdapter @Override public String getGeneratedIdPrefix() { - return "_idJsp"; //$NON-NLS-1$ + return "_idJsp"; } @Override diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLComponentTreeConstructionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLComponentTreeConstructionStrategy.java index 49737f55f..9139646ef 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLComponentTreeConstructionStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLComponentTreeConstructionStrategy.java @@ -132,7 +132,7 @@ public class XMLComponentTreeConstructionStrategy extends { final ComponentInfo topLevelChild = (ComponentInfo) it.next(); - if ("javax.faces.ViewRoot".equals(topLevelChild //$NON-NLS-1$ + if ("javax.faces.ViewRoot".equals(topLevelChild .getComponentTypeInfo().getComponentType())) { foundRoot = topLevelChild; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewDefnAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewDefnAdapter.java index 6e2176bd9..842f92ccb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewDefnAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewDefnAdapter.java @@ -47,7 +47,7 @@ import org.w3c.dom.Node; public abstract class XMLViewDefnAdapter extends AbstractViewDefnAdapter<Node, IDocument> { - private static final String GENERATED_ID = "_generatedId"; //$NON-NLS-1$ + private static final String GENERATED_ID = "_generatedId"; @Override public abstract IDocument getContainer(DTFacesContext context, String viewId); @@ -58,10 +58,10 @@ public abstract class XMLViewDefnAdapter extends { if (viewDefnObject instanceof Element) { - return ((Element) viewDefnObject).getAttribute("id"); //$NON-NLS-1$ + return ((Element) viewDefnObject).getAttribute("id"); } throw new IllegalArgumentException( - "Only Elements can define view object ids"); //$NON-NLS-1$ + "Only Elements can define view object ids"); } @Override diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectConstructionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectConstructionStrategy.java index 1336157a7..163cae9a5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectConstructionStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectConstructionStrategy.java @@ -58,7 +58,7 @@ import org.w3c.dom.NamedNodeMap; public class XMLViewObjectConstructionStrategy extends ViewObjectConstructionStrategy<Element> { - private static final String GENERATED_ID = "_generatedId"; //$NON-NLS-1$ + private static final String GENERATED_ID = "_generatedId"; private final ComponentConstructionData _constructionData; private final XMLViewDefnAdapter _adapter; private final XMLViewObjectMappingService _mappingService; @@ -79,7 +79,7 @@ public class XMLViewObjectConstructionStrategy extends if (adapter == null || constructionData == null) { throw new IllegalArgumentException( - "adapter and constructionData must not be null"); //$NON-NLS-1$ + "adapter and constructionData must not be null"); } _constructionData = constructionData; _adapter = adapter; @@ -103,7 +103,7 @@ public class XMLViewObjectConstructionStrategy extends final ComponentTypeInfo typeInfo = ((IComponentTagElement) tagElement) .getComponent(); - if (!"javax.faces.ViewRoot".equals(typeInfo.getComponentType())) //$NON-NLS-1$ + if (!"javax.faces.ViewRoot".equals(typeInfo.getComponentType())) { id = calculateId(element, _constructionData); } @@ -145,7 +145,7 @@ public class XMLViewObjectConstructionStrategy extends catch (final Exception e) { // log and ignore if an individual construction fails - JSFCorePlugin.log(e, "Error constructing view object"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Error constructing view object"); } return null; } @@ -176,10 +176,10 @@ public class XMLViewObjectConstructionStrategy extends populateInitMap(uri, initMap, srcElement, tagElement, attributeToPropertyMap); - if (initMap.get("id") == null) //$NON-NLS-1$ + if (initMap.get("id") == null) { // id must be set - initMap.put("id", id); //$NON-NLS-1$ + initMap.put("id", id); } final ComponentTypeInfo typeInfo = tagElement.getComponent(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectMappingService.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectMappingService.java index 855aad4ca..362fc56b3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectMappingService.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/XMLViewObjectMappingService.java @@ -67,11 +67,11 @@ public final class XMLViewObjectMappingService implements Serializable { if (elementData == null) { - throw new IllegalArgumentException("elementData cannot be null"); //$NON-NLS-1$ + throw new IllegalArgumentException("elementData cannot be null"); } else if (viewObject == null) { - throw new IllegalArgumentException("viewObject cannot be null"); //$NON-NLS-1$ + throw new IllegalArgumentException("viewObject cannot be null"); } synchronized(this) @@ -101,7 +101,7 @@ public final class XMLViewObjectMappingService implements Serializable { if (elementData == null) { - throw new IllegalArgumentException("elementData mustn't be null"); //$NON-NLS-1$ + throw new IllegalArgumentException("elementData mustn't be null"); } ViewObject viewObject = null; @@ -124,7 +124,7 @@ public final class XMLViewObjectMappingService implements Serializable { if (viewObject == null) { - throw new IllegalArgumentException("elementData mustn't be null"); //$NON-NLS-1$ + throw new IllegalArgumentException("elementData mustn't be null"); } ElementData elementData = null; @@ -184,22 +184,22 @@ public final class XMLViewObjectMappingService implements Serializable catch (CoreException ce) { JSFCorePlugin.log(ce, - "While finding element for viewObject: " //$NON-NLS-1$ - + viewObject.toString() + " in " //$NON-NLS-1$ + "While finding element for viewObject: " + + viewObject.toString() + " in " + file.getFullPath()); } catch (IOException e) { JSFCorePlugin.log(e, - "While finding element for viewObject: " //$NON-NLS-1$ - + viewObject.toString() + " in " //$NON-NLS-1$ + "While finding element for viewObject: " + + viewObject.toString() + " in " + file.getFullPath()); } catch (NoElementException e) { JSFCorePlugin.log(e, - "While finding element for viewObject: " //$NON-NLS-1$ - + viewObject.toString() + " in " //$NON-NLS-1$ + "While finding element for viewObject: " + + viewObject.toString() + " in " + file.getFullPath()); } finally diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataGenerator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataGenerator.java index 975775f50..919d54f28 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataGenerator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataGenerator.java @@ -50,7 +50,7 @@ public class ViewMetadataGenerator { _root = MetadataFactory.eINSTANCE.createModel(); _root.setId(uri); - _root.setType("tagFile"); //$NON-NLS-1$ + _root.setType("tagFile"); _resourceSet = new ResourceSetImpl(); _mapper = new ViewMetadataMapper(); _extendedMetadata = new BasicExtendedMetaData(_resourceSet @@ -102,7 +102,7 @@ public class ViewMetadataGenerator final Entity entity = MetadataFactory.eINSTANCE.createEntity(); entity.setId(tagName); - entity.setType("tag"); //$NON-NLS-1$ + entity.setType("tag"); entity.getTraits().add(trait); _root.getChildEntities().add(entity); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataLoader.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataLoader.java index d892bddc6..b422bb87c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataLoader.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/ViewMetadataLoader.java @@ -81,7 +81,7 @@ public class ViewMetadataLoader final ITaglibDomainMetaDataModelContext modelContext = createMetadataContext(tagId .getUri()); final Entity entity = TaglibDomainMetaDataQueryHelper.getEntity( - modelContext, tagId.getTagName()+"/"+name); //$NON-NLS-1$ + modelContext, tagId.getTagName()+"/"+name); if (entity != null) { final Trait trait = TaglibDomainMetaDataQueryHelper.getTrait( diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/mappers/ValueHolderAttributeMapper.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/mappers/ValueHolderAttributeMapper.java index 016b82107..7a2753665 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/mappers/ValueHolderAttributeMapper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/mappers/ValueHolderAttributeMapper.java @@ -32,7 +32,7 @@ public class ValueHolderAttributeMapper extends CustomViewMappingAdapter { final String name = attr.getNodeName(); - if ("converter".equals(name) //$NON-NLS-1$ + if ("converter".equals(name) && bestComponent.getComponentTypeInfo().isInstanceOf( ComponentFactory.INTERFACE_VALUEHOLDER)) { @@ -42,7 +42,7 @@ public class ValueHolderAttributeMapper extends CustomViewMappingAdapter { ConverterTypeInfo typeInfo = null; - if (!value.startsWith("#{")) //$NON-NLS-1$ + if (!value.startsWith("#{")) { typeInfo = new ConverterTypeInfo(null, value); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/ComponentMappingPackage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/ComponentMappingPackage.java index 886250790..e340b4f30 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/ComponentMappingPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/ComponentMappingPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ComponentMappingPackage.java,v 1.2 2008/11/18 22:24:15 gkessler Exp $ + * $Id: ComponentMappingPackage.java,v 1.1 2008/05/12 17:42:19 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping; @@ -34,7 +34,7 @@ public interface ComponentMappingPackage extends EPackage * <!-- end-user-doc --> * @generated */ - String eNAME = "viewmapping"; //$NON-NLS-1$ + String eNAME = "viewmapping"; /** * The package namespace URI. @@ -42,7 +42,7 @@ public interface ComponentMappingPackage extends EPackage * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://org.eclipse.jst.jsf.core/componentMapping.ecore"; //$NON-NLS-1$ + String eNS_URI = "http://org.eclipse.jst.jsf.core/componentMapping.ecore"; /** * The package namespace name. @@ -50,7 +50,7 @@ public interface ComponentMappingPackage extends EPackage * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "viewMap"; //$NON-NLS-1$ + String eNS_PREFIX = "viewMap"; /** * The singleton instance of the package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/CustomViewMapperExtensionLoader.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/CustomViewMapperExtensionLoader.java index 5e9de9062..540a76158 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/CustomViewMapperExtensionLoader.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/CustomViewMapperExtensionLoader.java @@ -27,8 +27,8 @@ import org.eclipse.jst.jsf.designtime.internal.view.mapping.ICustomViewMapper; */ public class CustomViewMapperExtensionLoader { - private final static String EXTENSION_ID = "customViewMapper"; //$NON-NLS-1$ - private final static String ELEMENT_NAME = "customViewMapper"; //$NON-NLS-1$ + private final static String EXTENSION_ID = "customViewMapper"; + private final static String ELEMENT_NAME = "customViewMapper"; private static Map<String, ICustomViewMapper> _extensions; @@ -67,30 +67,30 @@ public class CustomViewMapperExtensionLoader { final String pluginId = element.getContributor() .getName(); - final String name = element.getAttribute("id"); //$NON-NLS-1$ + final String name = element.getAttribute("id"); final Object customHandler = element - .createExecutableExtension("class"); //$NON-NLS-1$ + .createExecutableExtension("class"); if (customHandler instanceof ICustomViewMapper && name != null) { - handlers.put(pluginId + "." + name, //$NON-NLS-1$ + handlers.put(pluginId + "." + name, (ICustomViewMapper) customHandler); } else { JSFCorePlugin.log( - "Error loading tag registry extension: " //$NON-NLS-1$ + "Error loading tag registry extension: " + element.getContributor().getName() - + "." + element.getAttribute("id") //$NON-NLS-1$ //$NON-NLS-2$ - , new Throwable("No exception: stack trace only")); //$NON-NLS-1$ + + "." + element.getAttribute("id") + , new Throwable("No exception: stack trace only")); } } catch (final CoreException e) { JSFCorePlugin.log(e, - "Error loading tag registry extension: " //$NON-NLS-1$ + "Error loading tag registry extension: " + element.getContributor().getName() - + "." + element.getAttribute("id")); //$NON-NLS-1$ //$NON-NLS-2$ + + "." + element.getAttribute("id")); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/AttributeToPropertyMappingImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/AttributeToPropertyMappingImpl.java index 953109921..b39915897 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/AttributeToPropertyMappingImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/AttributeToPropertyMappingImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: AttributeToPropertyMappingImpl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: AttributeToPropertyMappingImpl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -280,11 +280,11 @@ public class AttributeToPropertyMappingImpl extends EObjectImpl implements Attri if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (propertyName: "); //$NON-NLS-1$ + result.append(" (propertyName: "); result.append(propertyName); - result.append(", elAllowed: "); //$NON-NLS-1$ + result.append(", elAllowed: "); result.append(elAllowed); - result.append(", customConversionFactoryId: "); //$NON-NLS-1$ + result.append(", customConversionFactoryId: "); result.append(customConversionFactoryId); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ClassTypeInfo_Impl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ClassTypeInfo_Impl.java index c81344b9e..b5607fb19 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ClassTypeInfo_Impl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ClassTypeInfo_Impl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ClassTypeInfo_Impl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ClassTypeInfo_Impl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -251,11 +251,11 @@ public class ClassTypeInfo_Impl extends EObjectImpl implements ClassTypeInfo_ if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (className: "); //$NON-NLS-1$ + result.append(" (className: "); result.append(className); - result.append(", superClasses: "); //$NON-NLS-1$ + result.append(", superClasses: "); result.append(superClasses); - result.append(", interfaces: "); //$NON-NLS-1$ + result.append(", interfaces: "); result.append(interfaces); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingFactoryImpl.java index 82bce6e36..5cb08177b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ComponentMappingFactoryImpl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ComponentMappingFactoryImpl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -35,7 +35,7 @@ public class ComponentMappingFactoryImpl extends EFactoryImpl implements Compone { try { - ComponentMappingFactory theComponentMappingFactory = (ComponentMappingFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.core/componentMapping.ecore"); //$NON-NLS-1$ + ComponentMappingFactory theComponentMappingFactory = (ComponentMappingFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.core/componentMapping.ecore"); if (theComponentMappingFactory != null) { return theComponentMappingFactory; @@ -77,7 +77,7 @@ public class ComponentMappingFactoryImpl extends EFactoryImpl implements Compone case ComponentMappingPackage.VALIDATOR_TYPE_INFO_: return createValidatorTypeInfo_(); case ComponentMappingPackage.ATTRIBUTE_TO_PROPERTY_MAPPING: return createAttributeToPropertyMapping(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingPackageImpl.java index 3debd70fc..5d73875f9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentMappingPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ComponentMappingPackageImpl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ComponentMappingPackageImpl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -497,41 +497,41 @@ public class ComponentMappingPackageImpl extends EPackageImpl implements Compone validatorTypeInfo_EClass.getESuperTypes().add(this.getClassTypeInfo_()); // Initialize classes and features; add operations and parameters - initEClass(tagMappingEClass, TagMapping.class, "TagMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getTagMapping_VersionedTagToViewMappings(), this.getTagToViewObjectMapping(), null, "versionedTagToViewMappings", null, 0, -1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagMapping_CustomConversionFactoryId(), ecorePackage.getEString(), "customConversionFactoryId", null, 0, 1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagMapping_BeanMappedProperties(), ecorePackage.getEString(), "beanMappedProperties", "", 0, -1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - - EOperation op = addEOperation(tagMappingEClass, null, "findBestMapping", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "jsfVersion", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "libVersion", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - - initEClass(tagToViewObjectMappingEClass, TagToViewObjectMapping.class, "TagToViewObjectMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getTagToViewObjectMapping_TypeInfo(), this.getClassTypeInfo_(), null, "typeInfo", null, 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagToViewObjectMapping_MinJSFVersion(), ecorePackage.getEString(), "minJSFVersion", "1.1", 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getTagToViewObjectMapping_MinLibraryVersion(), ecorePackage.getEString(), "minLibraryVersion", "", 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - - initEClass(classTypeInfo_EClass, ClassTypeInfo_.class, "ClassTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getClassTypeInfo__ClassName(), ecorePackage.getEString(), "className", null, 0, 1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getClassTypeInfo__SuperClasses(), ecorePackage.getEString(), "superClasses", null, 0, -1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getClassTypeInfo__Interfaces(), ecorePackage.getEString(), "interfaces", null, 0, -1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(componentTypeInfo_EClass, ComponentTypeInfo_.class, "ComponentTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getComponentTypeInfo__ComponentType(), ecorePackage.getEString(), "componentType", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getComponentTypeInfo__ComponentFamily(), ecorePackage.getEString(), "componentFamily", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getComponentTypeInfo__RenderType(), ecorePackage.getEString(), "renderType", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(converterTypeInfo_EClass, ConverterTypeInfo_.class, "ConverterTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getConverterTypeInfo__ConverterId(), ecorePackage.getEString(), "converterId", null, 0, 1, ConverterTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getConverterTypeInfo__ForClasses(), ecorePackage.getEString(), "forClasses", null, 0, -1, ConverterTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(validatorTypeInfo_EClass, ValidatorTypeInfo_.class, "ValidatorTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getValidatorTypeInfo__ValidatorId(), ecorePackage.getEString(), "validatorId", null, 0, 1, ValidatorTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(attributeToPropertyMappingEClass, AttributeToPropertyMapping.class, "AttributeToPropertyMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getAttributeToPropertyMapping_PropertyName(), ecorePackage.getEString(), "propertyName", null, 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getAttributeToPropertyMapping_ElAllowed(), ecorePackage.getEBoolean(), "elAllowed", "true", 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ - initEAttribute(getAttributeToPropertyMapping_CustomConversionFactoryId(), ecorePackage.getEString(), "customConversionFactoryId", null, 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagMappingEClass, TagMapping.class, "TagMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTagMapping_VersionedTagToViewMappings(), this.getTagToViewObjectMapping(), null, "versionedTagToViewMappings", null, 0, -1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagMapping_CustomConversionFactoryId(), ecorePackage.getEString(), "customConversionFactoryId", null, 0, 1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagMapping_BeanMappedProperties(), ecorePackage.getEString(), "beanMappedProperties", "", 0, -1, TagMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + EOperation op = addEOperation(tagMappingEClass, null, "findBestMapping", 0, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "jsfVersion", 0, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "libVersion", 0, 1, IS_UNIQUE, IS_ORDERED); + + initEClass(tagToViewObjectMappingEClass, TagToViewObjectMapping.class, "TagToViewObjectMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTagToViewObjectMapping_TypeInfo(), this.getClassTypeInfo_(), null, "typeInfo", null, 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagToViewObjectMapping_MinJSFVersion(), ecorePackage.getEString(), "minJSFVersion", "1.1", 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagToViewObjectMapping_MinLibraryVersion(), ecorePackage.getEString(), "minLibraryVersion", "", 0, 1, TagToViewObjectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(classTypeInfo_EClass, ClassTypeInfo_.class, "ClassTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getClassTypeInfo__ClassName(), ecorePackage.getEString(), "className", null, 0, 1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getClassTypeInfo__SuperClasses(), ecorePackage.getEString(), "superClasses", null, 0, -1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getClassTypeInfo__Interfaces(), ecorePackage.getEString(), "interfaces", null, 0, -1, ClassTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(componentTypeInfo_EClass, ComponentTypeInfo_.class, "ComponentTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getComponentTypeInfo__ComponentType(), ecorePackage.getEString(), "componentType", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getComponentTypeInfo__ComponentFamily(), ecorePackage.getEString(), "componentFamily", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getComponentTypeInfo__RenderType(), ecorePackage.getEString(), "renderType", null, 0, 1, ComponentTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(converterTypeInfo_EClass, ConverterTypeInfo_.class, "ConverterTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getConverterTypeInfo__ConverterId(), ecorePackage.getEString(), "converterId", null, 0, 1, ConverterTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getConverterTypeInfo__ForClasses(), ecorePackage.getEString(), "forClasses", null, 0, -1, ConverterTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(validatorTypeInfo_EClass, ValidatorTypeInfo_.class, "ValidatorTypeInfo_", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getValidatorTypeInfo__ValidatorId(), ecorePackage.getEString(), "validatorId", null, 0, 1, ValidatorTypeInfo_.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(attributeToPropertyMappingEClass, AttributeToPropertyMapping.class, "AttributeToPropertyMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getAttributeToPropertyMapping_PropertyName(), ecorePackage.getEString(), "propertyName", null, 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAttributeToPropertyMapping_ElAllowed(), ecorePackage.getEBoolean(), "elAllowed", "true", 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAttributeToPropertyMapping_CustomConversionFactoryId(), ecorePackage.getEString(), "customConversionFactoryId", null, 0, 1, AttributeToPropertyMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -549,150 +549,150 @@ public class ComponentMappingPackageImpl extends EPackageImpl implements Compone */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (getTagMapping_VersionedTagToViewMappings(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "versionedTagToViewMappings" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "versionedTagToViewMappings" }); addAnnotation (getTagMapping_CustomConversionFactoryId(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "customConversionFactoryId" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "customConversionFactoryId" }); addAnnotation (getTagMapping_BeanMappedProperties(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "beanMappedProperties" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "beanMappedProperties" }); addAnnotation (getTagToViewObjectMapping_TypeInfo(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "typeInfo" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "typeInfo" }); addAnnotation (getTagToViewObjectMapping_MinJSFVersion(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "minVersion" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "minVersion" }); addAnnotation (getTagToViewObjectMapping_MinLibraryVersion(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "minLibraryVersion" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "minLibraryVersion" }); addAnnotation (getClassTypeInfo__ClassName(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "className" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "className" }); addAnnotation (getClassTypeInfo__SuperClasses(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "superClasses" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "superClasses" }); addAnnotation (getClassTypeInfo__Interfaces(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "interfaces" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "interfaces" }); addAnnotation (getComponentTypeInfo__ComponentType(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "componentType" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "componentType" }); addAnnotation (getComponentTypeInfo__ComponentFamily(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "componentFamily" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "componentFamily" }); addAnnotation (getComponentTypeInfo__RenderType(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "renderType" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "renderType" }); addAnnotation (getConverterTypeInfo__ConverterId(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "converterId" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "converterId" }); addAnnotation (getConverterTypeInfo__ForClasses(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "forClass" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "forClass" }); addAnnotation (getValidatorTypeInfo__ValidatorId(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "validatorId" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "validatorId" }); addAnnotation (getAttributeToPropertyMapping_PropertyName(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "propertyName" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "propertyName" }); addAnnotation (getAttributeToPropertyMapping_ElAllowed(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "elAllowed" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "elAllowed" }); addAnnotation (getAttributeToPropertyMapping_CustomConversionFactoryId(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "customConversionFactoryId" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "customConversionFactoryId" }); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentTypeInfo_Impl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentTypeInfo_Impl.java index ac318c8dd..ceae1a899 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentTypeInfo_Impl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ComponentTypeInfo_Impl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ComponentTypeInfo_Impl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ComponentTypeInfo_Impl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -279,11 +279,11 @@ public class ComponentTypeInfo_Impl extends ClassTypeInfo_Impl implements Compon if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (componentType: "); //$NON-NLS-1$ + result.append(" (componentType: "); result.append(componentType); - result.append(", componentFamily: "); //$NON-NLS-1$ + result.append(", componentFamily: "); result.append(componentFamily); - result.append(", renderType: "); //$NON-NLS-1$ + result.append(", renderType: "); result.append(renderType); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ConverterTypeInfo_Impl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ConverterTypeInfo_Impl.java index 53387ea0d..988532025 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ConverterTypeInfo_Impl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ConverterTypeInfo_Impl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConverterTypeInfo_Impl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ConverterTypeInfo_Impl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -211,9 +211,9 @@ public class ConverterTypeInfo_Impl extends ClassTypeInfo_Impl implements Conver if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (converterId: "); //$NON-NLS-1$ + result.append(" (converterId: "); result.append(converterId); - result.append(", forClasses: "); //$NON-NLS-1$ + result.append(", forClasses: "); result.append(forClasses); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagMappingImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagMappingImpl.java index 44f32b5ce..fedaf6726 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagMappingImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagMappingImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagMappingImpl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: TagMappingImpl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -283,9 +283,9 @@ public class TagMappingImpl extends EObjectImpl implements TagMapping if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (customConversionFactoryId: "); //$NON-NLS-1$ + result.append(" (customConversionFactoryId: "); result.append(customConversionFactoryId); - result.append(", beanMappedProperties: "); //$NON-NLS-1$ + result.append(", beanMappedProperties: "); result.append(beanMappedProperties); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagToViewObjectMappingImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagToViewObjectMappingImpl.java index de7b3321e..dbaaa73c2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagToViewObjectMappingImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/TagToViewObjectMappingImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagToViewObjectMappingImpl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: TagToViewObjectMappingImpl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -54,7 +54,7 @@ public class TagToViewObjectMappingImpl extends EObjectImpl implements TagToView * @generated * @ordered */ - protected static final String MIN_JSF_VERSION_EDEFAULT = "1.1"; //$NON-NLS-1$ + protected static final String MIN_JSF_VERSION_EDEFAULT = "1.1"; /** * The cached value of the '{@link #getMinJSFVersion() <em>Min JSF Version</em>}' attribute. @@ -74,7 +74,7 @@ public class TagToViewObjectMappingImpl extends EObjectImpl implements TagToView * @generated * @ordered */ - protected static final String MIN_LIBRARY_VERSION_EDEFAULT = ""; //$NON-NLS-1$ + protected static final String MIN_LIBRARY_VERSION_EDEFAULT = ""; /** * The cached value of the '{@link #getMinLibraryVersion() <em>Min Library Version</em>}' attribute. @@ -309,6 +309,6 @@ public class TagToViewObjectMappingImpl extends EObjectImpl implements TagToView @Override public String toString() { - return "TagToViewObjectMapping: typeInfo="+getTypeInfo(); //$NON-NLS-1$ + return "TagToViewObjectMapping: typeInfo="+getTypeInfo(); } } //TagToViewObjectMappingImpl diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ValidatorTypeInfo_Impl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ValidatorTypeInfo_Impl.java index 2aca75466..bcfcfdbf2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ValidatorTypeInfo_Impl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/mapping/viewmapping/impl/ValidatorTypeInfo_Impl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ValidatorTypeInfo_Impl.java,v 1.2 2008/11/18 22:23:57 gkessler Exp $ + * $Id: ValidatorTypeInfo_Impl.java,v 1.1 2008/05/12 17:42:20 cbateman Exp $ */ package org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl; @@ -171,7 +171,7 @@ public class ValidatorTypeInfo_Impl extends ClassTypeInfo_Impl implements Valida if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (validatorId: "); //$NON-NLS-1$ + result.append(" (validatorId: "); result.append(validatorId); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/AbstractTagRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/AbstractTagRegistry.java index 50d932830..edc4118ec 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/AbstractTagRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/AbstractTagRegistry.java @@ -69,7 +69,7 @@ public abstract class AbstractTagRegistry implements ITagRegistry catch (final Exception e) { JSFCorePlugin.log(new Exception(e), - "During change event notification"); //$NON-NLS-1$ + "During change event notification"); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/TagRegistryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/TagRegistryFactory.java index d0c5ecb59..a994a56fd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/TagRegistryFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/TagRegistryFactory.java @@ -25,7 +25,8 @@ public abstract class TagRegistryFactory implements IIdentifiableStrategy<IProje { private static final ITagRegistry NO_RESULT = null; - private static final String ID = "org.eclipse.jst.jsf.designtime.view.model.TagRegistryFactory"; //$NON-NLS-1$ + private static final String ID = "org.eclipse.jst.jsf.designtime.view.model.TagRegistryFactory"; + /** * @param project @@ -38,14 +39,8 @@ public abstract class TagRegistryFactory implements IIdentifiableStrategy<IProje */ public abstract ITagRegistry createTagRegistry(final IProject project) throws TagRegistryFactoryException; - /** - * Allow - * - * @param project - * @return true if an instance of ITagRegistry already exists for project - */ - public abstract boolean isInstance(final IProject project); - + + public final ITagRegistry getNoResult() { return NO_RESULT; @@ -56,11 +51,14 @@ public abstract class TagRegistryFactory implements IIdentifiableStrategy<IProje return createTagRegistry(project); } + + public String getId() { return ID; } + /** * Wraps exceptions generated by trying to create a tag registry */ @@ -76,7 +74,7 @@ public abstract class TagRegistryFactory implements IIdentifiableStrategy<IProje */ public TagRegistryFactoryException(Throwable cause) { - super("Problem during tag registry construction", cause); //$NON-NLS-1$ + super("Problem during tag registry construction", cause); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CMNodeNamedMapAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CMNodeNamedMapAdapter.java index 0f9542b6f..4a2ab0fe2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CMNodeNamedMapAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CMNodeNamedMapAdapter.java @@ -126,7 +126,7 @@ public class CMNodeNamedMapAdapter implements } catch (UnknownAttributeException e) { - JSFCorePlugin.log(e, "Trying to get attribute for "+name); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Trying to get attribute for "+name); } } @@ -147,22 +147,22 @@ public class CMNodeNamedMapAdapter implements public void clear() { - throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$ + throw new UnsupportedOperationException("Cannot modify map"); } public ITagAttributeHandler put(String key, ITagAttributeHandler value) { - throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$ + throw new UnsupportedOperationException("Cannot modify map"); } public void putAll(Map<? extends String, ? extends ITagAttributeHandler> t) { - throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$ + throw new UnsupportedOperationException("Cannot modify map"); } public ITagAttributeHandler remove(Object key) { - throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$ + throw new UnsupportedOperationException("Cannot modify map"); } private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CompositeTagResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CompositeTagResolvingStrategy.java index 75e029d3b..bfcf32def 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CompositeTagResolvingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/CompositeTagResolvingStrategy.java @@ -14,7 +14,6 @@ import org.eclipse.jst.jsf.common.internal.policy.IIdentifiable; import org.eclipse.jst.jsf.common.internal.policy.IIteratorPolicy; import org.eclipse.jst.jsf.common.internal.strategy.IteratorPolicyBasedStrategyComposite; import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement; -import org.eclipse.jst.jsf.designtime.internal.Messages; /** * @author cbateman @@ -27,7 +26,7 @@ public class CompositeTagResolvingStrategy<TLDELEMENT> implements IIdentifiable<String>, ITagResolvingStrategy<TLDELEMENT, String> { - private static final String ID = "org.eclipse.jst.jsf.designtime.CompositeTagResolvingStrategy"; //$NON-NLS-1$ + private static final String ID = "org.eclipse.jst.jsf.designtime.CompositeTagResolvingStrategy"; /** * @param policy @@ -45,7 +44,7 @@ public class CompositeTagResolvingStrategy<TLDELEMENT> public final String getDisplayName() { - return Messages.CompositeTagResolvingStrategy_DisplayName; + return "Composite Tag Resolving Strategies"; } @Override diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java index b0226e3e5..a1dfc1687 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java @@ -52,14 +52,6 @@ public class DefaultJSPTagResolver extends JSPTagResolvingStrategy private final ViewMetadataMapper _mapper; /** - * @return the descriptor for this resolver strategy - */ - public static StrategyDescriptor createDescriptor() - { - return new StrategyDescriptor(ID, DISPLAY_NAME); - } - - /** * @param project */ public DefaultJSPTagResolver(final IProject project) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultTagTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultTagTypeInfo.java index 6853c82a9..989e03b35 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultTagTypeInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultTagTypeInfo.java @@ -77,459 +77,459 @@ public final class DefaultTagTypeInfo } private static final ComponentTypeInfo COMPINFO_PARAM = new ComponentTypeInfo( - "javax.faces.Parameter", //$NON-NLS-1$ - "javax.faces.component.UIParameter", //$NON-NLS-1$ + "javax.faces.Parameter", + "javax.faces.component.UIParameter", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Parameter", //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Parameter", null); private static final ComponentTypeInfo COMPINFO_SELECTITEM = new ComponentTypeInfo( - "javax.faces.SelectItem", //$NON-NLS-1$ - "javax.faces.component.UISelectItem", //$NON-NLS-1$ + "javax.faces.SelectItem", + "javax.faces.component.UISelectItem", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectItem", //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.SelectItem", null); private static final ComponentTypeInfo COMPINFO_SELECTITEMS = new ComponentTypeInfo( - "javax.faces.SelectItems", //$NON-NLS-1$ - "javax.faces.component.UISelectItems", //$NON-NLS-1$ + "javax.faces.SelectItems", + "javax.faces.component.UISelectItems", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectItems", //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.SelectItems", null); private static final ComponentTypeInfo COMPINFO_SUBVIEW = new ComponentTypeInfo( - "javax.faces.NamingContainer", //$NON-NLS-1$ - "javax.faces.component.UINamingContainer", //$NON-NLS-1$ + "javax.faces.NamingContainer", + "javax.faces.component.UINamingContainer", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.NamingContainer", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.NamingContainer", //$NON-NLS-1$ + "javax.faces.component.NamingContainer", + "javax.faces.component.StateHolder", }, + "javax.faces.NamingContainer", null); private static final ComponentTypeInfo COMPINFO_VERBATIM = new ComponentTypeInfo( - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.component.UIOutput", //$NON-NLS-1$ + "javax.faces.Output", + "javax.faces.component.UIOutput", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.Text"); //$NON-NLS-1$ + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Output", + "javax.faces.Text"); private static final ComponentTypeInfo COMPINFO_VIEW = new ComponentTypeInfo( - "javax.faces.ViewRoot", //$NON-NLS-1$ - "javax.faces.component.UIViewRoot", //$NON-NLS-1$ + "javax.faces.ViewRoot", + "javax.faces.component.UIViewRoot", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.ViewRoot", //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.ViewRoot", null); // expected type info for jsf/html components private static final ComponentTypeInfo COMPINFO_COLUMN = new ComponentTypeInfo( - "javax.faces.Column", //$NON-NLS-1$ - "javax.faces.component.UIColumn", //$NON-NLS-1$ + "javax.faces.Column", + "javax.faces.component.UIColumn", new String[] { - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] - { "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Column", //$NON-NLS-1$ + { "javax.faces.component.StateHolder" }, + "javax.faces.Column", null); private static final ComponentTypeInfo COMPINFO_COMMAND = new ComponentTypeInfo( - "javax.faces.HtmlCommandButton", //$NON-NLS-1$ - "javax.faces.component.html.HtmlCommandButton", //$NON-NLS-1$ + "javax.faces.HtmlCommandButton", + "javax.faces.component.html.HtmlCommandButton", new String[] { - "javax.faces.component.UICommand", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UICommand", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] { - "javax.faces.component.ActionSource", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Command", //$NON-NLS-1$ - "javax.faces.Button"); //$NON-NLS-1$ + "javax.faces.component.ActionSource", + "javax.faces.component.StateHolder" }, + "javax.faces.Command", + "javax.faces.Button"); private static final ComponentTypeInfo COMPINFO_COMMANDLINK = new ComponentTypeInfo( - "javax.faces.HtmlCommandLink", //$NON-NLS-1$ - "javax.faces.component.html.HtmlCommandLink", //$NON-NLS-1$ + "javax.faces.HtmlCommandLink", + "javax.faces.component.html.HtmlCommandLink", new String[] { - "javax.faces.component.UICommand", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UICommand", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] { - "javax.faces.component.ActionSource", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Command", //$NON-NLS-1$ - "javax.faces.Link"); //$NON-NLS-1$ + "javax.faces.component.ActionSource", + "javax.faces.component.StateHolder" }, + "javax.faces.Command", + "javax.faces.Link"); private static final ComponentTypeInfo COMPINFO_DATATABLE = new ComponentTypeInfo( - "javax.faces.HtmlDataTable", //$NON-NLS-1$ - "javax.faces.component.html.HtmlDataTable", //$NON-NLS-1$ + "javax.faces.HtmlDataTable", + "javax.faces.component.html.HtmlDataTable", new String[] { - "javax.faces.component.UIData", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIData", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] { - "javax.faces.component.NamingContainer", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Data", //$NON-NLS-1$ - "javax.faces.Table"); //$NON-NLS-1$ + "javax.faces.component.NamingContainer", + "javax.faces.component.StateHolder" }, + "javax.faces.Data", + "javax.faces.Table"); private static final ComponentTypeInfo COMPINFO_FORM = new ComponentTypeInfo( - "javax.faces.HtmlForm", //$NON-NLS-1$ - "javax.faces.component.html.HtmlForm", //$NON-NLS-1$ + "javax.faces.HtmlForm", + "javax.faces.component.html.HtmlForm", new String[] { - "javax.faces.component.UIForm", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIForm", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] { - "javax.faces.component.NamingContainer", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Form", //$NON-NLS-1$ - "javax.faces.Form"); //$NON-NLS-1$ + "javax.faces.component.NamingContainer", + "javax.faces.component.StateHolder" }, + "javax.faces.Form", + "javax.faces.Form"); private static final ComponentTypeInfo COMPINFO_GRAPHIC = new ComponentTypeInfo( - "javax.faces.HtmlGraphicImage", //$NON-NLS-1$ - "javax.faces.component.html.HtmlGraphicImage", //$NON-NLS-1$ + "javax.faces.HtmlGraphicImage", + "javax.faces.component.html.HtmlGraphicImage", new String[] { - "javax.faces.component.UIGraphic", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIGraphic", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Graphic", //$NON-NLS-1$ - "javax.faces.Image"); //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Graphic", + "javax.faces.Image"); private static final ComponentTypeInfo COMPINFO_HIDDEN = new ComponentTypeInfo( - "javax.faces.HtmlInputHidden", //$NON-NLS-1$ - "javax.faces.component.html.HtmlInputHidden", //$NON-NLS-1$ + "javax.faces.HtmlInputHidden", + "javax.faces.component.html.HtmlInputHidden", new String[] { - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Input", //$NON-NLS-1$ - "javax.faces.Hidden"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Input", + "javax.faces.Hidden"); private static final ComponentTypeInfo COMPINFO_SECRET = new ComponentTypeInfo( - "javax.faces.HtmlInputSecret", //$NON-NLS-1$ - "javax.faces.component.html.HtmlInputSecret", //$NON-NLS-1$ + "javax.faces.HtmlInputSecret", + "javax.faces.component.html.HtmlInputSecret", new String[] { - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Input", //$NON-NLS-1$ - "javax.faces.Secret"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder" }, + "javax.faces.Input", + "javax.faces.Secret"); private static final ComponentTypeInfo COMPINFO_INPUTTEXT = new ComponentTypeInfo( - "javax.faces.HtmlInputText", //$NON-NLS-1$ - "javax.faces.component.html.HtmlInputText", //$NON-NLS-1$ + "javax.faces.HtmlInputText", + "javax.faces.component.html.HtmlInputText", new String[] { - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object" }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object" }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder" }, //$NON-NLS-1$ - "javax.faces.Input", //$NON-NLS-1$ - "javax.faces.Text"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder" }, + "javax.faces.Input", + "javax.faces.Text"); private static final ComponentTypeInfo COMPINFO_INPUTTEXTAREA = new ComponentTypeInfo( - "javax.faces.HtmlInputTextarea", //$NON-NLS-1$ - "javax.faces.component.html.HtmlInputTextarea", //$NON-NLS-1$ + "javax.faces.HtmlInputTextarea", + "javax.faces.component.html.HtmlInputTextarea", new String[] { - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Input", //$NON-NLS-1$ - "javax.faces.Textarea"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Input", + "javax.faces.Textarea"); private static final ComponentTypeInfo COMPINFO_MESSAGE = new ComponentTypeInfo( - "javax.faces.HtmlMessage", //$NON-NLS-1$ - "javax.faces.component.html.HtmlMessage", //$NON-NLS-1$ + "javax.faces.HtmlMessage", + "javax.faces.component.html.HtmlMessage", new String[] { - "javax.faces.component.UIMessage", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIMessage", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Message", //$NON-NLS-1$ - "javax.faces.Message"); //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Message", + "javax.faces.Message"); private static final ComponentTypeInfo COMPINFO_MESSAGES = new ComponentTypeInfo( - "javax.faces.HtmlMessages", //$NON-NLS-1$ - "javax.faces.component.html.HtmlMessages", //$NON-NLS-1$ + "javax.faces.HtmlMessages", + "javax.faces.component.html.HtmlMessages", new String[] { - "javax.faces.component.UIMessages", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIMessages", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Messages", //$NON-NLS-1$ - "javax.faces.Messages"); //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Messages", + "javax.faces.Messages"); private static final ComponentTypeInfo COMPINFO_OUTPUTFORMAT = new ComponentTypeInfo( - "javax.faces.HtmlOutputFormat", //$NON-NLS-1$ - "javax.faces.component.html.HtmlOutputFormat", //$NON-NLS-1$ + "javax.faces.HtmlOutputFormat", + "javax.faces.component.html.HtmlOutputFormat", new String[] { - "javax.faces.component.UIOutput", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.Format"); //$NON-NLS-1$ + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Output", + "javax.faces.Format"); private static final ComponentTypeInfo COMPINFO_OUTPUTLABEL = new ComponentTypeInfo( - "javax.faces.HtmlOutputLabel", //$NON-NLS-1$ - "javax.faces.component.html.HtmlOutputLabel", //$NON-NLS-1$ + "javax.faces.HtmlOutputLabel", + "javax.faces.component.html.HtmlOutputLabel", new String[] { - "javax.faces.component.UIOutput", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.Label"); //$NON-NLS-1$ + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Output", + "javax.faces.Label"); private static final ComponentTypeInfo COMPINFO_OUTPUTLINK = new ComponentTypeInfo( - "javax.faces.HtmlOutputLink", //$NON-NLS-1$ - "javax.faces.component.html.HtmlOutputLink", //$NON-NLS-1$ + "javax.faces.HtmlOutputLink", + "javax.faces.component.html.HtmlOutputLink", new String[] { - "javax.faces.component.UIOutput", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.Link"); //$NON-NLS-1$ + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Output", + "javax.faces.Link"); private static final ComponentTypeInfo COMPINFO_OUTPUTTEXT = new ComponentTypeInfo( - "javax.faces.HtmlOutputText", //$NON-NLS-1$ - "javax.faces.component.html.HtmlOutputText", //$NON-NLS-1$ + "javax.faces.HtmlOutputText", + "javax.faces.component.html.HtmlOutputText", new String[] { - "javax.faces.component.UIOutput", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Output", //$NON-NLS-1$ - "javax.faces.Text"); //$NON-NLS-1$ + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.Output", + "javax.faces.Text"); private static final ComponentTypeInfo COMPINFO_PANELGRID = new ComponentTypeInfo( - "javax.faces.HtmlPanelGrid", //$NON-NLS-1$ - "javax.faces.component.html.HtmlPanelGrid", //$NON-NLS-1$ + "javax.faces.HtmlPanelGrid", + "javax.faces.component.html.HtmlPanelGrid", new String[] { - "javax.faces.component.UIPanel", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIPanel", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Panel", //$NON-NLS-1$ - "javax.faces.Grid"); //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Panel", + "javax.faces.Grid"); private static final ComponentTypeInfo COMPINFO_PANELGROUP = new ComponentTypeInfo( - "javax.faces.HtmlPanelGroup", //$NON-NLS-1$ - "javax.faces.component.html.HtmlPanelGroup", //$NON-NLS-1$ + "javax.faces.HtmlPanelGroup", + "javax.faces.component.html.HtmlPanelGroup", new String[] { - "javax.faces.component.UIPanel", //$NON-NLS-1$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UIPanel", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] - { "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.Panel", //$NON-NLS-1$ - "javax.faces.Group"); //$NON-NLS-1$ + { "javax.faces.component.StateHolder", }, + "javax.faces.Panel", + "javax.faces.Group"); private static final ComponentTypeInfo COMPINFO_SELECTBOOLEANCHECKBOX = new ComponentTypeInfo( - "javax.faces.HtmlSelectBooleanCheckbox", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectBooleanCheckbox", //$NON-NLS-1$ + "javax.faces.HtmlSelectBooleanCheckbox", + "javax.faces.component.html.HtmlSelectBooleanCheckbox", new String[] { - "javax.faces.component.UISelectBoolean", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectBoolean", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectBoolean", //$NON-NLS-1$ - "javax.faces.Checkbox"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectBoolean", + "javax.faces.Checkbox"); private static final ComponentTypeInfo COMPINFO_SELECTMANYCHECKBOX = new ComponentTypeInfo( - "javax.faces.HtmlSelectManyCheckbox", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectManyCheckbox", //$NON-NLS-1$ + "javax.faces.HtmlSelectManyCheckbox", + "javax.faces.component.html.HtmlSelectManyCheckbox", new String[] { - "javax.faces.component.UISelectMany", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectMany", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectMany", //$NON-NLS-1$ - "javax.faces.Checkbox"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectMany", + "javax.faces.Checkbox"); private static final ComponentTypeInfo COMPINFO_SELECTMANYLISTBOX = new ComponentTypeInfo( - "javax.faces.HtmlSelectManyListbox", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectManyListbox", //$NON-NLS-1$ + "javax.faces.HtmlSelectManyListbox", + "javax.faces.component.html.HtmlSelectManyListbox", new String[] { - "javax.faces.component.UISelectMany", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectMany", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectMany", //$NON-NLS-1$ - "javax.faces.Listbox"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectMany", + "javax.faces.Listbox"); private static final ComponentTypeInfo COMPINFO_SELECTMANYMENU = new ComponentTypeInfo( - "javax.faces.HtmlSelectManyMenu", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectManyMenu", //$NON-NLS-1$ + "javax.faces.HtmlSelectManyMenu", + "javax.faces.component.html.HtmlSelectManyMenu", new String[] { - "javax.faces.component.UISelectMany", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectMany", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectMany", //$NON-NLS-1$ - "javax.faces.Menu"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectMany", + "javax.faces.Menu"); private static final ComponentTypeInfo COMPINFO_SELECTONELISTBOX = new ComponentTypeInfo( - "javax.faces.HtmlSelectOneListbox", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectOneListbox", //$NON-NLS-1$ + "javax.faces.HtmlSelectOneListbox", + "javax.faces.component.html.HtmlSelectOneListbox", new String[] { - "javax.faces.component.UISelectOne", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectOne", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectOne", //$NON-NLS-1$ - "javax.faces.Listbox"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectOne", + "javax.faces.Listbox"); private static final ComponentTypeInfo COMPINFO_SELECTONEMENU = new ComponentTypeInfo( - "javax.faces.HtmlSelectOneMenu", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectOneMenu", //$NON-NLS-1$ + "javax.faces.HtmlSelectOneMenu", + "javax.faces.component.html.HtmlSelectOneMenu", new String[] { - "javax.faces.component.UISelectOne", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectOne", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectOne", //$NON-NLS-1$ - "javax.faces.Menu"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectOne", + "javax.faces.Menu"); private static final ComponentTypeInfo COMPINFO_SELECTONERADIO = new ComponentTypeInfo( - "javax.faces.HtmlSelectOneRadio", //$NON-NLS-1$ - "javax.faces.component.html.HtmlSelectOneRadio", //$NON-NLS-1$ + "javax.faces.HtmlSelectOneRadio", + "javax.faces.component.html.HtmlSelectOneRadio", new String[] { - "javax.faces.component.UISelectOne", //$NON-NLS-1$ - "javax.faces.component.UIInput", "javax.faces.component.UIOutput", //$NON-NLS-1$ //$NON-NLS-2$ - "javax.faces.component.UIComponentBase", //$NON-NLS-1$ - "javax.faces.component.UIComponent", "java.lang.Object", }, //$NON-NLS-1$ //$NON-NLS-2$ + "javax.faces.component.UISelectOne", + "javax.faces.component.UIInput", "javax.faces.component.UIOutput", + "javax.faces.component.UIComponentBase", + "javax.faces.component.UIComponent", "java.lang.Object", }, new String[] { - "javax.faces.component.EditableValueHolder", //$NON-NLS-1$ - "javax.faces.component.ValueHolder", //$NON-NLS-1$ - "javax.faces.component.StateHolder", }, //$NON-NLS-1$ - "javax.faces.SelectOne", //$NON-NLS-1$ - "javax.faces.Radio"); //$NON-NLS-1$ + "javax.faces.component.EditableValueHolder", + "javax.faces.component.ValueHolder", + "javax.faces.component.StateHolder", }, + "javax.faces.SelectOne", + "javax.faces.Radio"); // default converters private static final ConverterTypeInfo CONVERTERINFO_DATETIME = new ConverterTypeInfo( - "javax.faces.convert.DateTimeConverter", //$NON-NLS-1$ - "javax.faces.DateTime"); //$NON-NLS-1$ + "javax.faces.convert.DateTimeConverter", + "javax.faces.DateTime"); private static final ConverterTypeInfo CONVERTERINFO_NUMBER = new ConverterTypeInfo( - "javax.faces.convert.NumberConverter", //$NON-NLS-1$ - "javax.faces.Number"); //$NON-NLS-1$ + "javax.faces.convert.NumberConverter", + "javax.faces.Number"); // default validators private static final ValidatorTypeInfo VALIDATORINFO_DOUBLERANGE = new ValidatorTypeInfo( - "javax.faces.validator.DoubleRangeValidator", //$NON-NLS-1$ - "javax.faces.DoubleRange"); //$NON-NLS-1$ + "javax.faces.validator.DoubleRangeValidator", + "javax.faces.DoubleRange"); private static final ValidatorTypeInfo VALIDATORINFO_LENGTH = new ValidatorTypeInfo( - "javax.faces.validator.LengthValidator", //$NON-NLS-1$ - "javax.faces.Length"); //$NON-NLS-1$ + "javax.faces.validator.LengthValidator", + "javax.faces.Length"); private static final ValidatorTypeInfo VALIDATORINFO_LONGRANGE = new ValidatorTypeInfo( - "javax.faces.validator.LongRangeValidator", //$NON-NLS-1$ - "javax.faces.LongRange"); //$NON-NLS-1$ + "javax.faces.validator.LongRangeValidator", + "javax.faces.LongRange"); private static Map<TagIdentifier, TypeInfo> JSF11_ELEMENTS; private static Map<TagIdentifier, TypeInfo> JSF12_ELEMENTS; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/JSPTagResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/JSPTagResolvingStrategy.java index 8f2235db6..ad7a0f9e2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/JSPTagResolvingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/JSPTagResolvingStrategy.java @@ -26,43 +26,4 @@ public abstract class JSPTagResolvingStrategy extends public abstract ITagElement resolve(TLDElementDeclaration element); public abstract String getId(); - - public abstract String getDisplayName(); - - /** - * A descriptor for JSP tag resolving strategies - * - * @author cbateman - * - */ - public final static class StrategyDescriptor - { - private final String _id; - private final String _displayName; - - /** - * @param id - * @param displayName - */ - public StrategyDescriptor(final String id, final String displayName) - { - _id = id; - _displayName = displayName; - } - - /** - * @return the id of the strategy - */ - public String getId() - { - return _id; - } - /** - * @return the human-readable displayable name of the strategy - */ - public String getDisplayName() - { - return _displayName; - } - } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/Messages.java deleted file mode 100644 index 9d3dcee38..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/Messages.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.eclipse.jst.jsf.designtime.internal.view.model.jsp; - -import org.eclipse.osgi.util.NLS; - -/** - * NLS message getter. - * - * @author cbateman - * - */ -public class Messages extends NLS -{ - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.designtime.internal.view.model.jsp.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String UnresolvedJSPTagResolvingStrategy_1; - static - { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() - { - // no external instantiation - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDComponentTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDComponentTagElement.java index 416bc1638..4e081bd36 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDComponentTagElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDComponentTagElement.java @@ -58,6 +58,6 @@ IComponentTagElement { final String attributes = constructAttributesString(); return _componentTypeInfo.toString() + - (!"".equals(attributes) ? "\n" + attributes : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + (!"".equals(attributes) ? "\n" + attributes : ""); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDNamespace.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDNamespace.java index 043ffe7d5..b2721dbe9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDNamespace.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDNamespace.java @@ -133,7 +133,7 @@ public class TLDNamespace extends Namespace public String getDisplayName() { String displayName = _tldDoc.getDisplayName(); - if (displayName == null || "".equals(displayName.trim())) //$NON-NLS-1$ + if (displayName == null || "".equals(displayName.trim())) { displayName = getUri(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDTagElement.java index 6924dbf1b..f7ad76617 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDTagElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TLDTagElement.java @@ -66,7 +66,7 @@ public class TLDTagElement extends TagElement @Override public String toString() { - return String.format("Tag: Tag Handler: name=%s, uri=%s, tagHandlerClassName=%s\n" //$NON-NLS-1$ + return String.format("Tag: Tag Handler: name=%s, uri=%s, tagHandlerClassName=%s\n" , getName(), getUri(), getTagHandlerClassName()) + constructAttributesString(); } @@ -76,7 +76,7 @@ public class TLDTagElement extends TagElement */ protected String constructAttributesString() { - String attributes = ""; //$NON-NLS-1$ + String attributes = ""; for (final Iterator it = getAttributeHandlers().entrySet().iterator(); it.hasNext();) { @@ -84,7 +84,7 @@ public class TLDTagElement extends TagElement final String name = (String) entry.getKey(); final ITagAttributeHandler handler = (ITagAttributeHandler) entry.getValue(); - attributes += String.format("\t\t\tAttribute: name=%s, customHandler=%s, propertyName=%s, isELAllowed=%b\n", //$NON-NLS-1$ + attributes += String.format("\t\t\tAttribute: name=%s, customHandler=%s, propertyName=%s, isELAllowed=%b\n", name, handler.getCustomHandler(), handler.getName(), Boolean.valueOf(handler.isELAllowed())); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java index 6a5d97d35..6608cf650 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java @@ -36,14 +36,6 @@ public final class TagIntrospectingStrategy extends JSPTagResolvingStrategy private final IProject _project; /** - * @return the descriptor for this resolver strategy - */ - public static StrategyDescriptor createDescriptor() - { - return new StrategyDescriptor(ID, DISPLAY_NAME); - } - - /** * @param project */ public TagIntrospectingStrategy(final IProject project) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/UnresolvedJSPTagResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/UnresolvedJSPTagResolvingStrategy.java index 0a94f66b5..29accf1c7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/UnresolvedJSPTagResolvingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/UnresolvedJSPTagResolvingStrategy.java @@ -27,19 +27,11 @@ public class UnresolvedJSPTagResolvingStrategy extends JSPTagResolvingStrategy /** * the identifier of this strategy */ - public final static String ID = "org.eclipse.jst.jsf.designtime.UnresolvedJSPTagResolvingStrategy"; //$NON-NLS-1$ + public final static String ID = "org.eclipse.jst.jsf.designtime.UnresolvedJSPTagResolvingStrategy"; /** * the displayable name */ - public final static String DISPLAY_NAME = Messages.UnresolvedJSPTagResolvingStrategy_1; - - /** - * @return the descriptor for this resolver strategy - */ - public static StrategyDescriptor createDescriptor() - { - return new StrategyDescriptor(ID, DISPLAY_NAME); - } + public final static String DISPLAY_NAME = "Unresolved Tag Resolver"; @Override public String getId() diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/ServletBeanProxyContributor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/ServletBeanProxyContributor.java index 19951a9a8..7baa4a0fd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/ServletBeanProxyContributor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/ServletBeanProxyContributor.java @@ -39,7 +39,7 @@ class ServletBeanProxyContributor extends ConfigurationContributorAdapter _jsfVersion = getProjectVersion(project); if (_jsfVersion == null) { - throw new IllegalArgumentException("jsfVersion must not be null"); //$NON-NLS-1$ + throw new IllegalArgumentException("jsfVersion must not be null"); } } @@ -51,12 +51,12 @@ class ServletBeanProxyContributor extends ConfigurationContributorAdapter { if (_jsfVersion != JSFVersion.V1_2) { - final Bundle servletBundle = Platform.getBundle("javax.servlet"); //$NON-NLS-1$ + final Bundle servletBundle = Platform.getBundle("javax.servlet"); controller.contributeClasspath(servletBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true); - final Bundle jspBundle = Platform.getBundle("javax.servlet.jsp"); //$NON-NLS-1$ + final Bundle jspBundle = Platform.getBundle("javax.servlet.jsp"); controller.contributeClasspath(jspBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true); @@ -65,10 +65,10 @@ class ServletBeanProxyContributor extends ConfigurationContributorAdapter { final Bundle coreBundle = JSFCorePlugin.getDefault().getBundle(); final IJavaProject javaProject = JavaCore.create(_project); - maybeAddJar(controller, "javax.servlet.jsp.tagext.JspIdConsumer", //$NON-NLS-1$ - javaProject, coreBundle, "/jars/fake_jsp_21.jar"); //$NON-NLS-1$ - maybeAddJar(controller, "javax.el.ELException", javaProject, //$NON-NLS-1$ - coreBundle, "/jars/fake_el.jar"); //$NON-NLS-1$ + maybeAddJar(controller, "javax.servlet.jsp.tagext.JspIdConsumer", + javaProject, coreBundle, "/jars/fake_jsp_21.jar"); + maybeAddJar(controller, "javax.el.ELException", javaProject, + coreBundle, "/jars/fake_el.jar"); } } @@ -103,25 +103,25 @@ class ServletBeanProxyContributor extends ConfigurationContributorAdapter { try { - if (FacetedProjectFramework.hasProjectFacet(project, "jst.jsf", //$NON-NLS-1$ - "1.0")) //$NON-NLS-1$ + if (FacetedProjectFramework.hasProjectFacet(project, "jst.jsf", + "1.0")) { return JSFVersion.V1_0; } else if (FacetedProjectFramework.hasProjectFacet(project, - "jst.jsf", "1.1")) //$NON-NLS-1$ //$NON-NLS-2$ + "jst.jsf", "1.1")) { return JSFVersion.V1_1; } else if (FacetedProjectFramework.hasProjectFacet(project, - "jst.jsf", "1.2")) //$NON-NLS-1$ //$NON-NLS-2$ + "jst.jsf", "1.2")) { return JSFVersion.V1_2; } } catch (final CoreException e) { - JSFCorePlugin.log("checking project version", e); //$NON-NLS-1$ + JSFCorePlugin.log("checking project version", e); // fall-through } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/TagAnalyzer.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/TagAnalyzer.java index ea1f16793..468907c71 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/TagAnalyzer.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/analyzer/TagAnalyzer.java @@ -58,17 +58,17 @@ import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElement */ public final class TagAnalyzer { - private static final String JAVAX_FACES_WEBAPP_CONVERTER_TAG = "javax.faces.webapp.ConverterTag"; //$NON-NLS-1$ - private static final String JAVAX_FACES_WEBAPP_CONVERTER_ELTAG = "javax.faces.webapp.ConverterELTag"; //$NON-NLS-1$ - private static final String JAVAX_FACES_WEBAPP_VALIDATOR_TAG = "javax.faces.webapp.ValidatorTag"; //$NON-NLS-1$ - private static final String JAVAX_FACES_WEBAPP_VALIDATOR_ELTAG = "javax.faces.webapp.ValidatorELTag"; //$NON-NLS-1$ - private static final String JAVAX_FACES_WEBAPP_FACET_TAG = "javax.faces.webapp.FacetTag"; //$NON-NLS-1$ + private static final String JAVAX_FACES_WEBAPP_CONVERTER_TAG = "javax.faces.webapp.ConverterTag"; + private static final String JAVAX_FACES_WEBAPP_CONVERTER_ELTAG = "javax.faces.webapp.ConverterELTag"; + private static final String JAVAX_FACES_WEBAPP_VALIDATOR_TAG = "javax.faces.webapp.ValidatorTag"; + private static final String JAVAX_FACES_WEBAPP_VALIDATOR_ELTAG = "javax.faces.webapp.ValidatorELTag"; + private static final String JAVAX_FACES_WEBAPP_FACET_TAG = "javax.faces.webapp.FacetTag"; // private static final String JAVAX_FACES_WEBAPP_ACTIONLISTENER_TAG = // "javax.faces.webapp.ActionListenerTag"; // private static final String JAVAX_FACES_WEBAPP_VALUECHANGELISTENER_TAG = // "javax.faces.webapp.ValueChangeListenerTag"; - private static final String JAVAX_FACES_WEBAPP_ATTRIBUTE_TAG = "javax.faces.webapp.AttributeTag"; //$NON-NLS-1$ + private static final String JAVAX_FACES_WEBAPP_ATTRIBUTE_TAG = "javax.faces.webapp.AttributeTag"; private final static Set<String> COMPONENT_TAG_HANDLER_TYPES_JSF11; private final static Set<String> COMPONENT_TAG_HANDLER_TYPES_JSF12; @@ -98,15 +98,15 @@ public final class TagAnalyzer // components // JSF 1.1 Set<String> set = new HashSet<String>(8); - set.add("javax.faces.webapp.UIComponentTag"); //$NON-NLS-1$ - set.add("javax.faces.webapp.UIComponentBodyTag"); //$NON-NLS-1$ + set.add("javax.faces.webapp.UIComponentTag"); + set.add("javax.faces.webapp.UIComponentBodyTag"); COMPONENT_TAG_HANDLER_TYPES_JSF11 = Collections.unmodifiableSet(set); // JSF 1.2 set = new HashSet<String>(8); - set.add("javax.faces.webapp.UIComponentTag"); //$NON-NLS-1$ - set.add("javax.faces.webapp.UIComponentBodyTag"); //$NON-NLS-1$ - set.add("javax.faces.webapp.UIComponentELTag"); //$NON-NLS-1$ + set.add("javax.faces.webapp.UIComponentTag"); + set.add("javax.faces.webapp.UIComponentBodyTag"); + set.add("javax.faces.webapp.UIComponentELTag"); COMPONENT_TAG_HANDLER_TYPES_JSF12 = Collections.unmodifiableSet(set); // converters @@ -144,43 +144,32 @@ public final class TagAnalyzer final IConfigurationContributor[] contributor = new IConfigurationContributor[] { new ServletBeanProxyContributor(project) }; + final ProxyFactoryRegistry registry = getProxyFactoryRegistry( + contributor, project); - ProxyFactoryRegistry registry = null; - try + if (registry != null) { - registry = getProxyFactoryRegistry(contributor, project); - - if (registry != null) - { + final IStandardBeanTypeProxyFactory factory = registry + .getBeanTypeProxyFactory(); + final IBeanTypeProxy classTypeProxy = factory + .getBeanTypeProxy(className); + final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper( + classTypeProxy); - final IStandardBeanTypeProxyFactory factory = registry - .getBeanTypeProxyFactory(); - final IBeanTypeProxy classTypeProxy = factory - .getBeanTypeProxy(className); - final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper(project, - classTypeProxy); - - try - { - classTypeWrapper.init(); - return classTypeWrapper.callStringMethod("getComponentType"); //$NON-NLS-1$ - } - catch (final ProxyException tp) - { - if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) - { - JSFCoreTraceOptions.log("TagAnalyzer.findComponentType", tp); //$NON-NLS-1$ - } - } + try + { + classTypeWrapper.init(); + return classTypeWrapper.callStringMethod("getComponentType"); } - } - finally - { - if (registry != null) + catch (final ProxyException tp) { - registry.terminateRegistry(true); + if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) + { + JSFCoreTraceOptions.log("TagAnalyzer.findComponentType", tp); + } } } + return null; } @@ -204,82 +193,72 @@ public final class TagAnalyzer // based on the doStartTag method. They also don't provide a standard // interface for acquiring the id so instead we make some guess on // the internal field name. - ProxyFactoryRegistry registry = null; - try + final String className = tldDecl.getTagclass(); + + final IConfigurationContributor[] contributor = new IConfigurationContributor[] + { new ServletBeanProxyContributor(project) }; + final ProxyFactoryRegistry registry = getProxyFactoryRegistry( + contributor, project); + + if (registry != null) { - final String className = tldDecl.getTagclass(); - - final IConfigurationContributor[] contributor = new IConfigurationContributor[] - { new ServletBeanProxyContributor(project) }; - registry = getProxyFactoryRegistry( - contributor, project); - - if (registry != null) + final IStandardBeanTypeProxyFactory factory = registry + .getBeanTypeProxyFactory(); + final IBeanTypeProxy classTypeProxy = factory + .getBeanTypeProxy(className); + + try { - final IStandardBeanTypeProxyFactory factory = registry - .getBeanTypeProxyFactory(); - final IBeanTypeProxy classTypeProxy = factory - .getBeanTypeProxy(className); - - try + final IType type = JavaCore.create(project).findType(className); + + if (type != null + && DTComponentIntrospector + .isTypeNameInstanceOfClass( + type, + Collections + .singleton(JAVAX_FACES_WEBAPP_CONVERTER_ELTAG))) { - final IType type = JavaCore.create(project).findType(className); - - if (type != null - && DTComponentIntrospector - .isTypeNameInstanceOfClass( - type, - Collections - .singleton(JAVAX_FACES_WEBAPP_CONVERTER_ELTAG))) - { - return findConverterType_InELTag(factory, classTypeProxy,project); - } - // the assumption is that this is a component tag, so we assume - // it is one. - else if (type != null - && DTComponentIntrospector - .isTypeNameInstanceOfClass( - type, - Collections - .singleton(JAVAX_FACES_WEBAPP_CONVERTER_TAG))) - { - return findConverterType_InTag(factory, classTypeProxy, project); - } + return findConverterType_InELTag(factory, classTypeProxy); } - catch (final JavaModelException jme) + // the assumption is that this is a component tag, so we assume + // it is one. + else if (type != null + && DTComponentIntrospector + .isTypeNameInstanceOfClass( + type, + Collections + .singleton(JAVAX_FACES_WEBAPP_CONVERTER_TAG))) { - // suppress for now + return findConverterType_InTag(factory, classTypeProxy); } } - } - finally - { - if (registry != null) + catch (final JavaModelException jme) { - registry.terminateRegistry(true); + // suppress for now } } + return null; } private static String findConverterType_InTag( final IStandardBeanTypeProxyFactory factory, - final IBeanTypeProxy classTypeProxy, final IProject project) + final IBeanTypeProxy classTypeProxy) { final IBeanTypeProxy nullPageContextType = factory - .getBeanTypeProxy("javax.servlet.jsp.PageContext"); //$NON-NLS-1$ - final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper(project, + .getBeanTypeProxy("javax.servlet.jsp.PageContext"); + final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper( classTypeProxy); try { classTypeWrapper.init(); - callSuppressExceptions(classTypeWrapper, "setPageContext", //$NON-NLS-1$ + callSuppressExceptions(classTypeWrapper, "setPageContext", new IBeanProxy[] { null }, new IBeanTypeProxy[] { nullPageContextType }); - callSuppressExceptions(classTypeWrapper, "doStartTag"); //$NON-NLS-1$ + callSuppressExceptions(classTypeWrapper, "doStartTag"); final IBeanTypeProxy converterProxy = factory .getBeanTypeProxy(JAVAX_FACES_WEBAPP_CONVERTER_TAG); @@ -288,7 +267,7 @@ public final class TagAnalyzer // failed. // now try to guess what it's called String converterId = getStringField(classTypeWrapper, - converterProxy, "converterId"); //$NON-NLS-1$ + converterProxy, "converterId"); if (converterId != null) { @@ -296,7 +275,7 @@ public final class TagAnalyzer } converterId = getStringField(classTypeWrapper, converterProxy, - "_converterId"); //$NON-NLS-1$ + "_converterId"); if (converterId != null) { @@ -305,7 +284,7 @@ public final class TagAnalyzer // no? look for a CONVERTER_ID converterId = getStringField(classTypeWrapper, classTypeProxy, - "CONVERTER_ID"); //$NON-NLS-1$ + "CONVERTER_ID"); } catch (final ProxyException tp) { @@ -316,12 +295,12 @@ public final class TagAnalyzer private static String findConverterType_InELTag( final IStandardBeanTypeProxyFactory factory, - final IBeanTypeProxy classTypeProxy, final IProject project) + final IBeanTypeProxy classTypeProxy) { - final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper(project, + final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper( classTypeProxy); final IBeanTypeProxy elExpressionType = factory - .getBeanTypeProxy("javax.el.ValueExpression"); //$NON-NLS-1$ + .getBeanTypeProxy("javax.el.ValueExpression"); if (elExpressionType == null) { @@ -332,20 +311,20 @@ public final class TagAnalyzer { classTypeWrapper.init(); - callSuppressExceptions(classTypeWrapper, "doStartTag"); //$NON-NLS-1$ + callSuppressExceptions(classTypeWrapper, "doStartTag"); // no? look for a CONVERTER_ID final IBeanProxy converterId = getFieldInParents(classTypeWrapper, - classTypeProxy, "CONVERTER_ID_EXPR"); //$NON-NLS-1$ + classTypeProxy, "CONVERTER_ID_EXPR"); if (converterId != null) { converterId.getTypeProxy().isKindOf(elExpressionType); - final BeanProxyWrapper elExprValue = new BeanProxyWrapper(project, + final BeanProxyWrapper elExprValue = new BeanProxyWrapper( converterId.getTypeProxy()); final String value = elExprValue - .callStringMethod("getExpressionString"); //$NON-NLS-1$ - System.out.println("Expression string:" + value); //$NON-NLS-1$ + .callStringMethod("getExpressionString"); + System.out.println("Expression string:" + value); } // @@ -382,71 +361,60 @@ public final class TagAnalyzer final IConfigurationContributor[] contributor = new IConfigurationContributor[] { new ServletBeanProxyContributor(project) }; + final ProxyFactoryRegistry registry = getProxyFactoryRegistry( + contributor, project); - ProxyFactoryRegistry registry = null; - - try + if (registry != null) { - registry = getProxyFactoryRegistry(contributor, project); - - if (registry != null) + final IStandardBeanTypeProxyFactory factory = registry + .getBeanTypeProxyFactory(); + final IBeanTypeProxy classTypeProxy = factory + .getBeanTypeProxy(className); + final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper( + classTypeProxy); + final IBeanTypeProxy converterProxy = factory + .getBeanTypeProxy(JAVAX_FACES_WEBAPP_VALIDATOR_TAG); + try { - final IStandardBeanTypeProxyFactory factory = registry - .getBeanTypeProxyFactory(); - final IBeanTypeProxy classTypeProxy = factory - .getBeanTypeProxy(className); - final BeanProxyWrapper classTypeWrapper = new BeanProxyWrapper(project, - classTypeProxy); - final IBeanTypeProxy converterProxy = factory - .getBeanTypeProxy(JAVAX_FACES_WEBAPP_VALIDATOR_TAG); - try + classTypeWrapper.init(); + + callSuppressExceptions(classTypeWrapper, "doStartTag"); + callSuppressExceptions(classTypeWrapper, "createValidator"); + + // hopefully doStartTag set the converter field before it + // failed. + // now try to guess what it's called + String validatorId = getStringField(classTypeWrapper, + converterProxy, "validatorId"); + + if (validatorId != null) { - classTypeWrapper.init(); - - callSuppressExceptions(classTypeWrapper, "doStartTag"); //$NON-NLS-1$ - callSuppressExceptions(classTypeWrapper, "createValidator"); //$NON-NLS-1$ - - // hopefully doStartTag set the converter field before it - // failed. - // now try to guess what it's called - String validatorId = getStringField(classTypeWrapper, - converterProxy, "validatorId"); //$NON-NLS-1$ - - if (validatorId != null) - { - return validatorId; - } - - validatorId = getStringField(classTypeWrapper, converterProxy, - "_validatorId"); //$NON-NLS-1$ - - if (validatorId != null) - { - return validatorId; - } - - // no? then see if there's a VALIDATOR_ID field *on the tag* - validatorId = getStringField(classTypeWrapper, classTypeProxy, - "VALIDATOR_ID"); //$NON-NLS-1$ - - if (validatorId != null) - { - return validatorId; - } + return validatorId; } - catch (final ProxyException tp) + + validatorId = getStringField(classTypeWrapper, converterProxy, + "_validatorId"); + + if (validatorId != null) { - // fall through + return validatorId; + } + + // no? then see if there's a VALIDATOR_ID field *on the tag* + validatorId = getStringField(classTypeWrapper, classTypeProxy, + "VALIDATOR_ID"); + + if (validatorId != null) + { + return validatorId; } } - } - finally - { - if (registry != null) + catch (final ProxyException tp) { - registry.terminateRegistry(true); + // fall through } } + return null; } @@ -534,7 +502,7 @@ public final class TagAnalyzer } catch (final CoreException e) { - JSFCorePlugin.log("Error starting vm for project: " //$NON-NLS-1$ + JSFCorePlugin.log("Error starting vm for project: " + project.getName(), e); } @@ -554,7 +522,7 @@ public final class TagAnalyzer JSFCoreTraceOptions .log(String .format( - "TagAnalyzer.createTLDTagElement: Start tld=%s, project=%s", //$NON-NLS-1$ + "TagAnalyzer.createTLDTagElement: Start tld=%s, project=%s", tldDecl.getNodeName(), project.getName())); } long startTime = 0; @@ -574,7 +542,7 @@ public final class TagAnalyzer JavaCore.VERSION_1_3).getSeverity() == IStatus.ERROR) { JSFCorePlugin.log( - "Bad tag class name in " + tldDecl.toString(), //$NON-NLS-1$ + "Bad tag class name in " + tldDecl.toString(), new Throwable()); return null; } @@ -585,7 +553,7 @@ public final class TagAnalyzer { if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) { - JSFCoreTraceOptions.log("Type not found for: "+typeName); //$NON-NLS-1$ + JSFCoreTraceOptions.log("Type not found for: "+typeName); } return null; } @@ -594,7 +562,7 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) { JSFCoreTraceOptions.log(String.format( - "Tag class type=%s\nTag type=%s", type, tagType)); //$NON-NLS-1$ + "Tag class type=%s\nTag type=%s", type, tagType)); } if (tagType == TagType.COMPONENT) @@ -604,9 +572,9 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR_PERF) { String name = element != null ? element.toString() - : "<none>"; //$NON-NLS-1$ + : "<none>"; System.out.printf( - "Time to create component tag element %s was %d\n", //$NON-NLS-1$ + "Time to create component tag element %s was %d\n", name, Long.valueOf(System.nanoTime() - startTime)); } return element; @@ -617,9 +585,9 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR_PERF) { String name = element != null ? element.toString() - : "<none>"; //$NON-NLS-1$ + : "<none>"; System.out.printf( - "Time to create converter tag element %s was %d\n", //$NON-NLS-1$ + "Time to create converter tag element %s was %d\n", name, Long.valueOf(System.nanoTime() - startTime)); } return element; @@ -630,9 +598,9 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR_PERF) { String name = element != null ? element.toString() - : "<none>"; //$NON-NLS-1$ + : "<none>"; System.out.printf( - "Time to create validator tag element %s was %d\n", //$NON-NLS-1$ + "Time to create validator tag element %s was %d\n", name, Long.valueOf(System.nanoTime() - startTime)); } return element; @@ -643,9 +611,9 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR_PERF) { String name = element != null ? element.toString() - : "<none>"; //$NON-NLS-1$ + : "<none>"; System.out.printf( - "Time to create handler tag element %s was %d\n", //$NON-NLS-1$ + "Time to create handler tag element %s was %d\n", name, Long.valueOf(System.nanoTime() - startTime)); } return element; @@ -653,7 +621,7 @@ public final class TagAnalyzer } catch (final JavaModelException jme) { - JSFCorePlugin.log(jme, "Trying to get type for TLD"); //$NON-NLS-1$ + JSFCorePlugin.log(jme, "Trying to get type for TLD"); } return null; @@ -674,7 +642,7 @@ public final class TagAnalyzer final String componentClass = DTComponentIntrospector .findComponentClass(componentType, project); - if (componentClass != null && !"".equals(componentClass.trim())) //$NON-NLS-1$ + if (componentClass != null && !"".equals(componentClass.trim())) { final ComponentTypeInfo typeInfo = DTComponentIntrospector .getComponent(componentType, componentClass, project, @@ -709,7 +677,7 @@ public final class TagAnalyzer final String converterClass = DTComponentIntrospector .findConverterClass(converterId, project); - if (converterClass != null && !"".equals(converterClass.trim())) //$NON-NLS-1$ + if (converterClass != null && !"".equals(converterClass.trim())) { final ConverterTypeInfo typeInfo = DTComponentIntrospector .getConverter(converterId, converterClass); @@ -739,7 +707,7 @@ public final class TagAnalyzer final String validatorClass = DTComponentIntrospector .findValidatorClass(validatorId, project); - if (validatorClass != null && !"".equals(validatorClass.trim())) //$NON-NLS-1$ + if (validatorClass != null && !"".equals(validatorClass.trim())) { final ValidatorTypeInfo typeInfo = DTComponentIntrospector .getValidator(validatorId, validatorClass); @@ -798,7 +766,7 @@ public final class TagAnalyzer JSFCoreTraceOptions .log(String .format( - "TagAnalyzer.getJSFComponentTagType: Determining Tag Type for type %s on project %s", //$NON-NLS-1$ + "TagAnalyzer.getJSFComponentTagType: Determining Tag Type for type %s on project %s", type.getFullyQualifiedName(), project .toString())); } @@ -852,8 +820,8 @@ public final class TagAnalyzer if (JSFCoreTraceOptions.TRACE_JSPTAGINTROSPECTOR) { JSFCoreTraceOptions.log(String.format( - "TagAnalyzer.getJSFComponentTagType: tag type is %s", //$NON-NLS-1$ - tagType != null ? tagType.toString() : "null")); //$NON-NLS-1$ + "TagAnalyzer.getJSFComponentTagType: tag type is %s", + tagType != null ? tagType.toString() : "null")); } return tagType; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/messages.properties deleted file mode 100644 index 15bf8c5b3..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/messages.properties +++ /dev/null @@ -1 +0,0 @@ -UnresolvedJSPTagResolvingStrategy_1=Unresolved Tag Resolver diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/MasterIndex.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/MasterIndex.java index fd6415474..d9856995c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/MasterIndex.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/MasterIndex.java @@ -63,7 +63,7 @@ class MasterIndex implements Serializable { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("MasterIndex.create, version=:" //$NON-NLS-1$ + JSFCoreTraceOptions.log("MasterIndex.create, version=:" + version.toString()); } @@ -81,7 +81,7 @@ class MasterIndex implements Serializable { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Trying to save master index file: " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Trying to save master index file: " + file.getAbsolutePath()); } @@ -92,7 +92,7 @@ class MasterIndex implements Serializable if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions - .log("Master index file written successfully: " //$NON-NLS-1$ + .log("Master index file written successfully: " + file.getAbsolutePath()); } } @@ -114,7 +114,7 @@ class MasterIndex implements Serializable { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Trying to load master index file: " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Trying to load master index file: " + _storageFile.getAbsolutePath()); } @@ -127,9 +127,9 @@ class MasterIndex implements Serializable if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions - .log("Loaded master index file successfully:" //$NON-NLS-1$ + .log("Loaded master index file successfully:" + _storageFile.getAbsolutePath()); - JSFCoreTraceOptions.log("Initial contents: "); //$NON-NLS-1$ + JSFCoreTraceOptions.log("Initial contents: "); System.out.println(index.toString()); } } @@ -146,11 +146,11 @@ class MasterIndex implements Serializable { StringBuffer buffer = new StringBuffer(); - buffer.append(String.format("Header: %s\n\n", _header.toString())); //$NON-NLS-1$ + buffer.append(String.format("Header: %s\n\n", _header.toString())); for (final ProjectIndex projIndex : _projectIndices) { - buffer.append(String.format("\t%s\n", projIndex.toString())); //$NON-NLS-1$ + buffer.append(String.format("\t%s\n", projIndex.toString())); } return buffer.toString(); @@ -176,8 +176,8 @@ class MasterIndex implements Serializable catch (IOException ioe) { JSFCorePlugin.log(ioe, - "Failed to save master index. Project Index for " //$NON-NLS-1$ - + project.toString() + " may not be saved"); //$NON-NLS-1$ + "Failed to save master index. Project Index for " + + project.toString() + " may not be saved"); } return index; } @@ -190,7 +190,7 @@ class MasterIndex implements Serializable _projectIndices.remove(index); if (!index.remove()) { - throw new IOException("Failed to remove index file"); //$NON-NLS-1$ + throw new IOException("Failed to remove index file"); } } } @@ -255,7 +255,7 @@ class MasterIndex implements Serializable public String toString() { - return "Version: " + _version.toString(); //$NON-NLS-1$ + return "Version: " + _version.toString(); } } @@ -336,7 +336,7 @@ class MasterIndex implements Serializable { final long uniqueCode = Math .round((Math.random() * Integer.MAX_VALUE)); - final String fileName = String.format("Project_%s_%x.idx", //$NON-NLS-1$ + final String fileName = String.format("Project_%s_%x.idx", _projectName, Long.valueOf(uniqueCode)); _file = new File(new Path(_relativePath).append(fileName) .toOSString()); @@ -391,9 +391,9 @@ class MasterIndex implements Serializable public String toString() { - return "project= " + _projectName + ", relativePath=" //$NON-NLS-1$ //$NON-NLS-2$ - + _relativePath + ", lastModified=" //$NON-NLS-1$ - + _lastModStampOnProject + ", saveFile=" + _file; //$NON-NLS-1$ + return "project= " + _projectName + ", relativePath=" + + _relativePath + ", lastModified=" + + _lastModStampOnProject + ", saveFile=" + _file; } // public synchronized void save() diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java index 6c95f0274..a1eebbe38 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java @@ -49,14 +49,6 @@ public class PersistedDataTagStrategy extends JSPTagResolvingStrategy false); /** - * @return the descriptor for this resolver strategy - */ - public static StrategyDescriptor createDescriptor() - { - return new StrategyDescriptor(ID, DISPLAY_NAME); - } - - /** * @param project */ public PersistedDataTagStrategy(final IProject project) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/TagRepository.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/TagRepository.java index 0d15744f8..df457f820 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/TagRepository.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/TagRepository.java @@ -30,8 +30,8 @@ class TagRepository { private final static Object GLOBAL_MASTER_INDEX_LOCK = new Object(); private static MasterIndex GLOBAL_MASTER_INDEX; - private final static String PATH_TO_REPOSITORY = "/.jsptagregistry"; //$NON-NLS-1$ - private final static String MASTER_INDEX_FILE_NAME = "tagRegistryMasterIndex.idx"; //$NON-NLS-1$ + private final static String PATH_TO_REPOSITORY = "/.jsptagregistry"; + private final static String MASTER_INDEX_FILE_NAME = "tagRegistryMasterIndex.idx"; private final IProject _project; //private Map<String, SerializableTLDNamespace> _namespaces; @@ -46,7 +46,7 @@ class TagRepository { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Loading tag repository for: " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Loading tag repository for: " + _project.toString()); } @@ -57,17 +57,17 @@ class TagRepository if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Contents of repo for: " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Contents of repo for: " + _project.toString()); for (final Map.Entry<String, SerializableTLDNamespace> nsEntry : namespaces.entrySet()) { - JSFCoreTraceOptions.log("\tNamespace: "+nsEntry.getKey()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("\tNamespace: "+nsEntry.getKey()); SerializableTLDNamespace ns = nsEntry.getValue(); for (final ITagElement element : ns.getViewElements()) { - JSFCoreTraceOptions.log("\t\tTag: "+element.toString()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("\t\tTag: "+element.toString()); } } } @@ -103,7 +103,7 @@ class TagRepository if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions - .log("GLOBAL_MASTER_INDEX already exists for: " //$NON-NLS-1$ + .log("GLOBAL_MASTER_INDEX already exists for: " + _project.toString()); } return GLOBAL_MASTER_INDEX; @@ -124,12 +124,12 @@ class TagRepository if (!masterIndexFile.createNewFile()) { throw new IOException( - "Could not create new master index file: " //$NON-NLS-1$ + "Could not create new master index file: " + masterIndexFile.toString()); } if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Creating master index file for " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Creating master index file for " + _project.toString()); } index.create(new SerializableVersion(1, 0, 0)); @@ -138,7 +138,7 @@ class TagRepository { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Loading master index file for " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Loading master index file for " + _project.toString()); } index.load(new SerializableVersion(1, 0, 0)); @@ -153,13 +153,13 @@ class TagRepository { if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { - JSFCoreTraceOptions.log("Creating repo directory: " //$NON-NLS-1$ + JSFCoreTraceOptions.log("Creating repo directory: " + repoDir.getAbsolutePath()); } if (!repoDir.mkdir()) { - throw new IOException("Failed to create repo directory: " //$NON-NLS-1$ + throw new IOException("Failed to create repo directory: " + repoDir.getAbsolutePath()); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/LibraryOperation.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/LibraryOperation.java index 403fea914..31cfeb078 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/LibraryOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/LibraryOperation.java @@ -37,7 +37,7 @@ abstract class LibraryOperation implements Runnable catch (final Exception e) { _result = new Status(IStatus.ERROR, JSFCorePlugin.PLUGIN_ID, - "Problem during run", e); //$NON-NLS-1$ + "Problem during run", e); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryManager.java index e3463d033..094dff0de 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryManager.java @@ -22,7 +22,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.JSFCoreTraceOptions; -import org.eclipse.jst.jsf.designtime.internal.Messages; import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry; import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory; @@ -50,7 +49,7 @@ public final class TLDRegistryManager extends if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { JSFCoreTraceOptions - .log("TLDRegistryManager: Initializing TLDRegistryManager singleton"); //$NON-NLS-1$ + .log("TLDRegistryManager: Initializing TLDRegistryManager singleton"); } INSTANCE = new TLDRegistryManager(); } @@ -70,7 +69,7 @@ public final class TLDRegistryManager extends } catch (CoreException e) { - JSFCorePlugin.log(e, "TLDRegistryManager failed to install save participant"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "TLDRegistryManager failed to install save participant"); } } @@ -80,7 +79,7 @@ public final class TLDRegistryManager extends if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { JSFCoreTraceOptions - .log("TLDRegistryManager: creating new instance for " //$NON-NLS-1$ + .log("TLDRegistryManager: creating new instance for " + project.toString()); } @@ -93,7 +92,7 @@ public final class TLDRegistryManager extends if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { JSFCoreTraceOptions - .log("TLDRegistryManager: Acquired instance for " //$NON-NLS-1$ + .log("TLDRegistryManager: Acquired instance for " + resource.toString()); } } @@ -103,7 +102,7 @@ public final class TLDRegistryManager extends { if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { - JSFCoreTraceOptions.log("TLDRegistryManager: Getting registry for " //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDRegistryManager: Getting registry for " + resource.toString()); } } @@ -130,16 +129,11 @@ public final class TLDRegistryManager extends } } - @Override - public boolean isInstance(IProject project) - { - return getGlobalManager().isInstance(project); - } - public String getDisplayName() { - return Messages.TLDRegistryManager_DisplayName; + return "JSP Registry Factory"; } + } private class MyWorkspaceSaveParticipant implements ISaveParticipant @@ -148,7 +142,7 @@ public final class TLDRegistryManager extends { if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { - JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saving: Kind="+context.getKind()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saving: Kind="+context.getKind()); } try { @@ -171,7 +165,7 @@ public final class TLDRegistryManager extends catch (ManagedObjectException moe) { throw new CoreException(new Status(IStatus.ERROR, - JSFCorePlugin.PLUGIN_ID, "Couldn't commit workspace", //$NON-NLS-1$ + JSFCorePlugin.PLUGIN_ID, "Couldn't commit workspace", moe)); } } @@ -181,7 +175,7 @@ public final class TLDRegistryManager extends { if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { - JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saveProject: Project="+project.toString()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saveProject: Project="+project.toString()); } // check that there is already instance -- don't do anything if there @@ -192,7 +186,7 @@ public final class TLDRegistryManager extends .getInstance(project); if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { - JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saveProject: calling checkpoint on registry: "+registry.toString()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("MyWorkspaceSaveParticipant.saveProject: calling checkpoint on registry: "+registry.toString()); } registry.checkpoint(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryPreferences.java index 593597ea7..aa0ed8f58 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryPreferences.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDRegistryPreferences.java @@ -12,66 +12,44 @@ package org.eclipse.jst.jsf.designtime.internal.view.model.jsp.registry; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jst.jsf.common.internal.policy.OrderedListProvider; import org.eclipse.jst.jsf.common.internal.policy.OrderedListProvider.OrderableObject; -import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.DefaultJSPTagResolver; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.TagIntrospectingStrategy; -import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.JSPTagResolvingStrategy.StrategyDescriptor; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.persistence.PersistedDataTagStrategy; /** - * Preferences model for the TLD registry. This class is not thread-safe and - * a single instance should only be used by one owner. + * Preferences model for the TLD registry * * @author cbateman * */ public class TLDRegistryPreferences { - private final static Map<String, StrategyDescriptor> ALL_KNOWN_STRATEGIES; - private final IPreferenceStore _prefStore; - private final CopyOnWriteArrayList<PropertyListener> _listeners; - private final AtomicBoolean _isDisposed = new AtomicBoolean(false); - private final static String KEY_STRATEGY_ID_ORDER = "org.eclipse.jst.jsf.designtime.jsp.registry.StrategyIDOrder"; //$NON-NLS-1$ + private final static String KEY_STRATEGY_ID_ORDER = "org.eclipse.jst.jsf.designtime.jsp.registry.StrategyIDOrder"; private final static List<OrderableObject> DEFAULT_STRATEGY_ORDER; static { final List<OrderableObject> list = new ArrayList<OrderableObject>(); - - // NOTE !!! this ordering is important and effects the default order - // in which strategies will be consulted !!! - list.add(new OrderableObject(new StrategyIdentifier(PersistedDataTagStrategy.createDescriptor()), true)); - list.add(new OrderableObject(new StrategyIdentifier(DefaultJSPTagResolver.createDescriptor()), true)); - list.add(new OrderableObject(new StrategyIdentifier(TagIntrospectingStrategy.createDescriptor()), true)); + list.add(new OrderableObject(new StrategyIdentifier(PersistedDataTagStrategy.DISPLAY_NAME, + PersistedDataTagStrategy.ID), true)); + list.add(new OrderableObject(new StrategyIdentifier(DefaultJSPTagResolver.DISPLAY_NAME, + DefaultJSPTagResolver.ID), true)); + list.add(new OrderableObject(new StrategyIdentifier(TagIntrospectingStrategy.DISPLAY_NAME, + TagIntrospectingStrategy.ID), true)); + // list.add(UnresolvedJSPTagResolvingStrategy.ID); DEFAULT_STRATEGY_ORDER = Collections.unmodifiableList(list); - - - final Map<String, StrategyDescriptor> knownDescriptors = new HashMap<String, StrategyDescriptor>(); - for (final OrderableObject object : DEFAULT_STRATEGY_ORDER) - { - StrategyIdentifier strategyId = (StrategyIdentifier) object.getObject(); - knownDescriptors.put(strategyId.getId(), strategyId._descriptor); - } - ALL_KNOWN_STRATEGIES = Collections.unmodifiableMap(knownDescriptors); } private List<OrderableObject> _ids; private List<OrderableObject> _originalIds; - private IPropertyChangeListener _propertyListener; /** * Constructor @@ -82,86 +60,6 @@ public class TLDRegistryPreferences { _prefStore = prefStore; _ids = new ArrayList<OrderableObject>(); - _listeners = new CopyOnWriteArrayList<PropertyListener>(); - } - - /** - * Dispose of this preferences object - */ - public void dispose() - { - if (_isDisposed.compareAndSet(false, true)) - { - if (_propertyListener != null) - { - _prefStore.removePropertyChangeListener(_propertyListener); - } - } - } - - void addListener(final PropertyListener propListener) - { - if (!assertNotDisposed()) - { - return; - } - - if (_propertyListener == null) - { - _propertyListener = new IPropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent event) - { - if (KEY_STRATEGY_ID_ORDER.equals(event.getProperty())) - { - fireStrategyOrderChanged(); - } - } - }; - - _prefStore.addPropertyChangeListener(_propertyListener); - } - _listeners.addIfAbsent(propListener); - } - - void removeListener(final PropertyListener propListener) - { - if (!assertNotDisposed()) - { - return; - } - _listeners.remove(propListener); - - if (_listeners.isEmpty()) - { - _prefStore.removePropertyChangeListener(_propertyListener); - _propertyListener = null; - } - } - - private void fireStrategyOrderChanged() - { - if (!assertNotDisposed()) - { - return; - } - for (final PropertyListener listener : _listeners) - { - listener.strategyOrderChanged(); - } - } - - /** - * @return false if the assertion fails - */ - private boolean assertNotDisposed() - { - if (_isDisposed.get()) - { - JSFCorePlugin.log(new Exception("Stack trace only"), "TLDRegistryPreferences is disposed"); //$NON-NLS-1$ //$NON-NLS-2$ - return false; - } - return true; } /** @@ -249,12 +147,12 @@ public class TLDRegistryPreferences for (final OrderableObject id : ids) { StrategyIdentifier strategyId = (StrategyIdentifier) id.getObject(); - buffer.append("dummyValue"); //$NON-NLS-1$ - buffer.append(","); //$NON-NLS-1$ + buffer.append(strategyId.getDisplayName()); + buffer.append(","); buffer.append(strategyId.getId()); - buffer.append(","); //$NON-NLS-1$ + buffer.append(","); buffer.append(id.isEnabled()); - buffer.append(","); //$NON-NLS-1$ + buffer.append(","); } return buffer.toString(); } @@ -262,36 +160,28 @@ public class TLDRegistryPreferences private List<OrderableObject> deserialize(final String serializedList) { final List<OrderableObject> list = new ArrayList<OrderableObject>(); - final String[] ids = serializedList.split(","); //$NON-NLS-1$ + final String[] ids = serializedList.split(","); if ((ids.length % 3) != 0) { - return null; + return new ArrayList<OrderableObject>(); } for (int i = 0; i < ids.length; i += 3) { - /// ingore the dummy value: final String displayName = ids[i]; + final String displayName = ids[i]; String id = ids[i + 1]; final String enabled = ids[i + 2]; // fix old id for meta-data resolver - if ("org.eclipse.jst.jsf.THISISTEMPORARY".equals(id)) //$NON-NLS-1$ + if ("org.eclipse.jst.jsf.THISISTEMPORARY".equals(id)) { id = DefaultJSPTagResolver.ID; } - final StrategyDescriptor desc = ALL_KNOWN_STRATEGIES.get(id); - - if (desc == null) - { - JSFCorePlugin.log(new Exception("Stack trace only"), "Error: unknown strategy id: "+id); //$NON-NLS-1$ //$NON-NLS-2$ - } - else - { - final StrategyIdentifier strategyIdentifier = new StrategyIdentifier(desc); - list.add(new OrderableObject(strategyIdentifier - , Boolean.valueOf(enabled).booleanValue())); - } + final StrategyIdentifier strategyIdentifier = new StrategyIdentifier( + displayName, id); + list.add(new OrderableObject(strategyIdentifier + , Boolean.valueOf(enabled).booleanValue())); } return list; } @@ -305,8 +195,6 @@ public class TLDRegistryPreferences { prefStore.setValue(KEY_STRATEGY_ID_ORDER, serialize(getStrategyIdOrdering())); - // refresh local copy of preferences - load(); } /** @@ -335,11 +223,13 @@ public class TLDRegistryPreferences */ public static class StrategyIdentifier { - private final StrategyDescriptor _descriptor; + private final String _id; + private final String _displayName; - StrategyIdentifier(final StrategyDescriptor descriptor) + StrategyIdentifier(final String displayName, final String id) { - _descriptor = descriptor; + _displayName = displayName; + _id = id; } /** @@ -347,7 +237,15 @@ public class TLDRegistryPreferences */ public String getId() { - return _descriptor.getId(); + return _id; + } + + /** + * @return the display name for the strategy + */ + public String getDisplayName() + { + return _displayName; } @Override @@ -355,7 +253,7 @@ public class TLDRegistryPreferences { if (obj instanceof StrategyIdentifier) { - return getId().equals(((StrategyIdentifier)obj).getId()); + return _id.equals(((StrategyIdentifier)obj)._id); } return false; } @@ -363,15 +261,7 @@ public class TLDRegistryPreferences @Override public int hashCode() { - return getId().hashCode(); - } - - /** - * @return the display name of the strategy - */ - public String getDisplayName() - { - return _descriptor.getDisplayName(); + return _id.hashCode(); } } @@ -384,8 +274,4 @@ public class TLDRegistryPreferences } } - static abstract class PropertyListener - { - public abstract void strategyOrderChanged(); - } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDTagRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDTagRegistry.java index b2248085d..e96d3f284 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDTagRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TLDTagRegistry.java @@ -32,7 +32,6 @@ import org.eclipse.jst.jsf.common.internal.policy.IdentifierOrderedIteratorPolic import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.JSFCoreTraceOptions; -import org.eclipse.jst.jsf.designtime.internal.Messages; import org.eclipse.jst.jsf.designtime.internal.view.model.AbstractTagRegistry; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.CompositeTagResolvingStrategy; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.DefaultJSPTagResolver; @@ -65,8 +64,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements private final Job _changeJob; private final PersistedDataTagStrategy _persistedTagStrategy; private TagIndexListener _tagIndexListener; - private final TLDRegistryPreferences _prefs; - private final MyPropertyListener _myPropertyListener; + private TLDRegistryPreferences _prefs; TLDTagRegistry(final IProject project) { @@ -74,12 +72,13 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements _nsResolved = new HashMap<String, TLDNamespace>(); _prefs = new TLDRegistryPreferences(JSFCorePlugin.getDefault().getPreferenceStore()); - _myPropertyListener = new MyPropertyListener(); - _prefs.addListener(_myPropertyListener); _prefs.load(); final IdentifierOrderedIteratorPolicy<String> policy = getTagResolvingPolicy(); - + // exclude things that are not explicitly listed in the policy. That + // way preference-based disablement will cause those strategies to + // be excluded. + policy.setExcludeNonExplicitValues(true); _resolver = new CompositeTagResolvingStrategy<TLDElementDeclaration>( policy); @@ -107,10 +106,6 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements final IdentifierOrderedIteratorPolicy<String> policy = new IdentifierOrderedIteratorPolicy<String>( strategyOrdering); - // exclude things that are not explicitly listed in the policy. That - // way preference-based disablement will cause those strategies to - // be excluded. - policy.setExcludeNonExplicitValues(true); return policy; } @@ -118,7 +113,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry: Disposing for project " //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry: Disposing for project " + _project.toString()); } @@ -132,7 +127,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { JSFCoreTraceOptions - .log("TLDTagRegistry: Done disposing registry for " //$NON-NLS-1$ + .log("TLDTagRegistry: Done disposing registry for " + _project.toString()); } } @@ -151,25 +146,25 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements } catch (IOException e) { - JSFCorePlugin.log(e, "Checkpointing JSP tags failed"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Checkpointing JSP tags failed"); } catch (ClassNotFoundException e) { - JSFCorePlugin.log(e, "Checkpointing JSP tags failed"); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Checkpointing JSP tags failed"); } } @Override protected Job getRefreshJob(final boolean flushCaches) { - return new Job(Messages.TLDTagRegistry_RefreshJob + _project.getName()) + return new Job("Refreshing JSP tag registry for " + _project.getName()) { @Override protected IStatus run(final IProgressMonitor monitor) { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry.refresh: start"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.refresh: start"); } synchronized (TLDTagRegistry.this) @@ -177,7 +172,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { JSFCoreTraceOptions - .log("TLDTagRegistry.refresh: start"); //$NON-NLS-1$ + .log("TLDTagRegistry.refresh: start"); } final List<Namespace> namespaces = new ArrayList( @@ -205,7 +200,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { JSFCoreTraceOptions - .log("TLDTagRegistry.refresh: finished"); //$NON-NLS-1$ + .log("TLDTagRegistry.refresh: finished"); } return Status.OK_STATUS; } @@ -219,7 +214,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry.initialize: start"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.initialize: start"); } final ITaglibRecord[] tldrecs = TaglibIndex @@ -244,7 +239,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_TLDREGISTRYMANAGER) { JSFCoreTraceOptions - .log("TLDRegistryManager: installing tag index listener due to create instance for " //$NON-NLS-1$ + .log("TLDRegistryManager: installing tag index listener due to create instance for " + _project.toString()); } @@ -261,7 +256,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry.initialize: finished"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.initialize: finished"); } } @@ -272,7 +267,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { - JSFCoreTraceOptions.log("TLDTagRegistry.initialize_TagRecord: Initializing new tld record: "+tagRecord.toString()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.initialize_TagRecord: Initializing new tld record: "+tagRecord.toString()); } long startTime = 0; @@ -298,7 +293,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_PERF) { - System.out.printf("Time to update namespace %s was %d\n", //$NON-NLS-1$ + System.out.printf("Time to update namespace %s was %d\n", ns.getNSUri(), Long.valueOf(System.nanoTime() - startTime)); } @@ -309,7 +304,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { - JSFCoreTraceOptions.log("TLDTagRegistry.initialize_TagRecord: Skipping tag record for "+tagRecord.toString()); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.initialize_TagRecord: Skipping tag record for "+tagRecord.toString()); } } @@ -341,7 +336,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry.getAllTagLibraries: start"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.getAllTagLibraries: start"); } long startTime = 0; @@ -360,12 +355,12 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_PERF) { - System.out.println("Time to getAllTagLibraries for JSP: "+(System.nanoTime()-startTime)); //$NON-NLS-1$ + System.out.println("Time to getAllTagLibraries for JSP: "+(System.nanoTime()-startTime)); } if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { JSFCoreTraceOptions - .log("TLDTagRegistry.getAllTagLibraries: finished"); //$NON-NLS-1$ + .log("TLDTagRegistry.getAllTagLibraries: finished"); } return allTagLibraries; } @@ -379,7 +374,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { - JSFCoreTraceOptions.log("TLDTagRegistry.getTagLibrary: start uri=" //$NON-NLS-1$ + JSFCoreTraceOptions.log("TLDTagRegistry.getTagLibrary: start uri=" + uri); } @@ -393,7 +388,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY) { JSFCoreTraceOptions - .log("TLDTagRegistry.getTagLibrary: finished, result=" //$NON-NLS-1$ + .log("TLDTagRegistry.getTagLibrary: finished, result=" + ns.toString()); } return ns; @@ -404,7 +399,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements { return String .format( - "TLDRegistry for project %s, isDisposed=%s, hasBeenInitialized=%s, numberOfNamespace=%d", //$NON-NLS-1$ + "TLDRegistry for project %s, isDisposed=%s, hasBeenInitialized=%s, numberOfNamespace=%d", _project.toString(), Boolean.valueOf(isDisposed()), Boolean.valueOf(_hasBeenInitialized), Integer .valueOf(_nsResolved.size())); @@ -423,7 +418,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements public ChangeJob(final String projectName) { - super(Messages.TLDTagRegistry_UpdateJob + projectName); + super("Update job for project " + projectName); } @Override @@ -435,7 +430,7 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements LibraryOperation operation = null; final MultiStatus multiStatus = new MultiStatus( - JSFCorePlugin.PLUGIN_ID, 0, "Result of change job", //$NON-NLS-1$ + JSFCorePlugin.PLUGIN_ID, 0, "Result of change job", new Throwable()); while ((operation = _changeOperations.poll()) != null) { @@ -457,19 +452,4 @@ public final class TLDTagRegistry extends AbstractTagRegistry implements } } } - - private class MyPropertyListener extends TLDRegistryPreferences.PropertyListener - { - @Override - public void strategyOrderChanged() - { - synchronized(TLDTagRegistry.this) - { - _prefs.load(); - final IdentifierOrderedIteratorPolicy<String> policy = - getTagResolvingPolicy(); - _resolver.setPolicy(policy); - } - } - } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TagIndexListener.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TagIndexListener.java index b360a276f..0c075af57 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TagIndexListener.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/registry/TagIndexListener.java @@ -33,14 +33,14 @@ class TagIndexListener implements ITaglibIndexListener { if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { - JSFCoreTraceOptions.log("TagIndexListener.indexChanged: start"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TagIndexListener.indexChanged: start"); } visitDelta(delta); if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { - JSFCoreTraceOptions.log("TagIndexListener.indexChanged: finish"); //$NON-NLS-1$ + JSFCoreTraceOptions.log("TagIndexListener.indexChanged: finish"); } } @@ -58,7 +58,7 @@ class TagIndexListener implements ITaglibIndexListener if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { JSFCoreTraceOptions.log(String.format( - "Processing add change: project=%s", project //$NON-NLS-1$ + "Processing add change: project=%s", project .getName())); } @@ -73,7 +73,7 @@ class TagIndexListener implements ITaglibIndexListener JSFCoreTraceOptions .log(String .format( - "Processing remove change: project=%s, tagrecord=%s", //$NON-NLS-1$ + "Processing remove change: project=%s, tagrecord=%s", project.getName())); } _registry.addLibraryOperation(_factory @@ -85,7 +85,7 @@ class TagIndexListener implements ITaglibIndexListener if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES) { JSFCoreTraceOptions.log(String.format( - "Processing change: project=%s, tagrecord=%s", //$NON-NLS-1$ + "Processing change: project=%s, tagrecord=%s", project.getName())); } _registry.addLibraryOperation(_factory diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/AbstractDataModelVariableFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/AbstractDataModelVariableFactory.java index af693a58f..b2f89c3e6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/AbstractDataModelVariableFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/AbstractDataModelVariableFactory.java @@ -136,7 +136,7 @@ public abstract class AbstractDataModelVariableFactory || valueType.isInstanceOf(TypeConstants.TYPE_DATA_MODEL)) { return getSymbolFactory().createDefaultSymbol(symbolName, ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL, Messages - .getString("AbstractDataModelVariableFactory.DataModel.Symbol.RowVariable.DetailedDescription")); //$NON-NLS-1$ + .getString("AbstractDataModelVariableFactory.DataModel.Symbol.RowVariable.DetailedDescription")); } // in other cases, we assume that the value is an explicit single row @@ -206,7 +206,7 @@ public abstract class AbstractDataModelVariableFactory symbolName, ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL, Messages - .getString("AbstractDataModelVariableFactory.DataModel.Symbol.RowVariable.DetailedDescription")); //$NON-NLS-1$ + .getString("AbstractDataModelVariableFactory.DataModel.Symbol.RowVariable.DetailedDescription")); } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java index 540d47257..f8e7f1e6a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java @@ -140,7 +140,7 @@ public class DefaultBeanSymbolSourceProvider { IJavaProject javaProject = JavaCore.create(iProject); final String typeName = bean.getManagedBeanClass() != null? - bean.getManagedBeanClass().getTextContent() : ""; //$NON-NLS-1$ + bean.getManagedBeanClass().getTextContent() : ""; final IType type = javaProject.findType(typeName); // don't bother setting a type descriptor if we @@ -170,10 +170,10 @@ public class DefaultBeanSymbolSourceProvider final String beanName = beanType.getManagedBeanName() != null ? beanType.getManagedBeanName().getTextContent() : null; - StringBuffer additionalInfo = new StringBuffer(); + StringBuffer additionalInfo = new StringBuffer(); //$NON-NLS-1$ if (beanName != null) { - additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Name")); //$NON-NLS-1$ //$NON-NLS-2$ + additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Name")); //$NON-NLS-1$ additionalInfo.append(" </b>"); //$NON-NLS-1$ additionalInfo.append(beanName); additionalInfo.append("</p>"); //$NON-NLS-1$ @@ -183,7 +183,7 @@ public class DefaultBeanSymbolSourceProvider beanType.getManagedBeanClass().getTextContent() : null; if (beanClass != null) { - additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Type")); //$NON-NLS-1$ //$NON-NLS-2$ + additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Type")); //$NON-NLS-1$ additionalInfo.append(" </b>"); //$NON-NLS-1$ additionalInfo.append(beanClass); additionalInfo.append("</p>"); //$NON-NLS-1$ @@ -193,7 +193,7 @@ public class DefaultBeanSymbolSourceProvider beanType.getManagedBeanScope().getTextContent() : null; if (beanScope != null) { - additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Scope")); //$NON-NLS-1$ //$NON-NLS-2$ + additionalInfo.append("<p><b>"+Messages.getString("DefaultBeanSymbolSourceProvider.AdditionalInformation.Scope")); //$NON-NLS-1$ additionalInfo.append(" </b>"); //$NON-NLS-1$ additionalInfo.append(beanScope); additionalInfo.append("</p>"); //$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/JSFSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/JSFSymbolFactory.java index 55c9309a7..2ef108d72 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/JSFSymbolFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/JSFSymbolFactory.java @@ -320,7 +320,7 @@ public final class JSFSymbolFactory extends InitializedSymbolFactory SymbolFactory.eINSTANCE.createIComponentSymbol(); symbol.setName(symbolName); symbol.setTypeDescriptor(typeDesc); - symbol.setDetailedDescription(description); + symbol.setDetailedDescription(description); //$NON-NLS-1$ symbol.setRuntimeSource(source); return symbol; } @@ -335,7 +335,7 @@ public final class JSFSymbolFactory extends InitializedSymbolFactory public IInstanceSymbol createMessageBundleSymbol(final String symbolName, final String bundleName, IJavaProject project) { // FUTURE USE - throw new UnsupportedOperationException("see https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461"); //$NON-NLS-1$ + throw new UnsupportedOperationException("see https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461"); } /** @@ -351,7 +351,7 @@ public final class JSFSymbolFactory extends InitializedSymbolFactory ERuntimeSource source, final String description, final IJavaProject javaProject) { // FUTURE USE - throw new UnsupportedOperationException("see https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461"); //$NON-NLS-1$ + throw new UnsupportedOperationException("see https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461"); } // / /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java index 12a448fb5..0b3f15782 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java @@ -45,7 +45,7 @@ public final class MetaDataEnabledProcessingFactory { * Name of property in annotation file to use when applying a runtime type * to an attribute value */ - public static final String ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME = "attribute-value-runtime-type"; //$NON-NLS-1$ + public static final String ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME = "attribute-value-runtime-type"; /** * @return singleton instance @@ -95,7 +95,7 @@ public final class MetaDataEnabledProcessingFactory { .getWorkspaceContextResolver(sdContext); _project = resolver != null ? resolver.getProject() : null; } - String _elem = elementName + "/" + attributeName; //$NON-NLS-1$ + String _elem = elementName + "/" + attributeName; String _uri = uri; ITaglibDomainMetaDataModelContext modelContext = TaglibDomainMetaDataQueryHelper .createMetaDataModelContext(_project, _uri); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java index 33b0ce523..71809e830 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java @@ -53,7 +53,7 @@ public class TaglibMetadataContext extends MetaDataContext { this.uri = tagAttrEntity.getModel().getCurrentModelContext().getUri(); if (!(tagAttrEntity.eContainer() instanceof Entity)) { - throw new IllegalArgumentException("tagAttrEntity must be contained in a tag Entity to use this constructor"); //$NON-NLS-1$ + throw new IllegalArgumentException("tagAttrEntity must be contained in a tag Entity to use this constructor"); } this.tagName = ((Entity)tagAttrEntity.eContainer()).getId(); this.attributeName = tagAttrEntity.getId(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java index 70b68aa3b..93d93b812 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java @@ -26,7 +26,7 @@ public interface IDefaultValue extends IMetaDataEnabledFeature { /** * Default name of property in annotation file to use when supplying default values from meta-data */ - String DEFAULT_VALUE_PROP_NAME = "default-value"; //$NON-NLS-1$ + String DEFAULT_VALUE_PROP_NAME = "default-value"; /** * @return default value or null if one not defined diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java index 165b662f8..4d43d8706 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java @@ -28,15 +28,15 @@ public interface IPossibleValues extends IMetaDataEnabledFeature{ /** * Default name of property in annotation file to use when supplying possible values from meta-data */ - public static final String POSSIBLE_VALUES_PROP_NAME = "valid-values"; //$NON-NLS-1$ + public static final String POSSIBLE_VALUES_PROP_NAME = "valid-values"; /** * Default name of property in annotation file to use when supplying possible displayed values from meta-data */ - public static final String POSSIBLE_VALUES_FOR_DISPLAY_PROP_NAME = "displayed-values"; //$NON-NLS-1$ + public static final String POSSIBLE_VALUES_FOR_DISPLAY_PROP_NAME = "displayed-values"; /** * Default name of property in annotation file to use when supplying icon displayed values from meta-data */ - public static final String POSSIBLE_VALUES_SMALL_ICON_PROP_NAME = "small-icon"; //$NON-NLS-1$ + public static final String POSSIBLE_VALUES_SMALL_ICON_PROP_NAME = "small-icon"; /** * @return List of IPossibleValue instances representing possible values * Implementer must ensure that an empty rather than null list is returned if no values are posssible. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java index e989031e5..25baa406a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java @@ -25,28 +25,28 @@ public interface IValidValues extends IMetaDataEnabledFeature{ /** * Trait name for valid-values */ - public static final String VALID_VALUES_PROP_NAME = "valid-values"; //$NON-NLS-1$ + public static final String VALID_VALUES_PROP_NAME = "valid-values"; /** * Trait name for valid-values-code */ - public static final String VALID_VALUES_CODE_PROP_NAME = VALID_VALUES_PROP_NAME + "-code"; //$NON-NLS-1$ + public static final String VALID_VALUES_CODE_PROP_NAME = VALID_VALUES_PROP_NAME + "-code"; /** * Trait name for valid-values-severity */ - public static final String VALID_VALUES_SEVERITY_PROP_NAME = VALID_VALUES_PROP_NAME + "-severity"; //$NON-NLS-1$ + public static final String VALID_VALUES_SEVERITY_PROP_NAME = VALID_VALUES_PROP_NAME + "-severity"; /** * Trait name for valid-values-message */ - public static final String VALID_VALUES_MESSAGE_PROP_NAME = VALID_VALUES_PROP_NAME + "-message"; //$NON-NLS-1$ + public static final String VALID_VALUES_MESSAGE_PROP_NAME = VALID_VALUES_PROP_NAME + "-message"; /** * Trait name for valid-maximum */ - public static final String VALID_VALUES_MAX_PROP_NAME = "valid-maximum"; //$NON-NLS-1$ + public static final String VALID_VALUES_MAX_PROP_NAME = "valid-maximum"; /** * Trait name for valid-minimum */ - public static final String VALID_VALUES_MIN_PROP_NAME = "valid-minimum"; //$NON-NLS-1$ + public static final String VALID_VALUES_MIN_PROP_NAME = "valid-minimum"; /** * @param value fully resolved value as String * @return true if is valid diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java index 04c6ebd36..0ae2de2d7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java @@ -31,7 +31,7 @@ public class AbstractMetaDataEnabledType implements IType{ AbstractMetaDataEnabledType(String bundleID, String id, String klass){ this.bundleId = bundleID; - this.typeId = bundleId + "." + id; //$NON-NLS-1$ + this.typeId = bundleId + "." + id; this.klass = klass; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java index 8cc0fbd8f..6e2d1f48c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java @@ -91,7 +91,7 @@ public abstract class AbstractMetaDataEnabledTypeFactory { try { Bundle bundle =Platform.getBundle(type.getBundleID()); if (bundle == null){ - JSFCorePlugin.log(IStatus.ERROR, type.getBundleID() + " could not be created to load " + className); //$NON-NLS-1$ + JSFCorePlugin.log(IStatus.ERROR, type.getBundleID() + " could not be created to load " + className); return null; } Class klass = bundle.loadClass(className); @@ -101,10 +101,10 @@ public abstract class AbstractMetaDataEnabledTypeFactory { { return klass; } - JSFCorePlugin.log(IStatus.INFO, className + " was not found in " + type.getBundleID() +" for " + type.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.INFO, className + " was not found in " + type.getBundleID() +" for " + type.getTypeID()); } } catch (ClassNotFoundException e) { - JSFCorePlugin.log(IStatus.ERROR, className + " was not found in " + type.getBundleID() +" for " + type.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.ERROR, className + " was not found in " + type.getBundleID() +" for " + type.getTypeID()); } return null; } @@ -117,9 +117,9 @@ public abstract class AbstractMetaDataEnabledTypeFactory { return (ITypeDescriptor)klass.newInstance(); } } catch (InstantiationException e) { - JSFCorePlugin.log(IStatus.ERROR, "InstantiationException: " + className + " in " + type.getBundleID() +" for " + type.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + JSFCorePlugin.log(IStatus.ERROR, "InstantiationException: " + className + " in " + type.getBundleID() +" for " + type.getTypeID()); } catch (IllegalAccessException e) { - JSFCorePlugin.log(IStatus.ERROR, "IllegalAccessException: " + className + " in " + type.getBundleID() +" for " + type.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + JSFCorePlugin.log(IStatus.ERROR, "IllegalAccessException: " + className + " in " + type.getBundleID() +" for " + type.getTypeID()); } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeRegistry.java index 767ad7d21..5c4b0b2c0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeRegistry.java @@ -55,7 +55,7 @@ public abstract class AbstractMetaDataEnabledTypeRegistry { } else { //is there any point in putting this more in the user's face? this is really an internal error. - JSFCorePlugin.log(IStatus.ERROR, "Duplicate RuntimeTypeId being registered from " + ext_pt_id + ": " + atype.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.ERROR, "Duplicate RuntimeTypeId being registered from " + ext_pt_id + ": " + atype.getTypeID()); } } @@ -83,17 +83,17 @@ public abstract class AbstractMetaDataEnabledTypeRegistry { IExtension ext = extensions[i]; for (int j=0;j < ext.getConfigurationElements().length;j++){ final String bundleId = ext.getConfigurationElements()[j].getContributor().getName(); - final String id = ext.getConfigurationElements()[j].getAttribute("id"); //$NON-NLS-1$ - String klass = ext.getConfigurationElements()[j].getAttribute("class"); //$NON-NLS-1$ - final String runtimeType = ext.getConfigurationElements()[j].getAttribute("runtime-type"); //$NON-NLS-1$ - if (klass == null || klass.trim().equals("")){ //$NON-NLS-1$ + final String id = ext.getConfigurationElements()[j].getAttribute("id"); + String klass = ext.getConfigurationElements()[j].getAttribute("class"); + final String runtimeType = ext.getConfigurationElements()[j].getAttribute("runtime-type"); + if (klass == null || klass.trim().equals("")){ klass = getDefaultClassName(); } registerType(bundleId, id, klass, runtimeType); } } } catch (InvalidRegistryObjectException e) { - JSFCorePlugin.log(e, "Unable to read " + JSFCorePlugin.PLUGIN_ID + ext_pt_id + " registry"); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(e, "Unable to read " + JSFCorePlugin.PLUGIN_ID + ext_pt_id + " registry"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeRegistry.java index 93dd230fc..9deab17ae 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeRegistry.java @@ -21,8 +21,8 @@ package org.eclipse.jst.jsf.metadataprocessors.internal; */ public class AttributeValueRuntimeTypeRegistry extends AbstractMetaDataEnabledTypeRegistry { - private static final String EXTPTID = "AttributeValueRuntimeTypes"; //$NON-NLS-1$ - private static final String DEFAULT_CLASS = "org.eclipse.jst.jsf.metadataprocessors.DefaultTypeDescriptor"; //$NON-NLS-1$ + private static final String EXTPTID = "AttributeValueRuntimeTypes"; + private static final String DEFAULT_CLASS = "org.eclipse.jst.jsf.metadataprocessors.DefaultTypeDescriptor"; private static AttributeValueRuntimeTypeRegistry INSTANCE; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java index acf39ca6d..9cb0303d0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java @@ -126,7 +126,7 @@ public final class MetaDataEnabledFeatureAdapterFactory { if (! typesCache.containsKey(featureExt.getTypeID())){ Bundle bundle =Platform.getBundle(featureExt.getBundleID()); if (bundle == null){ - JSFCorePlugin.log(IStatus.ERROR, featureExt.getBundleID() + " could not be created to load " + className); //$NON-NLS-1$ + JSFCorePlugin.log(IStatus.ERROR, featureExt.getBundleID() + " could not be created to load " + className); return null; } klass = bundle.loadClass(className); @@ -138,7 +138,7 @@ public final class MetaDataEnabledFeatureAdapterFactory { klass = typesCache.get(featureExt.getTypeID()); if (!IMetaDataEnabledFeature.class.isAssignableFrom(klass)){ - JSFCorePlugin.log(IStatus.INFO, className + " is not a IMetaDataEnabledFeature. " + featureExt.getBundleID() +" : " + featureExt.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.INFO, className + " is not a IMetaDataEnabledFeature. " + featureExt.getBundleID() +" : " + featureExt.getTypeID()); } else if (klass != null && processingFeature.isAssignableFrom(klass)){ IMetaDataEnabledFeature obj = (IMetaDataEnabledFeature)klass.newInstance(); @@ -146,11 +146,11 @@ public final class MetaDataEnabledFeatureAdapterFactory { } } catch (ClassNotFoundException e) { - JSFCorePlugin.log(IStatus.ERROR, className + " was not found in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.ERROR, className + " was not found in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); } catch (InstantiationException e) { - JSFCorePlugin.log(IStatus.ERROR, "InstantiationException: " + className + " in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + JSFCorePlugin.log(IStatus.ERROR, "InstantiationException: " + className + " in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); } catch (IllegalAccessException e) { - JSFCorePlugin.log(IStatus.ERROR, "IllegalAccessException: " + className + " in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + JSFCorePlugin.log(IStatus.ERROR, "IllegalAccessException: " + className + " in " + featureExt.getBundleID() +" for " + featureExt.getTypeID()); } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java index d67b5375b..17b5a41e4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java @@ -33,7 +33,7 @@ import org.eclipse.jst.jsf.metadataprocessors.IType; * */ public class MetaDataEnabledFeatureRegistry{ - private static final String EXTPTID = "MetaDataEnabledFeatures"; //$NON-NLS-1$ + private static final String EXTPTID = "MetaDataEnabledFeatures"; private Map<String, List<IMetaDataEnabledFeatureExtension>> featuresMap; private Map<String, Class> typeCacheMap; private static MetaDataEnabledFeatureRegistry INSTANCE; @@ -65,13 +65,13 @@ public class MetaDataEnabledFeatureRegistry{ IExtension ext = extensions[i]; for (int j=0;j < ext.getConfigurationElements().length;j++){ final String bundleId = ext.getConfigurationElements()[j].getContributor().getName(); - final String id = ext.getConfigurationElements()[j].getAttribute("typeid"); //$NON-NLS-1$ - final String klass = ext.getConfigurationElements()[j].getAttribute("class"); //$NON-NLS-1$ + final String id = ext.getConfigurationElements()[j].getAttribute("typeid"); + final String klass = ext.getConfigurationElements()[j].getAttribute("class"); registerFeature(bundleId, id, klass); } } } catch (InvalidRegistryObjectException e) { - JSFCorePlugin.log(e, "Unable to read " + JSFCorePlugin.PLUGIN_ID + EXTPTID + " registry"); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(e, "Unable to read " + JSFCorePlugin.PLUGIN_ID + EXTPTID + " registry"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfo.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfo.java index d1a0597a6..1c2508082 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfo.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfo.java,v 1.3 2008/11/18 22:23:54 gkessler Exp $ + * $Id: PaletteInfo.java,v 1.2 2008/03/30 21:22:24 cbateman Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -35,38 +35,38 @@ public interface PaletteInfo extends EObject { /** * the trait id name */ - public static final String TRAIT_ID = "paletteInfo"; //$NON-NLS-1$ + public static final String TRAIT_ID = "paletteInfo"; /** * the display label name */ - public static final String TRAIT_DISPLAY_LABEL = "display-label"; //$NON-NLS-1$ + public static final String TRAIT_DISPLAY_LABEL = "display-label"; /** * the trait description name */ - public static final String TRAIT_DESCRIPTION = "description"; //$NON-NLS-1$ + public static final String TRAIT_DESCRIPTION = "description"; /** * the expert trait */ - public static final String TRAIT_IS_EXPERT = "expert"; //$NON-NLS-1$ + public static final String TRAIT_IS_EXPERT = "expert"; /** * the hiddent trait */ - public static final String TRAIT_IS_HIDDEN = "hidden"; //$NON-NLS-1$ + public static final String TRAIT_IS_HIDDEN = "hidden"; /** * the small icon trait */ - public static final String TRAIT_SMALL_ICON = "small-icon"; //$NON-NLS-1$ + public static final String TRAIT_SMALL_ICON = "small-icon"; /** * the large icon trait */ - public static final String TRAIT_LARGE_ICON = "large-icon"; //$NON-NLS-1$ + public static final String TRAIT_LARGE_ICON = "large-icon"; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Returns the value of the '<em><b>Id</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfos.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfos.java index 8422bf36c..a6f2ba47c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfos.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfos.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfos.java,v 1.3 2008/11/18 22:23:54 gkessler Exp $ + * $Id: PaletteInfos.java,v 1.2 2008/03/30 21:22:24 cbateman Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -29,13 +29,13 @@ public interface PaletteInfos extends EObject { /** * the palette infos trait id */ - public static final String TRAIT_ID = "paletteInfos"; //$NON-NLS-1$ + public static final String TRAIT_ID = "paletteInfos"; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Returns the value of the '<em><b>Infos</b></em>' containment reference list. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosFactory.java index d1c9cc712..2929af31c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosFactory.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosFactory.java,v 1.2 2008/11/18 22:23:54 gkessler Exp $ + * $Id: PaletteInfosFactory.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -21,7 +21,7 @@ public interface PaletteInfosFactory extends EFactory { * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The singleton instance of the factory. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosPackage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosPackage.java index 41cb41af2..377ff4309 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/PaletteInfosPackage.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosPackage.java,v 1.2 2008/11/18 22:23:54 gkessler Exp $ + * $Id: PaletteInfosPackage.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -32,7 +32,7 @@ public interface PaletteInfosPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The package name. @@ -40,7 +40,7 @@ public interface PaletteInfosPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNAME = "paletteinfos"; //$NON-NLS-1$ + String eNAME = "paletteinfos"; /** * The package namespace URI. @@ -48,7 +48,7 @@ public interface PaletteInfosPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore"; //$NON-NLS-1$ + String eNS_URI = "http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore"; /** * The package namespace name. @@ -56,7 +56,7 @@ public interface PaletteInfosPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "pi"; //$NON-NLS-1$ + String eNS_PREFIX = "pi"; /** * The singleton instance of the package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationAttribute.java index 16e309285..d84b1ad19 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationAttribute.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationAttribute.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationAttribute.java,v 1.2 2008/11/18 22:23:54 gkessler Exp $ + * $Id: TagCreationAttribute.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -30,7 +30,7 @@ public interface TagCreationAttribute extends EObject { * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Returns the value of the '<em><b>Id</b></em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationInfo.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationInfo.java index 9c4635a77..fb3b9378c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationInfo.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationInfo.java,v 1.2 2008/11/18 22:23:54 gkessler Exp $ + * $Id: TagCreationInfo.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -30,13 +30,13 @@ public interface TagCreationInfo extends EObject { /** * the name of the trait id */ - public static final String TRAIT_ID = "tag-create"; //$NON-NLS-1$ + public static final String TRAIT_ID = "tag-create"; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationTemplate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationTemplate.java index 0037bf190..c06f5d857 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationTemplate.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/TagCreationTemplate.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationTemplate.java,v 1.2 2008/11/18 22:23:54 gkessler Exp $ + * $Id: TagCreationTemplate.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos; @@ -29,7 +29,7 @@ public interface TagCreationTemplate extends EObject { * <!-- end-user-doc --> * @generated */ - String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Returns the value of the '<em><b>Template</b></em>' containment reference. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfoImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfoImpl.java index 7b13fe4af..1d0717b7e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfoImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfoImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: PaletteInfoImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -49,7 +49,7 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The default value of the '{@link #getId() <em>Id</em>}' attribute. @@ -345,7 +345,7 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { _tag = findTag(model, tagName); } catch (ClassCastException e) { // PDPlugin.getLogger(getClass()).error(e); - JSFCorePlugin.log(e, "ClassCastException in getTag() for " + tagName); //$NON-NLS-1$ + JSFCorePlugin.log(e, "ClassCastException in getTag() for " + tagName); return null; } } @@ -507,7 +507,7 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { } else if (tagCreation == null){ //delegate to entity if it exists - return (TagCreationInfo)getTagTraitValue(getTag(), "tag-create"); //$NON-NLS-1$ + return (TagCreationInfo)getTagTraitValue(getTag(), "tag-create"); } return tagCreation; } @@ -541,7 +541,7 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { */ public boolean isExpert() { if (expert == null){ - String val = getTagTraitValueAsString(getId(), "expert"); //$NON-NLS-1$ + String val = getTagTraitValueAsString(getId(), "expert"); return Boolean.valueOf(val).booleanValue(); } return expert.booleanValue(); @@ -554,7 +554,7 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { */ public boolean isHidden() { if (hidden == null){ - String val = getTagTraitValueAsString(getId(), "hidden"); //$NON-NLS-1$ + String val = getTagTraitValueAsString(getId(), "hidden"); return Boolean.valueOf(val).booleanValue(); } return hidden.booleanValue(); @@ -704,21 +704,21 @@ public class PaletteInfoImpl extends EObjectImpl implements PaletteInfo { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); //$NON-NLS-1$ + result.append(" (id: "); result.append(id); - result.append(", tag: "); //$NON-NLS-1$ + result.append(", tag: "); result.append(tag); - result.append(", displayLabel: "); //$NON-NLS-1$ + result.append(", displayLabel: "); result.append(displayLabel); - result.append(", description: "); //$NON-NLS-1$ + result.append(", description: "); result.append(description); - result.append(", expert: "); //$NON-NLS-1$ + result.append(", expert: "); result.append(expert); - result.append(", hidden: "); //$NON-NLS-1$ + result.append(", hidden: "); result.append(hidden); - result.append(", smallIcon: "); //$NON-NLS-1$ + result.append(", smallIcon: "); result.append(smallIcon); - result.append(", largeIcon: "); //$NON-NLS-1$ + result.append(", largeIcon: "); result.append(largeIcon); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosFactoryImpl.java index 6bed2567a..9d68ced18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosFactoryImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosFactoryImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: PaletteInfosFactoryImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -30,7 +30,7 @@ public class PaletteInfosFactoryImpl extends EFactoryImpl implements PaletteInfo * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * Creates the default factory implementation. @@ -41,7 +41,7 @@ public class PaletteInfosFactoryImpl extends EFactoryImpl implements PaletteInfo */ public static PaletteInfosFactory init() { try { - PaletteInfosFactory thePaletteInfosFactory = (PaletteInfosFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore"); //$NON-NLS-1$ + PaletteInfosFactory thePaletteInfosFactory = (PaletteInfosFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore"); if (thePaletteInfosFactory != null) { return thePaletteInfosFactory; } @@ -75,7 +75,7 @@ public class PaletteInfosFactoryImpl extends EFactoryImpl implements PaletteInfo case PaletteInfosPackage.TAG_CREATION_TEMPLATE: return createTagCreationTemplate(); case PaletteInfosPackage.TAG_CREATION_ATTRIBUTE: return createTagCreationAttribute(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosImpl.java index 47f7dd822..0b1e219e0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: PaletteInfosImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -38,7 +38,7 @@ public class PaletteInfosImpl extends EObjectImpl implements PaletteInfos { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The cached value of the '{@link #getInfos() <em>Infos</em>}' containment reference list. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosPackageImpl.java index e4bf56197..7abbfbba7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/PaletteInfosPackageImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosPackageImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: PaletteInfosPackageImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -35,7 +35,7 @@ public class PaletteInfosPackageImpl extends EPackageImpl implements PaletteInfo * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * <!-- begin-user-doc --> @@ -407,37 +407,37 @@ public class PaletteInfosPackageImpl extends EPackageImpl implements PaletteInfo // Add supertypes to classes // Initialize classes and features; add operations and parameters - initEClass(paletteInfosEClass, PaletteInfos.class, "PaletteInfos", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getPaletteInfos_Infos(), this.getPaletteInfo(), null, "infos", null, 0, -1, PaletteInfos.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(paletteInfosEClass, PaletteInfos.class, "PaletteInfos", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getPaletteInfos_Infos(), this.getPaletteInfo(), null, "infos", null, 0, -1, PaletteInfos.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - EOperation op = addEOperation(paletteInfosEClass, this.getPaletteInfo(), "findPaletteInfoById", 0, 1); //$NON-NLS-1$ - addEParameter(op, ecorePackage.getEString(), "id", 1, 1); //$NON-NLS-1$ + EOperation op = addEOperation(paletteInfosEClass, this.getPaletteInfo(), "findPaletteInfoById", 0, 1); + addEParameter(op, ecorePackage.getEString(), "id", 1, 1); - initEClass(paletteInfoEClass, PaletteInfo.class, "PaletteInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_Id(), ecorePackage.getEString(), "id", null, 1, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_Tag(), ecorePackage.getEString(), "tag", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_DisplayLabel(), ecorePackage.getEString(), "displayLabel", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_Description(), ecorePackage.getEString(), "description", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_Expert(), ecorePackage.getEBooleanObject(), "expert", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_Hidden(), ecorePackage.getEBooleanObject(), "hidden", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPaletteInfo_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEReference(getPaletteInfo_TagCreation(), this.getTagCreationInfo(), null, "tagCreation", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(paletteInfoEClass, PaletteInfo.class, "PaletteInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPaletteInfo_Id(), ecorePackage.getEString(), "id", null, 1, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_Tag(), ecorePackage.getEString(), "tag", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_DisplayLabel(), ecorePackage.getEString(), "displayLabel", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_Description(), ecorePackage.getEString(), "description", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_Expert(), ecorePackage.getEBooleanObject(), "expert", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_Hidden(), ecorePackage.getEBooleanObject(), "hidden", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPaletteInfo_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPaletteInfo_TagCreation(), this.getTagCreationInfo(), null, "tagCreation", null, 0, 1, PaletteInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - addEOperation(paletteInfoEClass, ecorePackage.getEBoolean(), "isExpert", 0, 1); //$NON-NLS-1$ + addEOperation(paletteInfoEClass, ecorePackage.getEBoolean(), "isExpert", 0, 1); - addEOperation(paletteInfoEClass, ecorePackage.getEBoolean(), "isHidden", 0, 1); //$NON-NLS-1$ + addEOperation(paletteInfoEClass, ecorePackage.getEBoolean(), "isHidden", 0, 1); - initEClass(tagCreationInfoEClass, TagCreationInfo.class, "TagCreationInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getTagCreationInfo_Attributes(), this.getTagCreationAttribute(), null, "attributes", null, 0, -1, TagCreationInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagCreationInfo_Template(), theXMLTypePackage.getAnySimpleType(), "template", null, 0, 1, TagCreationInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagCreationInfoEClass, TagCreationInfo.class, "TagCreationInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTagCreationInfo_Attributes(), this.getTagCreationAttribute(), null, "attributes", null, 0, -1, TagCreationInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagCreationInfo_Template(), theXMLTypePackage.getAnySimpleType(), "template", null, 0, 1, TagCreationInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tagCreationTemplateEClass, TagCreationTemplate.class, "TagCreationTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getTagCreationTemplate_Template(), ecorePackage.getEObject(), null, "template", null, 0, 1, TagCreationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagCreationTemplateEClass, TagCreationTemplate.class, "TagCreationTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTagCreationTemplate_Template(), ecorePackage.getEObject(), null, "template", null, 0, 1, TagCreationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tagCreationAttributeEClass, TagCreationAttribute.class, "TagCreationAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getTagCreationAttribute_Id(), ecorePackage.getEString(), "id", null, 1, 1, TagCreationAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagCreationAttribute_Value(), ecorePackage.getEString(), "value", null, 0, 1, TagCreationAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagCreationAttributeEClass, TagCreationAttribute.class, "TagCreationAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTagCreationAttribute_Id(), ecorePackage.getEString(), "id", null, 1, 1, TagCreationAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagCreationAttribute_Value(), ecorePackage.getEString(), "value", null, 0, 1, TagCreationAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -454,66 +454,66 @@ public class PaletteInfosPackageImpl extends EPackageImpl implements PaletteInfo * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (getPaletteInfos_Infos(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "item" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "item" }); addAnnotation (getPaletteInfo_DisplayLabel(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "display-label" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "display-label" }); addAnnotation (getPaletteInfo_Description(), source, new String[] { - "kind", "element" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element" }); addAnnotation (getPaletteInfo_Expert(), source, new String[] { - "kind", "element" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element" }); addAnnotation (getPaletteInfo_Hidden(), source, new String[] { - "kind", "element" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element" }); addAnnotation (getPaletteInfo_SmallIcon(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "small-icon" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "small-icon" }); addAnnotation (getPaletteInfo_LargeIcon(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "large-icon" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "large-icon" }); addAnnotation (getPaletteInfo_TagCreation(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "tag-create" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "tag-create" }); addAnnotation (getTagCreationInfo_Attributes(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "attribute" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "attribute" }); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationAttributeImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationAttributeImpl.java index 936f0f0b0..4109b42f2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationAttributeImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationAttributeImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationAttributeImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: TagCreationAttributeImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -35,7 +35,7 @@ public class TagCreationAttributeImpl extends EObjectImpl implements TagCreation * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The default value of the '{@link #getId() <em>Id</em>}' attribute. @@ -210,9 +210,9 @@ public class TagCreationAttributeImpl extends EObjectImpl implements TagCreation if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (id: "); //$NON-NLS-1$ + result.append(" (id: "); result.append(id); - result.append(", value: "); //$NON-NLS-1$ + result.append(", value: "); result.append(value); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationInfoImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationInfoImpl.java index 365ba8e61..327f928c5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationInfoImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationInfoImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: TagCreationInfoImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -45,7 +45,7 @@ public class TagCreationInfoImpl extends EObjectImpl implements TagCreationInfo * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list. @@ -215,7 +215,7 @@ public class TagCreationInfoImpl extends EObjectImpl implements TagCreationInfo if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (template: "); //$NON-NLS-1$ + result.append(" (template: "); result.append(template); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationTemplateImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationTemplateImpl.java index ec66a7910..edad1eb0e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationTemplateImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/impl/TagCreationTemplateImpl.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: TagCreationTemplateImpl.java,v 1.2 2008/11/18 22:24:03 gkessler Exp $ + * $Id: TagCreationTemplateImpl.java,v 1.1 2008/03/25 19:31:28 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl; @@ -37,7 +37,7 @@ public class TagCreationTemplateImpl extends EObjectImpl implements TagCreationT * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The cached value of the '{@link #getTemplate() <em>Template</em>}' containment reference. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosAdapterFactory.java index 8e08befb9..020473a6b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosAdapterFactory.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosAdapterFactory.java,v 1.2 2008/11/18 22:23:51 gkessler Exp $ + * $Id: PaletteInfosAdapterFactory.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.util; @@ -28,7 +28,7 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The cached model package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosSwitch.java index 7ce17c528..1059181f7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosSwitch.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/tagdisplay/internal/paletteinfos/util/PaletteInfosSwitch.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2007 Oracle Corporation * - * $Id: PaletteInfosSwitch.java,v 1.2 2008/11/18 22:23:51 gkessler Exp $ + * $Id: PaletteInfosSwitch.java,v 1.1 2008/03/25 19:31:30 gkessler Exp $ */ package org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.util; @@ -31,7 +31,7 @@ public class PaletteInfosSwitch { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$ + public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; /** * The cached model package diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/CSSClassType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/CSSClassType.java index 90c2dd483..57a0625f8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/CSSClassType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/CSSClassType.java @@ -75,7 +75,7 @@ public class CSSClassType extends AbstractRootTypeDescriptor implements try { traverser.apply((ICSSNode) ss); } catch (ClassCastException ex) { - JSFCorePlugin.log(ex, "Unable to cast to CSS style"); //$NON-NLS-1$ + JSFCorePlugin.log(ex, "Unable to cast to CSS style"); } } c = traverser.getClassNames(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java index d48f28d0a..5d061053c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java @@ -31,14 +31,14 @@ import org.w3c.dom.Node; public class DateTimePatternType extends AbstractRootTypeDescriptor implements IPossibleValues{ //should we ever validate the patterns, extend EnumerationType - final private static String[] DATEPATTERNS = {"M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + final private static String[] DATEPATTERNS = {"M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ "MMM d, yyyy", "EEE, MMM d, yyyy", "MMMM d, yyyy", "EEEE, MMMM d, yyyy", "MMMM yyyy" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ }; }; - final private static String[] TIMEPATTERNS = {"hh:mm", "hh:mm z", "HH:mm z", "HH:mm:ss z" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + final private static String[] TIMEPATTERNS = {"hh:mm", "hh:mm z", "HH:mm z", "HH:mm:ss z" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ }; - final private static String[] DATETIMEPATTERNS = {"M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + final private static String[] DATETIMEPATTERNS = {"M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "EEE, MM/dd/yyyy HH:mm:ss z", "MMM d, yyyy HH:mm z", "EEE, MMM d, yyyy HH:mm z", "MMMM d, yyyy HH:mm z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "EEEE, MMMM d, yyyy HH:mm z" //$NON-NLS-1$ }; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LocaleType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LocaleType.java index 29607ca36..cb04fdef3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LocaleType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LocaleType.java @@ -36,7 +36,7 @@ public class LocaleType extends MultiSignatureEnumerationType implements IPossib private List<IPossibleValue> _pvs; @Override protected String[] getReturnTypes() { - return new String[]{"java.util.Locale", "java.lang.String"}; //$NON-NLS-1$ //$NON-NLS-2$ + return new String[]{"java.util.Locale", "java.lang.String"}; //$NON-NLS-1$ } public List getPossibleValues() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java index 3409958d5..4c07e0e22 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java @@ -51,7 +51,7 @@ public class MethodBindingType extends ExpressionBindingType implements IValidEL } else { - JSFCorePlugin.log(IStatus.INFO, "Missing metadata for trait "+RUNTIME_RETURN_TYPE+" for entity "+getMetaDataContext().getEntity()); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log(IStatus.INFO, "Missing metadata for trait "+RUNTIME_RETURN_TYPE+" for entity "+getMetaDataContext().getEntity()); } if (returnTypeSignature == null) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/ELValidationPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/ELValidationPreferences.java index d66733274..b96918d5e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/ELValidationPreferences.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/ELValidationPreferences.java @@ -27,11 +27,11 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; public class ELValidationPreferences implements IJSFPreferenceModel { private final static String KEY_ENABLE_BUILD_VALIDATION = - "org.eclipse.jst.jsf.ui.ValidateJSFELBuild"; //$NON-NLS-1$ + "org.eclipse.jst.jsf.ui.ValidateJSFELBuild"; private final static boolean DEFAULT_ENABLE_BUILD_VALIDATION = true; private final static String KEY_ENABLE_INCREMENTAL_VALIDATION = - "org.eclipse.jst.jsf.ui.ValidateJSFELIncremental"; //$NON-NLS-1$ + "org.eclipse.jst.jsf.ui.ValidateJSFELIncremental"; private final static boolean DEFAULT_ENABLE_INCREMENTAL_VALIDATION = false; @@ -161,17 +161,17 @@ public class ELValidationPreferences implements IJSFPreferenceModel // ignore context for now; will be used when we have project overrides if (KEY_ENABLE_BUILD_VALIDATION.equals(key)) { - return Boolean.valueOf(context.getNode("org.eclipse.jst.jsf.ui").getBoolean(key, true)); //$NON-NLS-1$ + return Boolean.valueOf(context.getNode("org.eclipse.jst.jsf.ui").getBoolean(key, true)); } else if (KEY_ENABLE_INCREMENTAL_VALIDATION.equals(key)) { - return Boolean.valueOf(context.getNode("org.eclipse.jst.jsf.ui").getBoolean(key, false)); //$NON-NLS-1$ + return Boolean.valueOf(context.getNode("org.eclipse.jst.jsf.ui").getBoolean(key, false)); } else { try { - return context.getNode("org.eclipse.jst.jsf.core").get(key, mapDiagToSeverity(getDefaultSeverity(getIdByKey(key))).toString()); //$NON-NLS-1$ + return context.getNode("org.eclipse.jst.jsf.core").get(key, mapDiagToSeverity(getDefaultSeverity(getIdByKey(key))).toString()); } catch (IllegalArgumentException e) { @@ -306,21 +306,21 @@ public class ELValidationPreferences implements IJSFPreferenceModel */ public static int mapSeverityToDiag(String severity) { - if ("error".equals(severity)) //$NON-NLS-1$ + if ("error".equals(severity)) { return Diagnostic.ERROR; } - else if ("warning".equals(severity)) //$NON-NLS-1$ + else if ("warning".equals(severity)) { return Diagnostic.WARNING; } - else if ("ignore".equals(severity)) //$NON-NLS-1$ + else if ("ignore".equals(severity)) { return Diagnostic.OK; } else { - throw new IllegalArgumentException("Invalid enum name: "+severity); //$NON-NLS-1$ + throw new IllegalArgumentException("Invalid enum name: "+severity); } } @@ -393,7 +393,7 @@ public class ELValidationPreferences implements IJSFPreferenceModel case DiagnosticFactory.MEMBER_IS_INTERMEDIATE_ID: return Diagnostic.WARNING; default: - throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); } } @@ -466,7 +466,7 @@ public class ELValidationPreferences implements IJSFPreferenceModel case DiagnosticFactory.MEMBER_IS_INTERMEDIATE_ID: return MEMBER_IS_INTERMEDIATE; default: - throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); } } @@ -598,7 +598,7 @@ public class ELValidationPreferences implements IJSFPreferenceModel } else { - throw new IllegalArgumentException("Severity Key: "+ key); //$NON-NLS-1$ + throw new IllegalArgumentException("Severity Key: "+ key); } } @@ -610,158 +610,158 @@ public class ELValidationPreferences implements IJSFPreferenceModel */ private static String createQualifiedKeyName(final String baseName) { - return JSFCorePlugin.PLUGIN_ID + "." + baseName; //$NON-NLS-1$ + return JSFCorePlugin.PLUGIN_ID + "." + baseName; } /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_BOTH_OPERANDS_NULL = - createQualifiedKeyName("BINARY_OP_BOTH_OPERANDS_NULL"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_BOTH_OPERANDS_NULL"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_POSSIBLE_DIVISION_BY_ZERO = - createQualifiedKeyName("BINARY_OP_POSSIBLE_DIVISION_BY_ZERO"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_POSSIBLE_DIVISION_BY_ZERO"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION = - createQualifiedKeyName("BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME = - createQualifiedKeyName("BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_CONSTANT_EXPRESSION_ALWAYS_EVAL_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME = - createQualifiedKeyName("BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_EQUALITY_COMP_WITH_NULL_ALWAYS_EVAL_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN = - createQualifiedKeyName("BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS = - createQualifiedKeyName("BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_FIRST_ARGUMENT_SHORT_CIRCUITS"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME = - createQualifiedKeyName("BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_SECOND_ARGUMENT_ALWAYS_EVAL_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_NO_AVAILABLE_TYPE_COERCION = - createQualifiedKeyName("BINARY_OP_NO_AVAILABLE_TYPE_COERCION"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_NO_AVAILABLE_TYPE_COERCION"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS = - createQualifiedKeyName("BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_COULD_NOT_COERCE_LITERALS_TO_NUMBERS"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME = - createQualifiedKeyName("UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE = - createQualifiedKeyName("UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_EMPTY_ALWAYS_FALSE_ON_TYPE"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO = - createQualifiedKeyName("UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_MINUS_ON_NULL_ALWAYS_ZERO"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION = - createQualifiedKeyName("UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_COULD_NOT_MAKE_NUMERIC_COERCION"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN = - createQualifiedKeyName("UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN"); /** * preference key. Match to DiagnosticFactory constants */ public final static String TERNARY_OP_CHOICE_IS_ALWAYS_SAME = - createQualifiedKeyName("TERNARY_OP_CHOICE_IS_ALWAYS_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("TERNARY_OP_CHOICE_IS_ALWAYS_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String TERNARY_OP_CANNOT_COERCE_CHOICE_TO_BOOLEAN = - createQualifiedKeyName("TERNARY_OP_CANNOT_COERCE_CHOICE_TO_BOOLEAN"); //$NON-NLS-1$ + createQualifiedKeyName("TERNARY_OP_CANNOT_COERCE_CHOICE_TO_BOOLEAN"); /** * preference key. Match to DiagnosticFactory constants */ public final static String UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED = - createQualifiedKeyName("UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED"); //$NON-NLS-1$ + createQualifiedKeyName("UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED"); /** * preference key. Match to DiagnosticFactory constants */ public final static String CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING = - createQualifiedKeyName("CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING"); //$NON-NLS-1$ + createQualifiedKeyName("CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING"); /** * preference key. Match to DiagnosticFactory constants */ public final static String MEMBER_NOT_FOUND = - createQualifiedKeyName("MEMBER_NOT_FOUND"); //$NON-NLS-1$ + createQualifiedKeyName("MEMBER_NOT_FOUND"); /** * preference key. Match to DiagnosticFactory constants */ public final static String VARIABLE_NOT_FOUND = - createQualifiedKeyName("VARIABLE_NOT_FOUND"); //$NON-NLS-1$ + createQualifiedKeyName("VARIABLE_NOT_FOUND"); /** * preference key. Match to DiagnosticFactory constants */ public final static String MISSING_CLOSING_EXPR_BRACKET = - createQualifiedKeyName("MISSING_CLOSING_EXPR_BRACKET"); //$NON-NLS-1$ + createQualifiedKeyName("MISSING_CLOSING_EXPR_BRACKET"); /** * preference key. Match to DiagnosticFactory constants */ public final static String GENERAL_SYNTAX_ERROR = - createQualifiedKeyName("GENERAL_SYNTAX_ERROR"); //$NON-NLS-1$ + createQualifiedKeyName("GENERAL_SYNTAX_ERROR"); /** * preference key. Match to DiagnosticFactory constants */ public final static String EMPTY_EL_EXPRESSION = - createQualifiedKeyName("EMPTY_EL_EXPRESSION"); //$NON-NLS-1$ + createQualifiedKeyName("EMPTY_EL_EXPRESSION"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_DOT_WITH_VALUEB_NULL = - createQualifiedKeyName("BINARY_OP_DOT_WITH_VALUEB_NULL"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_DOT_WITH_VALUEB_NULL"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_DOT_WITH_DOTTED_KEY_SHOULD_USE_ARRAY = - createQualifiedKeyName("BINARY_OP_DOT_WITH_DOTTED_KEY_SHOULD_USE_ARRAY"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_DOT_WITH_DOTTED_KEY_SHOULD_USE_ARRAY"); /** * preference key. Match to DiagnosticFactory constants */ public final static String POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS = - createQualifiedKeyName("POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS"); //$NON-NLS-1$ + createQualifiedKeyName("POSSIBLE_ARRAY_INDEX_OUT_OF_BOUNDS"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME = - createQualifiedKeyName("BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_COMPARISON_WITH_ENUM_ALWAYS_SAME"); /** * preference key. Match to DiagnosticFactory constants */ public final static String BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE = - createQualifiedKeyName("BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE"); //$NON-NLS-1$ + createQualifiedKeyName("BINARY_OP_COMPARISON_OF_ENUMS_INCOMPATIBLE"); /** * preference key. Match to DiagnosticFactory constants */ public final static String MEMBER_IS_INTERMEDIATE = - createQualifiedKeyName("MEMBER_IS_INTERMEDIATE"); //$NON-NLS-1$ + createQualifiedKeyName("MEMBER_IS_INTERMEDIATE"); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFTypeComparatorPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFTypeComparatorPreferences.java index f00c7f11d..9a6a537cd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFTypeComparatorPreferences.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFTypeComparatorPreferences.java @@ -126,7 +126,7 @@ public class JSFTypeComparatorPreferences extends TypeComparatorPreferences { try { - return context.getNode("org.eclipse.jst.jsf.core").get( //$NON-NLS-1$ + return context.getNode("org.eclipse.jst.jsf.core").get( key, mapDiagToSeverity(getDefaultSeverity(getIdByKey(key))) .toString()); @@ -218,21 +218,21 @@ public class JSFTypeComparatorPreferences extends TypeComparatorPreferences */ public static int mapSeverityToDiag(String severity) { - if ("error".equals(severity)) //$NON-NLS-1$ + if ("error".equals(severity)) { return Diagnostic.ERROR; } - else if ("warning".equals(severity)) //$NON-NLS-1$ + else if ("warning".equals(severity)) { return Diagnostic.WARNING; } - else if ("ignore".equals(severity)) //$NON-NLS-1$ + else if ("ignore".equals(severity)) { return Diagnostic.OK; } else { - throw new IllegalArgumentException("Invalid enum name: " + severity); //$NON-NLS-1$ + throw new IllegalArgumentException("Invalid enum name: " + severity); } } @@ -258,8 +258,8 @@ public class JSFTypeComparatorPreferences extends TypeComparatorPreferences case TypeComparatorDiagnosticFactory.VALUE_EXPRESSION_EXPECTED_ID: return VALUE_EXPRESSION_EXPECTED; default: - throw new IllegalArgumentException("Diagnostic Id: " //$NON-NLS-1$ - + diagnosticId + " is out of range"); //$NON-NLS-1$ + throw new IllegalArgumentException("Diagnostic Id: " + + diagnosticId + " is out of range"); } } @@ -296,7 +296,7 @@ public class JSFTypeComparatorPreferences extends TypeComparatorPreferences } else { - throw new IllegalArgumentException("Severity Key: " + key); //$NON-NLS-1$ + throw new IllegalArgumentException("Severity Key: " + key); } } @@ -309,31 +309,31 @@ public class JSFTypeComparatorPreferences extends TypeComparatorPreferences */ private static String createQualifiedKeyName(final String baseName) { - return JSFCorePlugin.PLUGIN_ID + "." + baseName; //$NON-NLS-1$ + return JSFCorePlugin.PLUGIN_ID + "." + baseName; } /** * preference key. Match to DiagnosticFactory constants */ - public final static String INCOMPATIBLE_METHOD_TYPES = createQualifiedKeyName("INCOMPATIBLE_METHOD_TYPES"); //$NON-NLS-1$ + public final static String INCOMPATIBLE_METHOD_TYPES = createQualifiedKeyName("INCOMPATIBLE_METHOD_TYPES"); /** * preference key. Match to DiagnosticFactory constants */ - public final static String INCOMPATIBLE_TYPES = createQualifiedKeyName("INCOMPATIBLE_TYPES"); //$NON-NLS-1$ + public final static String INCOMPATIBLE_TYPES = createQualifiedKeyName("INCOMPATIBLE_TYPES"); /** * preference key. Match to DiagnosticFactory constants */ - public final static String METHOD_EXPRESSION_EXPECTED = createQualifiedKeyName("METHOD_EXPRESSION_EXPECTED"); //$NON-NLS-1$ + public final static String METHOD_EXPRESSION_EXPECTED = createQualifiedKeyName("METHOD_EXPRESSION_EXPECTED"); /** * preference key. Match to DiagnosticFactory constants */ - public final static String PROPERTY_NOT_READABLE = createQualifiedKeyName("PROPERTY_NOT_READABLE"); //$NON-NLS-1$ + public final static String PROPERTY_NOT_READABLE = createQualifiedKeyName("PROPERTY_NOT_READABLE"); /** * preference key. Match to DiagnosticFactory constants */ - public final static String PROPERTY_NOT_WRITABLE = createQualifiedKeyName("PROPERTY_NOT_WRITABLE"); //$NON-NLS-1$ + public final static String PROPERTY_NOT_WRITABLE = createQualifiedKeyName("PROPERTY_NOT_WRITABLE"); /** * preference key. Match to DiagnosticFactory constants */ - public final static String VALUE_EXPRESSION_EXPECTED = createQualifiedKeyName("VALUE_EXPRESSION_EXPECTED"); //$NON-NLS-1$ + public final static String VALUE_EXPRESSION_EXPECTED = createQualifiedKeyName("VALUE_EXPRESSION_EXPECTED"); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFValidationContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFValidationContext.java index 0901a0e74..baae123b1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFValidationContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSFValidationContext.java @@ -11,7 +11,9 @@ package org.eclipse.jst.jsf.validation.internal; import org.eclipse.core.resources.IFile; +import org.eclipse.jst.jsf.designtime.DTAppManagerUtil; import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler; +import org.eclipse.jst.jsf.designtime.internal.view.IViewRootHandle; import org.eclipse.jst.jsf.designtime.resolver.IStructuredDocumentSymbolResolverFactory; import org.eclipse.jst.jsf.validation.internal.IJSFViewValidator.IValidationReporter; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; @@ -32,6 +34,8 @@ public final class JSFValidationContext private final IFile _file; private final IValidationReporter _reporter; private final IStructuredDocumentSymbolResolverFactory _symbolResolverFactory; + // defer initializing this until is asked for because it is expensive + private IViewRootHandle _viewRootHandle; /** * @param isIncremental -- @@ -133,4 +137,23 @@ public final class JSFValidationContext return _symbolResolverFactory; } + /** + * This method will be long running on first call, since it has to update + * the view root if not initialized. + * + * @return the view root handle + */ + public IViewRootHandle getViewRootHandle() + { + if (_viewRootHandle == null) + { + _viewRootHandle = DTAppManagerUtil.getViewRootHandle(_file); + if (_viewRootHandle.getCachedViewRoot() == null) + { + _viewRootHandle.updateViewRoot(); + } + } + return _viewRootHandle; + } + } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/Severity.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/Severity.java index c97b8527e..06265b060 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/Severity.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/Severity.java @@ -21,7 +21,7 @@ public enum Severity ERROR { public java.lang.String toString() { - return "error"; //$NON-NLS-1$ + return "error"; } } , @@ -31,7 +31,7 @@ public enum Severity WARNING { public java.lang.String toString() { - return "warning"; //$NON-NLS-1$ + return "warning"; } } , @@ -41,7 +41,7 @@ public enum Severity IGNORE { public java.lang.String toString() { - return "ignore"; //$NON-NLS-1$ + return "ignore"; } }; @@ -51,11 +51,11 @@ public enum Severity */ public static Severity valueOfString(String value) { - if ("error".equals(value)) //$NON-NLS-1$ + if ("error".equals(value)) { return ERROR; } - else if ("warning".equals(value)) //$NON-NLS-1$ + else if ("warning".equals(value)) { return WARNING; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/XMLViewDefnValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/XMLViewDefnValidator.java index 9de83d19e..da1f97d70 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/XMLViewDefnValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/XMLViewDefnValidator.java @@ -111,7 +111,7 @@ public class XMLViewDefnValidator implements IJSFViewValidator IStructuredModel model = null; if (DEBUG) { - System.out.println("executing JSPSemanticsValidator.validateFile"); //$NON-NLS-1$ + System.out.println("executing JSPSemanticsValidator.validateFile"); } try @@ -136,11 +136,11 @@ public class XMLViewDefnValidator implements IJSFViewValidator } catch (final CoreException e) { - JSFCorePlugin.log("Error validating JSF", e); //$NON-NLS-1$ + JSFCorePlugin.log("Error validating JSF", e); } catch (final IOException e) { - JSFCorePlugin.log("Error validating JSF", e); //$NON-NLS-1$ + JSFCorePlugin.log("Error validating JSF", e); } finally { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java index a7c0b3bef..6f5161705 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java @@ -260,11 +260,11 @@ public class AppConfigValidator extends AbstractValidator implements IValidator { final Node node = rootNodes.item(i); if (node.getNodeType() == Node.ELEMENT_NODE - && "faces-config".equals(node.getLocalName())) //$NON-NLS-1$ + && "faces-config".equals(node.getLocalName())) { final NamedNodeMap map = node.getAttributes(); // the most accurate thing is the version - final Node versionAttrib = map.getNamedItem("version"); //$NON-NLS-1$ + final Node versionAttrib = map.getNamedItem("version"); if (versionAttrib != null) { @@ -325,7 +325,7 @@ public class AppConfigValidator extends AbstractValidator implements IValidator } catch (final CoreException ce) { - JSFCorePlugin.log(ce, "Problem loading faceted project"); //$NON-NLS-1$ + JSFCorePlugin.log(ce, "Problem loading faceted project"); // fall-through and return null } return null; @@ -334,7 +334,7 @@ public class AppConfigValidator extends AbstractValidator implements IValidator private String extractVersionFromPublicId(final DocumentType docType) { final String publicId = docType.getPublicId(); - final String publicIdRegex = "-\\/\\/(.*)\\/\\/(.*)\\/\\/.*"; //$NON-NLS-1$ + final String publicIdRegex = "-\\/\\/(.*)\\/\\/(.*)\\/\\/.*"; if (publicId != null) { @@ -344,11 +344,11 @@ public class AppConfigValidator extends AbstractValidator implements IValidator if (matcher.matches()) { final String classTypeString = matcher.group(2); - final String[] classTypes = classTypeString.split("\\s+"); //$NON-NLS-1$ - + final String[] classTypes = classTypeString.split("\\s+"); + // verify that the class type is a DTD if (classTypes.length > 0 - && "DTD".equals(classTypes[0])) //$NON-NLS-1$ + && "DTD".equals(classTypes[0])) { // either 1.0 or 1.1; be most conservative String appConfigVersion = IJSFCoreConstants.JSF_VERSION_1_0; @@ -370,7 +370,7 @@ public class AppConfigValidator extends AbstractValidator implements IValidator private String extractVersionFromSystemId(final DocumentType docType) { final String systemId = docType.getSystemId(); - final String systemIdRegEx = "http:\\/\\/java.sun.com\\/dtd\\/web-facesconfig_(.*)\\.dtd"; //$NON-NLS-1$ + final String systemIdRegEx = "http:\\/\\/java.sun.com\\/dtd\\/web-facesconfig_(.*)\\.dtd"; if (systemId != null) { final Pattern pattern = Pattern.compile(systemIdRegEx); @@ -379,9 +379,9 @@ public class AppConfigValidator extends AbstractValidator implements IValidator if (matcher.matches()) { final String version = matcher.group(1); - if ("1_1".equals(version)||"1_0".equals(version)) //$NON-NLS-1$ //$NON-NLS-2$ + if ("1_1".equals(version)||"1_0".equals(version)) { - return version.replaceAll("_", "."); //$NON-NLS-1$ //$NON-NLS-2$ + return version.replaceAll("_", "."); } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java index 98b3611e7..1dc04c966 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java @@ -139,7 +139,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor */ public ActionListenerValidationVisitor(final String version) { super(FacesConfigPackage.eINSTANCE.getApplicationType_ActionListener(), - version,"javax.faces.event.ActionListener", true); //$NON-NLS-1$ + version,"javax.faces.event.ActionListener", true); } } @@ -150,7 +150,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor */ public NavigationHandlerValidationVisitor(final String version) { super(FacesConfigPackage.eINSTANCE.getApplicationType_NavigationHandler(), - version,"javax.faces.application.NavigationHandler", true); //$NON-NLS-1$ + version,"javax.faces.application.NavigationHandler", true); } } @@ -159,7 +159,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor ViewHandlerValidationVisitor(final String version) { super(FacesConfigPackage.eINSTANCE.getApplicationType_ViewHandler(), - version,"javax.faces.application.ViewHandler", true); //$NON-NLS-1$ + version,"javax.faces.application.ViewHandler", true); } } @@ -170,7 +170,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor // must a concrete class with a zero arg constructor: // JSF1.1_3.2.3.2 and JSF1.2_3.2.4.2 super(FacesConfigPackage.eINSTANCE.getApplicationType_StateManager(), - version,"javax.faces.application.StateManager", true); //$NON-NLS-1$ + version,"javax.faces.application.StateManager", true); } } @@ -179,7 +179,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor PropertyResolverValidationVisitor(final String version) { super(FacesConfigPackage.eINSTANCE.getApplicationType_PropertyResolver(), - version,"javax.faces.el.PropertyResolver", true); //$NON-NLS-1$ + version,"javax.faces.el.PropertyResolver", true); } protected void doValidate(EObject object, List messages, IFile file) { @@ -192,7 +192,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor { addMessageInfo(messages, DiagnosticFactory.create_API_DEPRECATED_AFTER_VERSION_ID - ("property-resolver", IJSFCoreConstants.FACET_VERSION_1_1, "el-resolver") //$NON-NLS-1$ //$NON-NLS-2$ + ("property-resolver", IJSFCoreConstants.FACET_VERSION_1_1, "el-resolver") , object, file); } } @@ -203,7 +203,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor VariableResolverValidationVisitor(final String version) { super(FacesConfigPackage.eINSTANCE.getApplicationType_VariableResolver(), - version, "javax.faces.el.VariableResolver", true); //$NON-NLS-1$ + version, "javax.faces.el.VariableResolver", true); } protected void doValidate(EObject object, List messages, IFile file) { @@ -215,7 +215,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor { addMessageInfo(messages, DiagnosticFactory.create_API_DEPRECATED_AFTER_VERSION_ID - ("variable-resolver", IJSFCoreConstants.JSF_VERSION_1_1, "el-resolver") //$NON-NLS-1$ //$NON-NLS-2$ + ("variable-resolver", IJSFCoreConstants.JSF_VERSION_1_1, "el-resolver") , object, file); } @@ -229,7 +229,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor // must be a class and have zero-arg constructor // JSF1.2_5.6.1.4 super(FacesConfigPackage.eINSTANCE.getApplicationType_ELResolver(), - version, "javax.el.ELResolver", true); //$NON-NLS-1$ + version, "javax.el.ELResolver", true); } protected void doValidate(EObject object, List messages, IFile file) { @@ -240,7 +240,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor { addMessageInfo(messages, DiagnosticFactory.create_API_NOT_AVAILABLE_BEFORE_VERSION - ("el-resolver", IJSFCoreConstants.JSF_VERSION_1_2, "variable-resolver or property-resolver") //$NON-NLS-1$ //$NON-NLS-2$ + ("el-resolver", IJSFCoreConstants.JSF_VERSION_1_2, "variable-resolver or property-resolver") , object, file); } else @@ -271,7 +271,7 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor protected String getFullyQualifiedName(EObject eobj) { - EStructuralFeature feature = eobj.eClass().getEStructuralFeature("textContent"); //$NON-NLS-1$ + EStructuralFeature feature = eobj.eClass().getEStructuralFeature("textContent"); if (feature != null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ClassNameEObjectValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ClassNameEObjectValidationVisitor.java index badc11e38..6ef8fa34f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ClassNameEObjectValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ClassNameEObjectValidationVisitor.java @@ -38,7 +38,7 @@ public abstract class ClassNameEObjectValidationVisitor extends { String fullyQualifiedName = getFullyQualifiedName(object); // protect against null - fullyQualifiedName = fullyQualifiedName == null ? "" : fullyQualifiedName; //$NON-NLS-1$ + fullyQualifiedName = fullyQualifiedName == null ? "" : fullyQualifiedName; addMessageInfo(messages, AppConfigValidationUtil .validateClassName(fullyQualifiedName, getInstanceOf() diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ComponentValidatorVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ComponentValidatorVisitor.java index 26f8d5b98..5ec0f3e97 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ComponentValidatorVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ComponentValidatorVisitor.java @@ -66,7 +66,7 @@ public class ComponentValidatorVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.component.UIComponent"; //$NON-NLS-1$ + return "javax.faces.component.UIComponent"; } protected EObjectValidationVisitor[] getChildNodeValidators() { @@ -116,7 +116,7 @@ public class ComponentValidatorVisitor extends EObjectValidationVisitor boolean isValid = false; if (name.getTextContent() != null - || "".equals(name.getTextContent().trim())) //$NON-NLS-1$ + || "".equals(name.getTextContent().trim())) { String nameValue = name.getTextContent().trim(); @@ -137,7 +137,7 @@ public class ComponentValidatorVisitor extends EObjectValidationVisitor if (!isValid) { addMessageInfo(messages, - DiagnosticFactory.create_MUST_BE_A_VALID_JAVA_IDENT("Facet name") //$NON-NLS-1$ + DiagnosticFactory.create_MUST_BE_A_VALID_JAVA_IDENT("Facet name") , object, file); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FacesConfigValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FacesConfigValidator.java index 8916e72bb..66c2c2848 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FacesConfigValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FacesConfigValidator.java @@ -85,7 +85,7 @@ public class FacesConfigValidator extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.event.PhaseListener"; //$NON-NLS-1$ + return "javax.faces.event.PhaseListener"; } protected EObjectValidationVisitor[] getChildNodeValidators() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FactoryValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FactoryValidationVisitor.java index 1be47377e..7ea53741d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FactoryValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/FactoryValidationVisitor.java @@ -63,7 +63,7 @@ public class FactoryValidationVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.application.ApplicationFactory"; //$NON-NLS-1$ + return "javax.faces.application.ApplicationFactory"; } @Override @@ -92,7 +92,7 @@ public class FactoryValidationVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.context.FacesContextFactory"; //$NON-NLS-1$ + return "javax.faces.context.FacesContextFactory"; } protected EObjectValidationVisitor[] getChildNodeValidators() { @@ -123,7 +123,7 @@ public class FactoryValidationVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.lifecycle.LifecycleFactory"; //$NON-NLS-1$ + return "javax.faces.lifecycle.LifecycleFactory"; } protected EObjectValidationVisitor[] getChildNodeValidators() { @@ -153,7 +153,7 @@ public class FactoryValidationVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.render.RenderKitFactory"; //$NON-NLS-1$ + return "javax.faces.render.RenderKitFactory"; } protected EObjectValidationVisitor[] getChildNodeValidators() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedBeanValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedBeanValidationVisitor.java index b121f1d26..4f4d47c16 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedBeanValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedBeanValidationVisitor.java @@ -68,7 +68,7 @@ public class ManagedBeanValidationVisitor extends EObjectValidationVisitor String classTypeValue = classType.getTextContent(); addMessageInfo(messages , AppConfigValidationUtil.validateClassName - (classTypeValue == null ? "" : classTypeValue //$NON-NLS-1$ + (classTypeValue == null ? "" : classTypeValue , null, true, // a managed bean must be a class file.getProject()) , classType, file); @@ -88,8 +88,8 @@ public class ManagedBeanValidationVisitor extends EObjectValidationVisitor managedBeanType.getManagedBeanClass().getTextContent(); if (propertyName == null || propertyClass == null - || "".equals(propertyName.trim()) //$NON-NLS-1$ - || "".equals(propertyClass.trim())) //$NON-NLS-1$ + || "".equals(propertyName.trim()) + || "".equals(propertyClass.trim())) { return; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedPropertyValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedPropertyValidationVisitor.java index 154ae2450..27dd66c60 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedPropertyValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ManagedPropertyValidationVisitor.java @@ -54,8 +54,8 @@ public class ManagedPropertyValidationVisitor extends EObjectValidationVisitor managedPropertyType.getPropertyClass().getTextContent(); if (propertyName == null || propertyClass == null - || "".equals(propertyName.trim()) //$NON-NLS-1$ - || "".equals(propertyClass.trim())) //$NON-NLS-1$ + || "".equals(propertyName.trim()) + || "".equals(propertyClass.trim())) { return; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyNameValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyNameValidationVisitor.java index 0f54e5a56..f58804dc5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyNameValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyNameValidationVisitor.java @@ -85,7 +85,7 @@ class PropertyNameValidationVisitor extends EObjectValidationVisitor { final EStructuralFeature feature = parentClassTypeObject.eClass() - .getEStructuralFeature("textContent"); //$NON-NLS-1$ + .getEStructuralFeature("textContent"); if (feature != null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java index d3f12497b..be9f5ec4d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java @@ -102,7 +102,7 @@ public class PropertyValidationVisitor extends EObjectValidationVisitor { JSFCorePlugin .log(new Exception(jme), - "Problem validating on parent: "+parentClassType); //$NON-NLS-1$ + "Problem validating on parent: "+parentClassType); } return signatureBeanProperty; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RenderKitValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RenderKitValidationVisitor.java index caf7d6c08..a7b474b05 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RenderKitValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RenderKitValidationVisitor.java @@ -63,7 +63,7 @@ public class RenderKitValidationVisitor extends EObjectValidationVisitor } protected String getInstanceOf() { - return "javax.faces.render.RenderKit"; //$NON-NLS-1$ + return "javax.faces.render.RenderKit"; } protected EObjectValidationVisitor[] getChildNodeValidators() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RendererValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RendererValidationVisitor.java index aa6a8244c..d92fabdea 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RendererValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/RendererValidationVisitor.java @@ -63,7 +63,7 @@ public class RendererValidationVisitor extends EObjectValidationVisitor { } protected String getInstanceOf() { - return "javax.faces.render.Renderer"; //$NON-NLS-1$ + return "javax.faces.render.Renderer"; } protected EObjectValidationVisitor[] getChildNodeValidators() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ValidatorTypeValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ValidatorTypeValidationVisitor.java index ff60fee54..512e3c7e8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ValidatorTypeValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ValidatorTypeValidationVisitor.java @@ -63,7 +63,7 @@ public class ValidatorTypeValidationVisitor extends EObjectValidationVisitor { } protected String getInstanceOf() { - return "javax.faces.validator.Validator"; //$NON-NLS-1$ + return "javax.faces.validator.Validator"; } protected EObjectValidationVisitor[] getChildNodeValidators() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ConstraintsPackage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ConstraintsPackage.java index 2347907b0..5e140ea18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ConstraintsPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ConstraintsPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstraintsPackage.java,v 1.5 2008/11/18 22:24:09 gkessler Exp $ + * $Id: ConstraintsPackage.java,v 1.4 2008/02/01 21:52:24 gkessler Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints; @@ -34,7 +34,7 @@ public interface ConstraintsPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNAME = "constraints"; //$NON-NLS-1$ + String eNAME = "constraints"; /** * The package namespace URI. @@ -42,7 +42,7 @@ public interface ConstraintsPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://org.eclipse.jst.jsf.core/constraints.ecore"; //$NON-NLS-1$ + String eNS_URI = "http://org.eclipse.jst.jsf.core/constraints.ecore"; /** * The package namespace name. @@ -50,7 +50,7 @@ public interface ConstraintsPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "cnst"; //$NON-NLS-1$ + String eNS_PREFIX = "cnst"; /** * The singleton instance of the package. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsFactoryImpl.java index e2b10e5d2..f83091de0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstraintsFactoryImpl.java,v 1.3 2008/11/18 22:23:52 gkessler Exp $ + * $Id: ConstraintsFactoryImpl.java,v 1.2 2007/03/22 23:56:16 cbateman Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints.impl; @@ -32,7 +32,7 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF */ public static ConstraintsFactory init() { try { - ConstraintsFactory theConstraintsFactory = (ConstraintsFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.core/constraints.ecore"); //$NON-NLS-1$ + ConstraintsFactory theConstraintsFactory = (ConstraintsFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.core/constraints.ecore"); if (theConstraintsFactory != null) { return theConstraintsFactory; } @@ -66,7 +66,7 @@ public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsF case ConstraintsPackage.TAG_SET: return createTagSet(); case ConstraintsPackage.CONTAINS_TAG_CONSTRAINT: return createContainsTagConstraint(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java index 7e1547e8f..fc60ec767 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstraintsPackageImpl.java,v 1.4 2008/11/18 22:23:52 gkessler Exp $ + * $Id: ConstraintsPackageImpl.java,v 1.3 2007/04/16 19:53:19 itrimble Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints.impl; @@ -262,16 +262,16 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP // Add supertypes to classes // Initialize classes and features; add operations and parameters - initEClass(tagIdEClass, TagId.class, "TagId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getTagId_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, TagId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getTagId_Name(), ecorePackage.getEString(), "name", null, 0, 1, TagId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagIdEClass, TagId.class, "TagId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTagId_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, TagId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTagId_Name(), ecorePackage.getEString(), "name", null, 0, 1, TagId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tagSetEClass, TagSet.class, "TagSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getTagSet_Tags(), this.getTagId(), null, "tags", null, 0, -1, TagSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(tagSetEClass, TagSet.class, "TagSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTagSet_Tags(), this.getTagId(), null, "tags", null, 0, -1, TagSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(containsTagConstraintEClass, ContainsTagConstraint.class, "ContainsTagConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getContainsTagConstraint_SetGenerator(), theTraitTypesPackage.getSetGenerator(), null, "setGenerator", null, 0, 1, ContainsTagConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEReference(getContainsTagConstraint_SatisfiesSet(), this.getTagSet(), null, "satisfiesSet", null, 0, 1, ContainsTagConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(containsTagConstraintEClass, ContainsTagConstraint.class, "ContainsTagConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getContainsTagConstraint_SetGenerator(), theTraitTypesPackage.getSetGenerator(), null, "setGenerator", null, 0, 1, ContainsTagConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getContainsTagConstraint_SatisfiesSet(), this.getTagSet(), null, "satisfiesSet", null, 0, 1, ContainsTagConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -288,41 +288,41 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation (getTagId_Uri(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "uri" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "uri" }); addAnnotation (getTagId_Name(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "name" }); addAnnotation (getTagSet_Tags(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "tagId" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "tagId" }); addAnnotation (getContainsTagConstraint_SetGenerator(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "set-generator" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "set-generator" }); addAnnotation (getContainsTagConstraint_SatisfiesSet(), source, new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "satisfies-set" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", + "name", "satisfies-set" }); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/TagIdImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/TagIdImpl.java index be7dbce24..a4f9985e2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/TagIdImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/TagIdImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagIdImpl.java,v 1.2 2008/11/18 22:23:52 gkessler Exp $ + * $Id: TagIdImpl.java,v 1.1 2007/02/28 21:16:02 cbateman Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints.impl; @@ -204,9 +204,9 @@ public class TagIdImpl extends EObjectImpl implements TagId { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (uri: "); //$NON-NLS-1$ + result.append(" (uri: "); result.append(uri); - result.append(", name: "); //$NON-NLS-1$ + result.append(", name: "); result.append(name); result.append(')'); return result.toString(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java index d463e47a6..e8b2ba910 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java @@ -125,7 +125,7 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal { if (node.jjtGetNumChildren() != 3) { - throw new AssertionError("Binary operators should always have two sub-expressions"); //$NON-NLS-1$ + throw new AssertionError("Binary operators should always have two sub-expressions"); } // evaluate choice argument @@ -190,7 +190,7 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal // are all terminals (leafs in the tree) if (node.jjtGetNumChildren() > 0) { - throw new AssertionError("Literals should be terminal"); //$NON-NLS-1$ + throw new AssertionError("Literals should be terminal"); } LiteralType type = null; @@ -224,7 +224,7 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal break; default: - JSFCorePlugin.log("Unknown EL literal: " +literalToken.toString(), new Throwable("This throwable simply used to mark a stack trace")); //$NON-NLS-1$ //$NON-NLS-2$ + JSFCorePlugin.log("Unknown EL literal: " +literalToken.toString(), new Throwable("This throwable simply used to mark a stack trace")); } ((EvaluationTracker)data).setType(type); @@ -233,8 +233,8 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal private String stripQuotes(final String stringLiteral) { - if (stringLiteral.startsWith("'") //$NON-NLS-1$ - || stringLiteral.startsWith("\"")) //$NON-NLS-1$ + if (stringLiteral.startsWith("'") + || stringLiteral.startsWith("\"")) { if (stringLiteral.length() > 2) @@ -243,7 +243,7 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal return stringLiteral.substring(1, stringLiteral.length()-1); } // if only two characters, then the empty string - return ""; //$NON-NLS-1$ + return ""; } return stringLiteral; @@ -503,11 +503,11 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal { if (node.jjtGetNumChildren() < 2) { - throw new AssertionError("Binary operators should always have at least two sub-expressions"); //$NON-NLS-1$ + throw new AssertionError("Binary operators should always have at least two sub-expressions"); } else if (node.getOperatorTokens().size() != node.jjtGetNumChildren()-1) { - throw new AssertionError("Binary operators should always have one operator token less than number of sub-expressions"); //$NON-NLS-1$ + throw new AssertionError("Binary operators should always have one operator token less than number of sub-expressions"); } // evaluate left-most argument @@ -588,7 +588,7 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal */ public static void main(final String[] args) throws IOException, ParseException { - String elText = ""; //$NON-NLS-1$ + String elText = ""; int nextCharacter; while(((nextCharacter = System.in.read()) != -1)) @@ -599,9 +599,9 @@ class ASTSemanticValidator implements JSPELParserVisitor, IExpressionSemanticVal { final JSPELParser parser = JSPELParser.createParser(elText); final ASTExpression expr = parser.Expression(); - expr.dump(""); //$NON-NLS-1$ + expr.dump(""); - elText = ""; //$NON-NLS-1$ + elText = ""; } else { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AddArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AddArithmeticBinaryOperator.java index 755a447c9..e1975f0a0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AddArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AddArithmeticBinaryOperator.java @@ -24,7 +24,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; */ /*package*/ class AddArithmeticBinaryOperator extends NoDivArithmeticBinaryOperator { - private static final String ADDITION = "addition"; //$NON-NLS-1$ + private static final String ADDITION = "addition"; AddArithmeticBinaryOperator(DiagnosticFactory diagnosticFactory) { super(diagnosticFactory); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AndBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AndBinaryOperator.java index 2ef4a2523..2ce58ce6d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AndBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/AndBinaryOperator.java @@ -36,7 +36,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; protected String readableOperatorName() { - return "logical-AND"; //$NON-NLS-1$ + return "logical-AND"; } protected boolean shortCircuitValue() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java index 88e25d874..4cfc74ebb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java @@ -34,7 +34,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; */ public class BracketOperator extends MemberAccessorOperator { - private static final String OPERATOR_NAME_ARRAY_ACCESSOR = "array ('[]') accessor"; //$NON-NLS-1$ + private static final String OPERATOR_NAME_ARRAY_ACCESSOR = "array ('[]') accessor"; /** * @param diagnosticFactory @@ -160,6 +160,6 @@ public class BracketOperator extends MemberAccessorOperator @Override protected String getOperatorName() { - return Messages.getString("BracketOperator.Name"); //$NON-NLS-1$ + return Messages.getString("BracketOperator.Name"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DivArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DivArithmeticBinaryOperator.java index c41f8ebdd..b1d3059df 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DivArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DivArithmeticBinaryOperator.java @@ -37,7 +37,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; /*package*/ class DivArithmeticBinaryOperator extends ArithmeticBinaryOperator { - private static final String DIVISION = "division"; //$NON-NLS-1$ + private static final String DIVISION = "division"; DivArithmeticBinaryOperator(DiagnosticFactory diagnosticFactory) { super(diagnosticFactory); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DotOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DotOperator.java index 207e4d399..72720ce3c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DotOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/DotOperator.java @@ -65,6 +65,6 @@ public class DotOperator extends MemberAccessorOperator @Override protected String getOperatorName() { - return Messages.getString("DotOperator.Name"); //$NON-NLS-1$ + return Messages.getString("DotOperator.Name"); } }
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/EmptyUnaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/EmptyUnaryOperator.java index 8da62be01..812d1cb00 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/EmptyUnaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/EmptyUnaryOperator.java @@ -30,7 +30,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; */ /*package*/ class EmptyUnaryOperator extends UnaryOperator { - private static final String EMPTY = "empty"; //$NON-NLS-1$ + private static final String EMPTY = "empty"; EmptyUnaryOperator(DiagnosticFactory diagnosticFactory) { @@ -41,7 +41,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; { if (type instanceof StringLiteralType) { - if ("".equals(((StringLiteralType)type).getLiteralValue())) //$NON-NLS-1$ + if ("".equals(((StringLiteralType)type).getLiteralValue())) { // if the string is empty, operator always returns true return BooleanLiteralType.TRUE; @@ -83,13 +83,13 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; { String condition; - if ("".equals(((StringLiteralType)type).getLiteralValue())) //$NON-NLS-1$ + if ("".equals(((StringLiteralType)type).getLiteralValue())) { - condition = "true"; //$NON-NLS-1$ + condition = "true"; } else { - condition = "false"; //$NON-NLS-1$ + condition = "false"; } return _diagnosticFactory. @@ -102,7 +102,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; { return _diagnosticFactory. create_UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID - (EMPTY,"true"); //$NON-NLS-1$ + (EMPTY,"true"); } // if the type is not string, array, Map, or Collection warn that diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/LogicalBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/LogicalBinaryOperator.java index e76d5ef07..41b897fea 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/LogicalBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/LogicalBinaryOperator.java @@ -59,7 +59,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; catch (TypeCoercionException tce) { // should never be throw due to already checking if can coerce - throw new AssertionError("coercion already checked; this should never be reached"); //$NON-NLS-1$ + throw new AssertionError("coercion already checked; this should never be reached"); } } @@ -73,7 +73,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; catch (TypeCoercionException tce) { // should never be throw due to already checking if can coerce - throw new AssertionError("coercion already checked; this should never be reached"); //$NON-NLS-1$ + throw new AssertionError("coercion already checked; this should never be reached"); } } @@ -101,14 +101,14 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; if (!canCoerceFirstArg) { return _diagnosticFactory. - create_BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN("first"); //$NON-NLS-1$ + create_BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN("first"); //return new BasicDiagnostic(Diagnostic.ERROR, "", 0, "Cannot coerce first argument of "+readableOperatorName()+" to boolean", null); } if (!canCoerceSecondArg) { return _diagnosticFactory. - create_BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN("first"); //$NON-NLS-1$ + create_BINARY_OP_CANNOT_COERCE_ARGUMENT_TO_BOOLEAN("first"); //return new BasicDiagnostic(Diagnostic.ERROR, "", 0, "Cannot coerce second argument of "+readableOperatorName()+" to boolean", null); } @@ -130,7 +130,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; catch (TypeCoercionException tce) { // should never be throw due to already checking if can coerce - throw new AssertionError("coercion already checked; this should never be reached"); //$NON-NLS-1$ + throw new AssertionError("coercion already checked; this should never be reached"); } } @@ -151,7 +151,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; catch (TypeCoercionException tce) { // should never be throw due to already checking if can coerce - throw new AssertionError("coercion already checked; this should never be reached"); //$NON-NLS-1$ + throw new AssertionError("coercion already checked; this should never be reached"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java index 738f20170..505a12527 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java @@ -74,7 +74,7 @@ public abstract class MemberAccessorOperator if (!(firstArg instanceof IObjectSymbolBasedValueType)) { throw new AssertionError( - "The first argument of the member operator must always be a symbol resolvable value type"); //$NON-NLS-1$ + "The first argument of the member operator must always be a symbol resolvable value type"); } if (TypeCoercer.typeIsNull(secondArg.getSignature())) @@ -246,7 +246,7 @@ public abstract class MemberAccessorOperator return resolver.getProperty(symbol, name); } - JSFCorePlugin.log("Error acquiring property resolver", new Throwable()); //$NON-NLS-1$ + JSFCorePlugin.log("Error acquiring property resolver", new Throwable()); return null; } @@ -266,7 +266,7 @@ public abstract class MemberAccessorOperator return resolver.getMethod(symbol, name); } - JSFCorePlugin.log("Error acquiring property resolver", new Throwable()); //$NON-NLS-1$ + JSFCorePlugin.log("Error acquiring property resolver", new Throwable()); return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MinusUnaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MinusUnaryOperator.java index 1c4f9ed32..7dcdc3b8d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MinusUnaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MinusUnaryOperator.java @@ -36,7 +36,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; */ /*package*/class MinusUnaryOperator extends UnaryOperator { - private static final String UNARY_MINUS = "unary minus"; //$NON-NLS-1$ + private static final String UNARY_MINUS = "unary minus"; MinusUnaryOperator(DiagnosticFactory diagnosticFactory) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/ModArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/ModArithmeticBinaryOperator.java index 4d6b01f08..ba4765b65 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/ModArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/ModArithmeticBinaryOperator.java @@ -37,7 +37,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; */ /*package*/ class ModArithmeticBinaryOperator extends ArithmeticBinaryOperator { - private static final String MODULO = "modulo"; //$NON-NLS-1$ + private static final String MODULO = "modulo"; ModArithmeticBinaryOperator(DiagnosticFactory diagnosticFactory) { super(diagnosticFactory); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MultiplyArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MultiplyArithmeticBinaryOperator.java index 605ce470a..70766224c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MultiplyArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MultiplyArithmeticBinaryOperator.java @@ -25,7 +25,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; /*package*/ class MultiplyArithmeticBinaryOperator extends NoDivArithmeticBinaryOperator { - private static final String MULTIPLICATION = "multiplication"; //$NON-NLS-1$ + private static final String MULTIPLICATION = "multiplication"; MultiplyArithmeticBinaryOperator(DiagnosticFactory diagnosticFactory) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NoDivArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NoDivArithmeticBinaryOperator.java index 8f11373d1..5bdc163fc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NoDivArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NoDivArithmeticBinaryOperator.java @@ -190,7 +190,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; } else { - throw new AssertionError("unsupport arithmetic upcast type"); //$NON-NLS-1$ + throw new AssertionError("unsupport arithmetic upcast type"); } return result; @@ -269,7 +269,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; } else { - throw new AssertionError("unsupport arithmetic upcast type"); //$NON-NLS-1$ + throw new AssertionError("unsupport arithmetic upcast type"); } return _diagnosticFactory. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NotUnaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NotUnaryOperator.java index 3a3b070b0..dd1d5db1a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NotUnaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/NotUnaryOperator.java @@ -53,13 +53,13 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; // we are logically notting, so coerced is true, then false // if false then true return _diagnosticFactory.create_UNARY_OP_CONSTANT_EXPRESSION_EVAL_SAME_ID( - "not" //$NON-NLS-1$ + "not" , Boolean.valueOf(!coercedValue.booleanValue()).toString()); } catch (TypeCoercionException tce) { - throw new AssertionError("coerce should not throw exception"); //$NON-NLS-1$ + throw new AssertionError("coerce should not throw exception"); } } @@ -90,7 +90,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; } catch (TypeCoercionException tce) { - throw new AssertionError("coerce should not throw exception"); //$NON-NLS-1$ + throw new AssertionError("coerce should not throw exception"); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/OrBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/OrBinaryOperator.java index 4914704d8..33bd4be7f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/OrBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/OrBinaryOperator.java @@ -35,7 +35,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; protected String readableOperatorName() { - return "logical-OR"; //$NON-NLS-1$ + return "logical-OR"; } protected boolean shortCircuitValue() diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/SubtractArithmeticBinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/SubtractArithmeticBinaryOperator.java index acdaeda13..2879cec03 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/SubtractArithmeticBinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/SubtractArithmeticBinaryOperator.java @@ -26,7 +26,7 @@ import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; NoDivArithmeticBinaryOperator { - private static final String SUBTRACTION = "subtraction"; //$NON-NLS-1$ + private static final String SUBTRACTION = "subtraction"; SubtractArithmeticBinaryOperator(DiagnosticFactory diagnosticFactory) { super(diagnosticFactory); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java index 2cb457e83..c50d8ab44 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java @@ -112,7 +112,7 @@ public class TernaryChoiceOperator if (result != null) { - String whichSelected = result.booleanValue() ? "first" : "second"; //$NON-NLS-1$ //$NON-NLS-2$ + String whichSelected = result.booleanValue() ? "first" : "second"; return _diagnosticFactory. create_TERNARY_OP_CHOICE_IS_ALWAYS_SAME (result.booleanValue(), whichSelected); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/UnaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/UnaryOperator.java index 5161e4650..d6a075999 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/UnaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/UnaryOperator.java @@ -51,7 +51,7 @@ public abstract class UnaryOperator { if (!isUnaryOperator(token)) { - throw new IllegalArgumentException("token must be a unary operator"); //$NON-NLS-1$ + throw new IllegalArgumentException("token must be a unary operator"); } switch(token.kind) diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/AttributeValidatingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/AttributeValidatingStrategy.java index 9963d7be1..a42828c6e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/AttributeValidatingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/AttributeValidatingStrategy.java @@ -48,7 +48,6 @@ import org.eclipse.jst.jsf.core.internal.region.Region2ElementAdapter; import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.designtime.DTAppManagerUtil; import org.eclipse.jst.jsf.designtime.internal.view.DTUIViewRoot; -import org.eclipse.jst.jsf.designtime.internal.view.IViewRootHandle; import org.eclipse.jst.jsf.designtime.internal.view.XMLViewDefnAdapter; import org.eclipse.jst.jsf.designtime.internal.view.XMLViewObjectMappingService; import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerException; @@ -103,8 +102,7 @@ AbstractXMLViewValidationStrategy * * @param validationContext */ - public AttributeValidatingStrategy( - final JSFValidationContext validationContext) + public AttributeValidatingStrategy(final JSFValidationContext validationContext) { super(ID, DISPLAY_NAME); @@ -125,6 +123,7 @@ AbstractXMLViewValidationStrategy { if (domAdapter instanceof AttrDOMAdapter) { + final long curTime = System.nanoTime(); final Region2AttrAdapter attrAdapter = (Region2AttrAdapter) domAdapter; // check that this is attribute value region - 221722 if (attrAdapter.getAttributeValueRegion() != null) @@ -139,6 +138,12 @@ AbstractXMLViewValidationStrategy validateAttributeValue(context, attrAdapter); } + if (DEBUG) + { + System.out.println(String.format("Validation for attribute: %s took %d" + , domAdapter.toString() + , Long.valueOf(System.nanoTime()-curTime))); + } } } @@ -410,11 +415,11 @@ AbstractXMLViewValidationStrategy * @return true if alternative type comparison (i.e. post-conversion) passes */ private CompositeType maybeAddAlternativeTypes( - final CompositeType expectedType, - final CompositeType exprTypes, + final CompositeType expectedType, final CompositeType exprTypes, final Region2ElementAdapter elementAdapter, final Region2AttrAdapter attrAdapter) { + final long curTime = System.nanoTime(); if (disableAlternativeTypes()) { return expectedType; @@ -422,54 +427,58 @@ AbstractXMLViewValidationStrategy final IStructuredDocumentContext context = elementAdapter .getDocumentContext(); - final IViewRootHandle viewRootHandle = DTAppManagerUtil - .getViewRootHandle(context); - if (viewRootHandle != null) + final DTUIViewRoot viewRoot = _validationContext.getViewRootHandle().getCachedViewRoot(); + final IAdaptable serviceAdaptable = viewRoot.getServices(); + final XMLViewObjectMappingService mappingService = (XMLViewObjectMappingService) serviceAdaptable + .getAdapter(XMLViewObjectMappingService.class); + if (mappingService != null) { - // ok to call update view root here since validation not called - // on the UI thread. - final DTUIViewRoot viewRoot = viewRootHandle.updateViewRoot(); - final IAdaptable serviceAdaptable = viewRoot.getServices(); - final XMLViewObjectMappingService mappingService = (XMLViewObjectMappingService) serviceAdaptable - .getAdapter(XMLViewObjectMappingService.class); - if (mappingService != null) + final ElementData elementData = XMLViewObjectMappingService + .createElementData(elementAdapter.getNamespace(), + elementAdapter.getLocalName(), context, + Collections.EMPTY_MAP); + final ViewObject viewObject = mappingService + .findViewObject(elementData); + // if the corresponding view object is a valueholder, then + // we need to see if you think there a valid conversion + // available + if (viewObject instanceof ComponentInfo + && ((ComponentInfo) viewObject).getComponentTypeInfo() != null + && ((ComponentInfo) viewObject).getComponentTypeInfo() + .isInstanceOf( + ComponentFactory.INTERFACE_VALUEHOLDER)) { - final ElementData elementData = XMLViewObjectMappingService - .createElementData(elementAdapter.getNamespace(), - elementAdapter.getLocalName(), context, - Collections.EMPTY_MAP); - final ViewObject viewObject = mappingService - .findViewObject(elementData); - // if the corresponding view object is a valueholder, then - // we need to see if you think there a valid conversion - // available - if (viewObject instanceof ComponentInfo - && ((ComponentInfo) viewObject).getComponentTypeInfo() != null - && ((ComponentInfo) viewObject).getComponentTypeInfo() - .isInstanceOf( - ComponentFactory.INTERFACE_VALUEHOLDER)) + final ComponentInfo component = (ComponentInfo) viewObject; + // get the original elementData + final ElementData mappedElementData = mappingService + .findElementData(component); + final String propName = mappedElementData + .getPropertyName(attrAdapter.getLocalName()); + if ("value".equals(propName)) //$NON-NLS-1$ { - final ComponentInfo component = (ComponentInfo) viewObject; - // get the original elementData - final ElementData mappedElementData = mappingService - .findElementData(component); - final String propName = mappedElementData - .getPropertyName(attrAdapter.getLocalName()); - if ("value".equals(propName)) //$NON-NLS-1$ + // final List converters = + // component.getDecorators(ComponentFactory.CONVERTER); + + // (ConverterDecorator) it.next(); + final CompositeType alternativeTypes = createCompositeType( + expectedType, exprTypes, component + .getDecorators(ComponentFactory.CONVERTER)); + if (DEBUG) { - // final List converters = - // component.getDecorators(ComponentFactory.CONVERTER); - - // (ConverterDecorator) it.next(); - return createCompositeType( - expectedType, - exprTypes, - component - .getDecorators(ComponentFactory.CONVERTER)); + System.out.println(String.format( + "maybeAddAlternative took %d", Long.valueOf(System + .nanoTime() + - curTime))); } + return alternativeTypes; } } } + if (DEBUG) + { + System.out.println(String.format("maybeAddAlternative took %d", Long + .valueOf(System.nanoTime() - curTime))); + } // don't add anything by default return expectedType; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java index aff0083dc..2a70394e7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java @@ -54,9 +54,9 @@ public class ContainmentValidatingStrategy extends * identifier */ public final static String ID = - "org.eclipse.jst.jsf.validation.strategy.ElementValidatingStrategy"; //$NON-NLS-1$ + "org.eclipse.jst.jsf.validation.strategy.ElementValidatingStrategy"; private final static String DISPLAY_NAME = - Messages.ContainmentValidatingStrategy_DisplayName; + "Tag Containment Validator"; private final static ElementToTagIdentifierMapping elem2TagIdMapper = new ElementToTagIdentifierMapping(); private int _containmentValidationCount; // = 0; @@ -122,7 +122,7 @@ public class ContainmentValidatingStrategy extends if (entity != null) { final Trait trait = TaglibDomainMetaDataQueryHelper.getTrait( - entity, "containment-constraint"); //$NON-NLS-1$ + entity, "containment-constraint"); if (trait != null) { @@ -134,7 +134,7 @@ public class ContainmentValidatingStrategy extends // TODO: need generalized factory mechanism for registering and // constructing algorithms. - if (!"xpath".equals(algorithm)) //$NON-NLS-1$ + if (!"xpath".equals(algorithm)) { return; } @@ -156,14 +156,14 @@ public class ContainmentValidatingStrategy extends } catch (final InvalidExpressionException e) { - JSFCorePlugin.log(e, "Problem with expression: " + expr //$NON-NLS-1$ - + " on node " + node); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Problem with expression: " + expr + + " on node " + node); return; } catch (final EvaluationException e) { - JSFCorePlugin.log(e, "Problem evaluating expression: " //$NON-NLS-1$ - + expr + " on node " + node); //$NON-NLS-1$ + JSFCorePlugin.log(e, "Problem evaluating expression: " + + expr + " on node " + node); return; } @@ -202,7 +202,7 @@ public class ContainmentValidatingStrategy extends } private static final String MESSAGE_PATTERN = - "Tag {0} is missing required parent tag \"{1}\" ({2})"; //$NON-NLS-1$ + "Tag {0} is missing required parent tag \"{1}\" ({2})"; // TODO: need a diagnostic factory private void reportContainmentProblem( @@ -216,7 +216,7 @@ public class ContainmentValidatingStrategy extends {nodeName, tagName, uri}); final Diagnostic problem = - new BasicDiagnostic(severity, "", -1, msg, null); //$NON-NLS-1$ + new BasicDiagnostic(severity, "", -1, msg, null); // add one so that the start offset is at the node name, rather // than the opening brace. final int start = context.getDocumentPosition()+1; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/Messages.java deleted file mode 100644 index 2bf113d9f..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/Messages.java +++ /dev/null @@ -1,37 +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.validation.internal.strategy; - -import org.eclipse.osgi.util.NLS; - -/** - * String resource handler - * - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.validation.internal.strategy.messages"; //$NON-NLS-1$ - /** - * see messages.properties - */ - public static String AttributeValidatingStrategy_DisplayName; - /** - * see messages.properties - */ - public static String ContainmentValidatingStrategy_DisplayName; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - // - } -} diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/messages.properties deleted file mode 100644 index fbb4eed0c..000000000 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -AttributeValidatingStrategy_DisplayName=Attribute Validator -ContainmentValidatingStrategy_DisplayName=Tag Containment Validator |