Author: koen.aers(a)jboss.com Date: 2008-12-11 17:08:03 -0500 (Thu, 11 Dec 2008) New Revision: 12562 Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java Log: make sure the jpdl editor opens on the newly created file also open the properties view Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-12-11 20:49:27 UTC (rev 12561) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-12-11 22:08:03 UTC (rev 12562) @@ -12,6 +12,8 @@ import org.jboss.tools.flow.common.wrapper.Wrapper; public class JpdlEditor extends GenericModelEditor { + + public static String ID = "org.jboss.tools.flow.jpdl4.editor"; protected EditPartFactory createEditPartFactory() { return new DefaultEditPartFactory(); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java 2008-12-11 20:49:27 UTC (rev 12561) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizard.java 2008-12-11 22:08:03 UTC (rev 12562) @@ -4,9 +4,20 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; +import org.jboss.tools.flow.jpdl4.Logger; +import org.jboss.tools.flow.jpdl4.editor.JpdlEditor; public class NewJpdl4FileWizard extends Wizard implements IWorkbenchWizard { + + private static String ID_PROP_SHEET = "org.eclipse.ui.views.PropertySheet"; private IStructuredSelection selection; private NewJpdl4FileWizardPage newFileWizardPage; @@ -21,15 +32,33 @@ addPage(newFileWizardPage); } + private IWorkbenchWindow getActiveWindow() { + IWorkbench workbench = PlatformUI.getWorkbench(); + return workbench == null ? null : workbench.getActiveWorkbenchWindow(); + } + + private IWorkbenchPage getActivePage() { + IWorkbenchWindow window = getActiveWindow(); + return window == null ? null: window.getActivePage(); + } + @Override public boolean performFinish() { IFile file = newFileWizardPage.createNewFile(); - if (file != null) - return true; - else - return false; + IWorkbenchPage activePage = getActivePage(); + if (file != null && activePage != null) { + try { + IDE.openEditor(activePage, file); + activePage.showView(ID_PROP_SHEET); + BasicNewResourceWizard.selectAndReveal(file, getActiveWindow()); + return true; + } catch (PartInitException e) { + Logger.logError("Exception while opening jPDL 4 editor", e); + } + } + return false; } - + public void init(IWorkbench workbench, IStructuredSelection selection) { this.selection = selection; }