Skip to content
Snippets Groups Projects
Commit 3c6a0234 authored by Johannes Eder's avatar Johannes Eder
Browse files

externalized resource set from ModelContext

edited generate deployment functionality
edited loading of schedules/generation of deployment in efficientdeployment
refs 1293
parent 120ca20f
No related branches found
No related tags found
No related merge requests found
......@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.command.CommandStackListener;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.fortiss.tooling.kernel.extension.IStorageProvider;
import org.fortiss.tooling.kernel.service.IPersistencyService;
......@@ -61,7 +62,10 @@ public interface ITopLevelElement {
*/
void runAsCommand(Runnable runner);
/** Same as {@link ITopLevelElement#runAsCommand(Runnable)} but which does not make the model dirty. */
/**
* Same as {@link ITopLevelElement#runAsCommand(Runnable)} but which does not make the model
* dirty.
*/
void runAsNonDirtyingCommand(Runnable runnable);
/**
......@@ -109,4 +113,7 @@ public interface ITopLevelElement {
* user.
*/
boolean delete();
/** Returns the resource set. */
ResourceSet getResourceSet();
}
......@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.command.CommandStackListener;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.model.IIdLabeled;
import org.fortiss.tooling.kernel.service.IPersistencyService;
......@@ -147,4 +148,10 @@ final class DummyTopLevelElement implements ITopLevelElement {
public boolean delete() {
return false;
}
/** {@inheritDoc} */
@Override
public ResourceSet getResourceSet() {
return null;
}
}
......@@ -90,8 +90,8 @@ class ModelContext implements ITopLevelElement, CommandStackListener {
rset = editingDomain.getResourceSet();
resource =
rset.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(),
true));
getResourceSet().createResource(
URI.createPlatformResourceURI(file.getFullPath().toString(), true));
resource.load(buildOptionsMap());
transactionalCommandStack = new AutoUndoCommandStack(editingDomain);
......@@ -349,4 +349,10 @@ class ModelContext implements ITopLevelElement, CommandStackListener {
}
return false;
}
/** {@inheritDoc} */
@Override
public ResourceSet getResourceSet() {
return rset;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment