| commit | c7b3d5a53ca7fbbae32eccae589a8b742a5f3c67 | [log] [tgz] |
|---|---|---|
| author | cbridgha <cbridgha> | Wed Feb 23 23:43:13 2005 +0000 |
| committer | cbridgha <cbridgha> | Wed Feb 23 23:43:13 2005 +0000 |
| tree | 83aa5732771d23b150e4ef0d96b3e688da122a52 | |
| parent | 7205b87b8ffbde7afa64507d268dbeaad36a060e [diff] |
[nobug and 86014]: Fixed label providers for J2EE navigator extension and added Sorting capabilities for the various extensions.
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java index fb68e17..b368545 100644 --- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java +++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/edit/EditModelRegistry.java
@@ -197,7 +197,8 @@ if (this.configurationElement != null) { try { this.factory = (IEditModelFactory) this.configurationElement.createExecutableExtension(FACTORY_CLASS_ATTR); - Boolean value = Boolean.valueOf(this.configurationElement.getAttribute(LOAD_UNKNOWN_RESOURCES_ATTR)); + String loadUnknownResourceAsReadOnly = this.configurationElement.getAttribute(LOAD_UNKNOWN_RESOURCES_ATTR); + Boolean value = loadUnknownResourceAsReadOnly != null ? Boolean.valueOf(loadUnknownResourceAsReadOnly) : Boolean.FALSE; this.factory.setLoadKnownResourcesAsReadOnly(value.booleanValue()); discardConfigurationElementIfNecessary(); } catch (CoreException e) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/modulecore/ModuleCore.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/modulecore/ModuleCore.java index a195319..8d5692c 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/modulecore/ModuleCore.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/modulecore/ModuleCore.java
@@ -636,8 +636,12 @@ synchronized (dependentCores) { dependentCore = (ModuleCore) dependentCores.get(aModuleURI); if (dependentCore == null) { - dependentCore = getModuleCoreForRead(getContainingProject(aModuleURI)); - dependentCores.put(aModuleURI, dependentCore); + IProject container = getContainingProject(aModuleURI); + if(container != null) { + dependentCore = getModuleCoreForRead(container); + dependentCores.put(aModuleURI, dependentCore); + } else + throw new UnresolveableURIException(aModuleURI); } } return dependentCore;