X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.ui%2Fsrc%2Forg%2Fsimantics%2Fui%2Fworkbench%2FResourceEditorInput2.java;h=6b5a0355268c983faf3c2db6348dc1359ae9cc6b;hb=84bb0ec99d477592b7175a9ab995231abac82eae;hp=e1ec2f52106cbbcfc4a0ae1d52157e8bf309702b;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/ResourceEditorInput2.java b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/ResourceEditorInput2.java index e1ec2f521..6b5a03552 100644 --- a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/ResourceEditorInput2.java +++ b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/ResourceEditorInput2.java @@ -20,8 +20,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IMemento; import org.eclipse.ui.IPersistableElement; import org.simantics.Simantics; +import org.simantics.db.AsyncRequestProcessor; import org.simantics.db.ReadGraph; -import org.simantics.db.RequestProcessor; import org.simantics.db.Resource; import org.simantics.db.Session; import org.simantics.db.common.ResourceArray; @@ -345,9 +345,8 @@ public class ResourceEditorInput2 extends PlatformObject implements IResourceEdi /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - @SuppressWarnings("rawtypes") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { //System.out.println("[ResourceEditorInput] getAdapter: " + adapter.getName()); return null; } @@ -385,7 +384,7 @@ public class ResourceEditorInput2 extends PlatformObject implements IResourceEdi return true; } - private void updateCaches(RequestProcessor processor, boolean sync) throws DatabaseException { + private void updateCaches(AsyncRequestProcessor processor, boolean sync) throws DatabaseException { ReadRequest req = new ReadRequest() { @Override public void run(ReadGraph g) throws DatabaseException { @@ -421,7 +420,7 @@ public class ResourceEditorInput2 extends PlatformObject implements IResourceEdi System.out.println("update(" + this + ")"); try { - assertExists(g); + //assertExists(g); name = g.syncRequest(new TitleRequest(editorID, this)); if (name == null)