Bug 464300 - To be able to discover XML models from a folder/project
Improving error managment.
Removing save action from the vistor.
diff --git a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/WorkspaceVisitor.java b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/WorkspaceVisitor.java
index c99394e..5fbd229 100644
--- a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/WorkspaceVisitor.java
+++ b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/WorkspaceVisitor.java
@@ -58,7 +58,6 @@
final EList<EObject> roots = emfResource.getContents();
this.globalResource.getContents().addAll(roots);
}
- this.globalResource.save(Collections.EMPTY_MAP);
} catch (Exception e) {
final Bundle bundle = XmlActivator.getDefault().getBundle();
final String bundleName = bundle.getSymbolicName();
@@ -66,7 +65,7 @@
final String message = String.format(
"Error append when trying to parse %s.", //$NON-NLS-1$
location.toOSString());
- final Status status = new Status(IStatus.ERROR, bundleName, message);
+ final Status status = new Status(IStatus.ERROR, bundleName, message, e);
this.errors.add(status);
}
} else if (fsResource instanceof IFolder) {
diff --git a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XMLModelDiscovererFromJavaElement.java b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XMLModelDiscovererFromJavaElement.java
index 6025987..15efab0 100644
--- a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XMLModelDiscovererFromJavaElement.java
+++ b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XMLModelDiscovererFromJavaElement.java
@@ -19,6 +19,7 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.util.core.Logger;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.modisco.infra.discovery.core.exception.DiscoveryException;
@@ -53,6 +54,7 @@
wsResource.accept(vistor);
vistor.check();
} catch (CoreException e) {
+ Logger.logError(e, XmlActivator.getDefault());
throw new DiscoveryException(e);
}
}
