Attachment #239263 for bug #426431




        return result;
    }

    private DialectEditor openEditor(final Session session, Diagram gmfDiag, final DRepresentation dRepresentation, IProgressMonitor monitor) {
        DialectEditor dialectEditor = null;
        URI uri = EcoreUtil.getURI(gmfDiag);
        String editorName = DialectUIManager.INSTANCE.getEditorName(dRepresentation);

            public void run() {
                final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                try {
                    IEditorPart editorPart = page.openEditor(editorInput, getEditorID(dRepresentation));
                    if (editorPart instanceof DialectEditor) {
                        setResult((DialectEditor) editorPart);
                    }

    /**
     * {@inheritDoc}
     * 
     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
     */
    public String getEditorID(DRepresentation dRepresentation) {
        return DDiagramEditor.EDITOR_ID;
    }
    
    /**
     * {@inheritDoc}
     * 
     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandleEditor(org.eclipse.ui.IEditorPart)
     */
    public boolean canHandleEditor(final IEditorPart editorPart) {




                monitor.worked(2);
                final IEditorInput editorInput = new SessionEditorInput(uri, editorName, session);

                final String editorId = getEditorID(dRepresentation);
                if (dTable.getDescription() instanceof EditionTableDescription) {
                    editorId = DTableEditionEditor.ID;
                } else if (dTable.getDescription() instanceof CrossTableDescription) {
                    editorId = DTableCrossEditor.ID;
                } else {
                    editorId = null;
                }
                if (editorId != null) {
                    monitor.subTask("table opening : " + dRepresentation.getName());
                    RunnableWithResult<IEditorPart> runnable = new RunnableWithResult.Impl<IEditorPart>() {

    }

    /**
     *  {@inheritDoc}
     *  
     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
     */
    public String getEditorID(DRepresentation dRepresentation) {
        final String editorId;
        if (dRepresentation instanceof DTable) {
            DTable dTable = (DTable) dRepresentation;
            if (dTable.getDescription() instanceof EditionTableDescription) {
                editorId = DTableEditionEditor.ID;
            } else if (dTable.getDescription() instanceof CrossTableDescription) {
                editorId = DTableCrossEditor.ID;
            } else {
                editorId = null;
            }
        } else {
            editorId = null;
        }
        return editorId;
    }
    
    /**
     * 
     * {@inheritDoc}
     */




    /**
     * {@inheritDoc}
     */
    public IEditorPart openEditor(final Session session, final DRepresentation dRepresentation, IProgressMonitor monitor) {
        IEditorPart editorPart = null;
        try {
            monitor.beginTask("tree opening", 10);

                    public void run() {
                        final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                        try {
                            setResult(page.openEditor(editorInput, getEditorID(dRepresentation)));
                        } catch (final PartInitException e) {
                            // silent catch
                        }

    /**
     * {@inheritDoc}
     * 
     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
     */
    public String getEditorID(DRepresentation dRepresentation) {
        return DTreeEditor.ID;
    }
    
    /**
     * {@inheritDoc}
     * 
     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorName(org.eclipse.sirius.viewpoint.DRepresentation)
     */
    public String getEditorName(DRepresentation representation) {

Lines 100-105 public interface DialectUIServices { Link Here

(-)a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/DialectUIServices.java (+9 lines)
100	IEditorPart openEditor(Session session, DRepresentation dRepresentation, IProgressMonitor monitor);	100	IEditorPart openEditor(Session session, DRepresentation dRepresentation, IProgressMonitor monitor);
101		101
102	/**	102	/**
		103	* Gets the editor ID for the given representation.
		104	* @param dRepresentation
		105	* {@link DRepresentation} to open.
		106	*
		107	* @return the editor ID for the given representation if any, <code>null</code> otherwise.
		108	*/
		109	String getEditorID(DRepresentation dRepresentation);
		110
		111	/**
103	* Sets the given {@link DRepresentationElement}s as current selection for	112	* Sets the given {@link DRepresentationElement}s as current selection for
104	* the editor.	113	* the editor.
105	*	114	*




     * 
     * {@inheritDoc}
     */
    public String getEditorID(DRepresentation dRepresentation) {
        for (final DialectUI dialect : dialects.values()) {
            if (dialect.getServices().canHandle(dRepresentation)) {
                return dialect.getServices().getEditorID(dRepresentation);
            }
        }
        return null;
    }
    
    /**
     * 
     * {@inheritDoc}
     */
    public Collection<CommandParameter> provideNewChildDescriptors() {
        final Collection<CommandParameter> result = new ArrayList<CommandParameter>();
        for (final DialectUI dialect : dialects.values()) {

Return to bug 426431

Lines 181-187 public class DiagramDialectUIServices implements DialectUIServices { Link Here

(-)a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialectUIServices.java (-2 / +11 lines)
181	return result;	181	return result;
182	}	182	}
183		183
184	private DialectEditor openEditor(Session session, Diagram gmfDiag, DRepresentation dRepresentation, IProgressMonitor monitor) {	184	private DialectEditor openEditor(final Session session, Diagram gmfDiag, final DRepresentation dRepresentation, IProgressMonitor monitor) {
185	DialectEditor dialectEditor = null;	185	DialectEditor dialectEditor = null;
186	URI uri = EcoreUtil.getURI(gmfDiag);	186	URI uri = EcoreUtil.getURI(gmfDiag);
187	String editorName = DialectUIManager.INSTANCE.getEditorName(dRepresentation);	187	String editorName = DialectUIManager.INSTANCE.getEditorName(dRepresentation);
Lines 193-199 public class DiagramDialectUIServices implements DialectUIServices { Link Here
193	public void run() {	193	public void run() {
194	final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();	194	final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
195	try {	195	try {
196	IEditorPart editorPart = page.openEditor(editorInput, DDiagramEditor.EDITOR_ID);	196	IEditorPart editorPart = page.openEditor(editorInput, getEditorID(dRepresentation));
197	if (editorPart instanceof DialectEditor) {	197	if (editorPart instanceof DialectEditor) {
198	setResult((DialectEditor) editorPart);	198	setResult((DialectEditor) editorPart);
199	}	199	}
Lines 269-274 public class DiagramDialectUIServices implements DialectUIServices { Link Here
269	/**	269	/**
270	* {@inheritDoc}	270	* {@inheritDoc}
271	*	271	*
		272	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
		273	*/
		274	public String getEditorID(DRepresentation dRepresentation) {
		275	return DDiagramEditor.EDITOR_ID;
		276	}
		277
		278	/**
		279	* {@inheritDoc}
		280	*
272	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandleEditor(org.eclipse.ui.IEditorPart)	281	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandleEditor(org.eclipse.ui.IEditorPart)
273	*/	282	*/
274	public boolean canHandleEditor(final IEditorPart editorPart) {	283	public boolean canHandleEditor(final IEditorPart editorPart) {

Lines 91-104 public class TableDialectUIServices implements DialectUIServices { Link Here

(-)a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/TableDialectUIServices.java (-8 / +23 lines)
91	monitor.worked(2);	91	monitor.worked(2);
92	final IEditorInput editorInput = new SessionEditorInput(uri, editorName, session);	92	final IEditorInput editorInput = new SessionEditorInput(uri, editorName, session);
93		93
94	final String editorId;	94	final String editorId = getEditorID(dRepresentation);
95	if (dTable.getDescription() instanceof EditionTableDescription) {
96	editorId = DTableEditionEditor.ID;
97	} else if (dTable.getDescription() instanceof CrossTableDescription) {
98	editorId = DTableCrossEditor.ID;
99	} else {
100	editorId = null;
101	}
102	if (editorId != null) {	95	if (editorId != null) {
103	monitor.subTask("table opening : " + dRepresentation.getName());	96	monitor.subTask("table opening : " + dRepresentation.getName());
104	RunnableWithResult<IEditorPart> runnable = new RunnableWithResult.Impl<IEditorPart>() {	97	RunnableWithResult<IEditorPart> runnable = new RunnableWithResult.Impl<IEditorPart>() {
Lines 127-132 public class TableDialectUIServices implements DialectUIServices { Link Here
127	}	120	}
128		121
129	/**	122	/**
		123	* {@inheritDoc}
		124	*
		125	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
		126	*/
		127	public String getEditorID(DRepresentation dRepresentation) {
		128	final String editorId;
		129	if (dRepresentation instanceof DTable) {
		130	DTable dTable = (DTable) dRepresentation;
		131	if (dTable.getDescription() instanceof EditionTableDescription) {
		132	editorId = DTableEditionEditor.ID;
		133	} else if (dTable.getDescription() instanceof CrossTableDescription) {
		134	editorId = DTableCrossEditor.ID;
		135	} else {
		136	editorId = null;
		137	}
		138	} else {
		139	editorId = null;
		140	}
		141	return editorId;
		142	}
		143
		144	/**
130	*	145	*
131	* {@inheritDoc}	146	* {@inheritDoc}
132	*/	147	*/

Lines 88-94 public class TreeDialectUIServices implements DialectUIServices { Link Here

(-)a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUIServices.java (-2 / +11 lines)
88	/**	88	/**
89	* {@inheritDoc}	89	* {@inheritDoc}
90	*/	90	*/
91	public IEditorPart openEditor(Session session, DRepresentation dRepresentation, IProgressMonitor monitor) {	91	public IEditorPart openEditor(final Session session, final DRepresentation dRepresentation, IProgressMonitor monitor) {
92	IEditorPart editorPart = null;	92	IEditorPart editorPart = null;
93	try {	93	try {
94	monitor.beginTask("tree opening", 10);	94	monitor.beginTask("tree opening", 10);
Lines 102-108 public class TreeDialectUIServices implements DialectUIServices { Link Here
102	public void run() {	102	public void run() {
103	final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();	103	final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
104	try {	104	try {
105	setResult(page.openEditor(editorInput, DTreeEditor.ID));	105	setResult(page.openEditor(editorInput, getEditorID(dRepresentation)));
106	} catch (final PartInitException e) {	106	} catch (final PartInitException e) {
107	// silent catch	107	// silent catch
108	}	108	}
Lines 125-130 public class TreeDialectUIServices implements DialectUIServices { Link Here
125	/**	125	/**
126	* {@inheritDoc}	126	* {@inheritDoc}
127	*	127	*
		128	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorID(org.eclipse.sirius.viewpoint.DRepresentation)
		129	*/
		130	public String getEditorID(DRepresentation dRepresentation) {
		131	return DTreeEditor.ID;
		132	}
		133
		134	/**
		135	* {@inheritDoc}
		136	*
128	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorName(org.eclipse.sirius.viewpoint.DRepresentation)	137	* @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorName(org.eclipse.sirius.viewpoint.DRepresentation)
129	*/	138	*/
130	public String getEditorName(DRepresentation representation) {	139	public String getEditorName(DRepresentation representation) {