possible NPE handled.
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/extensions/codecompletion/ScoutSdkProposalComputer.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/extensions/codecompletion/ScoutSdkProposalComputer.java
index 906e3c9..6d0685c 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/extensions/codecompletion/ScoutSdkProposalComputer.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/extensions/codecompletion/ScoutSdkProposalComputer.java
@@ -58,10 +58,10 @@
IJavaElement element = coreContext.getEnclosingElement();
if (TypeUtility.exists(element)) {
if (element.getElementType() == IJavaElement.TYPE) {
- IType declaringType = TypeUtility.getType(((IType) element).getFullyQualifiedName());
- int startOffset = coreContext.getTokenStart();
-
// don't directly use the element (AssistSourceType) because it has invalid source ranges!
+ IType declaringType = TypeUtility.getType(((IType) element).getFullyQualifiedName());
+
+ int startOffset = coreContext.getTokenStart();
ITypeHierarchy supertypeHierarchy = TypeUtility.getSupertypeHierarchy(declaringType);
if (supertypeHierarchy.contains(TypeUtility.getType(IRuntimeClasses.ICodeType))
|| supertypeHierarchy.contains(TypeUtility.getType(IRuntimeClasses.ICode))) {
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/outline/ScoutExplorerPart.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/outline/ScoutExplorerPart.java
index e0a98d3..18009cd 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/outline/ScoutExplorerPart.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/outline/ScoutExplorerPart.java
@@ -77,6 +77,7 @@
import org.eclipse.scout.sdk.ui.view.outline.pages.IPage;
import org.eclipse.scout.sdk.ui.view.outline.pages.IPageFilter;
import org.eclipse.scout.sdk.ui.view.outline.pages.IScoutPageConstants;
+import org.eclipse.scout.sdk.workspace.IScoutBundle;
import org.eclipse.scout.sdk.workspace.IScoutWorkspaceListener;
import org.eclipse.scout.sdk.workspace.ScoutWorkspaceEvent;
import org.eclipse.swt.SWT;
@@ -213,7 +214,8 @@
return CONTINUE;
}
else if (page instanceof BundleNodeGroupTablePage) {
- if (page.getParent() instanceof ProjectsTablePage || page.getParent().getScoutBundle().isBinary()) {
+ IScoutBundle b = page.getParent().getScoutBundle();
+ if (page.getParent() instanceof ProjectsTablePage || (b != null && b.isBinary())) {
expandedPages.add(page);
}
if (!page.getScoutBundle().isBinary() && firstBundleGroup.getValue() == null) {
