Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reopening the sample Sirius editor is not retaining the layout #39 #156

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −22
Open

Reopening the sample Sirius editor is not retaining the layout #39 #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions ...c-diag/org/eclipse/sirius/diagram/ui/tools/api/editor/AbstractSpecificDDiagramEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,31 @@

import java.util.Collection;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.sirius.business.api.dialect.DialectManager;
import org.eclipse.sirius.business.api.session.CustomDataConstants;
import org.eclipse.sirius.common.ui.tools.api.util.EclipseUIUtil;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.business.internal.dialect.NotYetOpenedDiagramAdapter;
import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager;
import org.eclipse.sirius.diagram.ui.business.internal.command.CreateAndStoreGMFDiagramCommand;
import org.eclipse.sirius.diagram.ui.business.internal.dialect.DiagramDialectArrangeOperation;
import org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl;
import org.eclipse.sirius.diagram.ui.tools.internal.layout.LayoutUtil;
import org.eclipse.sirius.diagram.ui.tools.internal.part.OffscreenEditPartFactory;
import org.eclipse.sirius.ui.business.api.editor.SpecificEditor;
import org.eclipse.sirius.ui.business.api.editor.SpecificEditorInputTranformer;
import org.eclipse.sirius.viewpoint.DRepresentation;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;

/**
* A specific editor you may extend, which includes a session. The session
Expand All @@ -59,28 +60,38 @@ protected URI getNewEditorInputURI(DRepresentation representation) {
}

private Diagram createGMFDiagram(final DDiagram diagram) {
Collection<EObject> gmfDiags = session.getServices().getCustomData(CustomDataConstants.GMF_DIAGRAMS, diagram);
boolean isNew = gmfDiags.isEmpty();
if (isNew) {
TransactionalEditingDomain domain = session.getTransactionalEditingDomain();
domain.getCommandStack().execute(new CreateAndStoreGMFDiagramCommand(session, (DSemanticDiagram) diagram));
gmfDiags = session.getServices().getCustomData(CustomDataConstants.GMF_DIAGRAMS, diagram);
}

TransactionalEditingDomain domain = session.getTransactionalEditingDomain();
domain.getCommandStack().execute(new RecordingCommand(domain) {
@Override
protected void doExecute() {
DialectManager.INSTANCE.refresh(diagram, new NullProgressMonitor());
// creating GMF diagram
org.eclipse.gmf.runtime.notation.Diagram gmfDiagram = (org.eclipse.gmf.runtime.notation.Diagram) gmfDiags.iterator().next();
if (gmfDiagram != null) {
arrangeIfRequired(diagram, gmfDiagram);
}
return gmfDiagram;
}

public void arrangeIfRequired(final DRepresentation representation, org.eclipse.gmf.runtime.notation.Diagram gmfDiagram) {
if (representation.eAdapters().contains(NotYetOpenedDiagramAdapter.INSTANCE)) {
DiagramEditPart editpart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(gmfDiagram, PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
if (editpart != null) {
LayoutUtil.arrange(editpart);
}
});
domain.getCommandStack().execute(new CreateAndStoreGMFDiagramCommand(session, (DSemanticDiagram) diagram));
representation.eAdapters().remove(NotYetOpenedDiagramAdapter.INSTANCE);

EclipseUIUtil.displayAsyncExec(new Runnable() {
public void run() {
final IEditorPart activeEditor = EclipseUIUtil.getActiveEditor();
if (activeEditor != null) {
new DiagramDialectArrangeOperation().arrange(activeEditor, diagram);
// Not to layout
for (Object child : gmfDiagram.getChildren()) {
if (child instanceof View) {
((View) child).eAdapters().add(SiriusLayoutDataManager.INSTANCE.getAdapterMarker());
}
}
});
final Collection<EObject> gmfDiags = session.getServices().getCustomData(CustomDataConstants.GMF_DIAGRAMS, diagram);
return (Diagram) gmfDiags.iterator().next();
}
}

};

/**
Expand Down