catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
index 67085c0..d0157ea 100644
--- a/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
+++ b/org.eclipse.osbp.vaaclipse.presentation/src/org/eclipse/osbp/vaaclipse/presentation/renderers/PartRenderer.java
@@ -69,15 +69,16 @@
final MPart part = (MPart) changedObj;
IEclipseContext localContext = part.getContext();
- IContributionFactory contributionFactory = (IContributionFactory) localContext
- .get(IContributionFactory.class.getName());
- Object newPart = contributionFactory.create(part.getContributionURI(), localContext);
-
- if (part.getObject() != null) {
- ContextInjectionFactory.uninject(part.getObject(), localContext);
+ if(localContext != null) {
+ IContributionFactory contributionFactory = (IContributionFactory) localContext
+ .get(IContributionFactory.class.getName());
+ Object newPart = contributionFactory.create(part.getContributionURI(), localContext);
+
+ if (part.getObject() != null) {
+ ContextInjectionFactory.uninject(part.getObject(), localContext);
+ }
+ part.setObject(newPart);
}
-
- part.setObject(newPart);
}
};
diff --git a/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java b/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
index 115d90f..0658b2c 100644
--- a/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
+++ b/org.eclipse.osbp.vaaclipse.theme/src/org/eclipse/osbp/vaaclipse/theme/ThemeImpl.java
@@ -166,7 +166,7 @@
}
if (in == null) {
if (useDefault) {
- return getResourceAsStreamInternal("icon/nopic_small.png", false);
+ return getResourceAsStreamInternal("../common/icon/nopic_small.png", false);
} else {
LOGGER.debug("{}", buffer);
}