[448938] - Introduce abstract factory for unit resolvers

2 files changed, 5 insertions, 2 deletions

diff --git a/plugins/org.eclipse.m2m.qvt.oml.project/src/org/eclipse/m2m/internal/qvt/oml/project/builder/WorkspaceUnitResolverFactory.java b/plugins/org.eclipse.m2m.qvt.oml.project/src/org/eclipse/m2m/internal/qvt/oml/project/builder/WorkspaceUnitResolverFactory.java
index 1cdc0e6cb..d2cc6585e 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.project/src/org/eclipse/m2m/internal/qvt/oml/project/builder/WorkspaceUnitResolverFactory.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.project/src/org/eclipse/m2m/internal/qvt/oml/project/builder/WorkspaceUnitResolverFactory.java
@@ -39,6 +39,9 @@ public class WorkspaceUnitResolverFactory extends UnitResolverFactory {
 		}
 		
 		IResource file = URIUtils.getResource(uri);
+		if (file == null) {
+			return null;
+		}
 		
 		try {	
 			IContainer sourceContainer = QVTOBuilderConfig.getConfig(file.getProject()).getSourceContainer();
diff --git a/plugins/org.eclipse.m2m.qvt.oml.runtime.ui/src/org/eclipse/m2m/internal/qvt/oml/runtime/ui/QvtTransformationConfigurationUI.java b/plugins/org.eclipse.m2m.qvt.oml.runtime.ui/src/org/eclipse/m2m/internal/qvt/oml/runtime/ui/QvtTransformationConfigurationUI.java
index cd75ef59a..11c74c376 100644
--- a/plugins/org.eclipse.m2m.qvt.oml.runtime.ui/src/org/eclipse/m2m/internal/qvt/oml/runtime/ui/QvtTransformationConfigurationUI.java
+++ b/plugins/org.eclipse.m2m.qvt.oml.runtime.ui/src/org/eclipse/m2m/internal/qvt/oml/runtime/ui/QvtTransformationConfigurationUI.java
@@ -44,7 +44,6 @@ import org.eclipse.m2m.internal.qvt.oml.runtime.project.QvtTransformation;
 import org.eclipse.m2m.internal.qvt.oml.runtime.project.config.QvtConfigurationProperty;
 import org.eclipse.m2m.internal.qvt.oml.runtime.project.config.QvtConfigurationPropertyType;
 import org.eclipse.m2m.internal.qvt.oml.runtime.ui.wizards.ApplyTransformationData;
-import org.eclipse.m2m.internal.qvt.oml.runtime.util.MiscUtil;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -167,7 +166,8 @@ public class QvtTransformationConfigurationUI {
                     myProperties.addProperty(property, valueMap.get(property.getName()));
                 }
             } catch (MdaException e) {
-                QvtRuntimeUIPlugin.getDefault().getLog().log(MiscUtil.makeErrorStatus(e));
+            	// Error is already reported in UI, no need for duplication in log
+                //QvtRuntimeUIPlugin.getDefault().getLog().log(MiscUtil.makeErrorStatus(e));
             }
         }
         myTableViewer.refresh();