diff options
2 files changed, 12 insertions, 5 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java index e90bd2692..ba3fb68af 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java @@ -44,12 +44,17 @@ public final class MetaDataModelContext implements IMetaDataModelContext { public Object getAdapter(Class adapter) { if (adapter == ModelKeyDescriptor.class) return new ModelKeyDescriptor(_project, _domainId, _modelId); + if (adapter == IProject.class) + return _project; return null; } - public IProject getProject() { - return _project; - } +// /** +// * @return project +// */ +// public IProject getProject() { +// return _project; +// } public String getDomainId() { return _domainId; @@ -62,8 +67,8 @@ public final class MetaDataModelContext implements IMetaDataModelContext { @Override public String toString() { final StringBuffer buf = new StringBuffer(); - if (getProject() != null) { - buf.append(getProject().getName()).append(":"); //$NON-NLS-1$ + if (_project != null) { + buf.append(_project.getName()).append(":"); //$NON-NLS-1$ } buf.append(getDomainId()).append(":"); //$NON-NLS-1$ buf.append(getModelIdentifier()).append(":"); //$NON-NLS-1$ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java index 26a678a64..4f8f4ad99 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java @@ -52,6 +52,8 @@ public class TaglibDomainMetaDataModelContextImpl extends MetaDataModelContextIm public Object getAdapter(Class adapter) { if (adapter.equals(ITaglibDomainMetaDataModelContext.class)) return this; + if (adapter.equals(IProject.class)) + return _project; return super.getAdapter(adapter); } |