AADL Navigator: Double click on expanded file content doesn't open text editor

[lwrage]

No description provided.

[lwrage]

But single click does when link with editor is active.

[lwrage]

Single click should no longer open the file. Opening on double click happens automatically if there is an open command.

[AaronGreenhouse]

Actually I cannot get single click to open a file

[AaronGreenhouse]

If the editor is open, a single click jumps to the syntactic item. This is from the link helper.

[lwrage]

Open on single click was fixed in connection with fixing a couple of issues in the link helper.

[AaronGreenhouse]

We have this in the plugin.xml to open the contributed aadl files:

      <actionProvider
            class="org.osate.ui.navigator.AadlNavigatorActionProvider"
            id="org.osate.ui.navigator.openContributed">
         <enablement>
            <instanceof
                  value="org.osate.xtext.aadl2.ui.resource.ContributedAadlStorage">
            </instanceof>
         </enablement>
      </actionProvider>

Probably need something similar for the model elements

[lwrage]

Double click is handled in ComonNavigator.handleDoubleClick(). Not sure how to register an open command with the global action handler. Action provider may be the way to go...

[AaronGreenhouse]

Okay, yes, so the above is the key.
We need to register an action provider. Thta provider needs to have global action action handler for the OPEN event.

Here is that the above org.osate.ui.navigator.AadlNavigatorActionProvider has:

public class AadlNavigatorActionProvider extends CommonActionProvider {
	private final IURIEditorOpener editorOpener;

	public AadlNavigatorActionProvider() {
		Injector injector = Aadl2Activator.getInstance().getInjector(Aadl2Activator.ORG_OSATE_XTEXT_AADL2_AADL2);
		editorOpener = injector.getInstance(IURIEditorOpener.class);
	}

	@Override
	public void fillActionBars(IActionBars actionBars) {
		super.fillActionBars(actionBars);
		actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, new Action() {
			@Override
			public void run() {
				Object[] selectedElements = getActionSite().getStructuredViewer().getStructuredSelection().toArray();
				Stream<ContributedAadlStorage> files = Arrays.stream(selectedElements)
						.filter(file -> file instanceof ContributedAadlStorage)
						.map(file -> (ContributedAadlStorage) file);
				files.forEach(file -> editorOpener.open(file.getUri(), true));
			}
		});
	}
}

We need something a bit different because we want to target the editor to a particular location.

[AaronGreenhouse]

Actually, the open method takes a URI, so it shouldn't be too hard.

[AaronGreenhouse]

Did the following:

1. Changed the enablement of the above action provider to include AObject (provided by the AadlElementContentProvider):

         <enablement>
         	<or>
	            <instanceof
	                  value="org.osate.xtext.aadl2.ui.resource.ContributedAadlStorage"/>
	            <instanceof
	                  value="org.osate.aadl2.parsesupport.AObject"/>
            </or>
         </enablement>

2. Added the "open" command to the context menu in the action provider:

	@Override
	public void fillContextMenu(final IMenuManager aMenu) {
		if (getContext().getSelection().isEmpty()) {
			return;
		}

		if (openFileAction.isEnabled()) {
			aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openFileAction);
		}
	}

3. Updated the action itself to handle both ContributedAadlStorage and AObject:

		openFileAction = new Action() {
			{
				setText("&Open");
				setToolTipText("Open the contributed library in an AADL editor");
			}

			@Override
			public void run() {
				Object[] selectedElements = getActionSite().getStructuredViewer().getStructuredSelection().toArray();
				for (Object selected : selectedElements) {
					if (selected instanceof ContributedAadlStorage) {
						editorOpener.open(((ContributedAadlStorage) selected).getUri(), true);
					} else if (selected instanceof AObject) {
						editorOpener.open(EcoreUtil.getURI((AObject) selected), true);
					}
				}
			}
		};

And viola it's done.

[AaronGreenhouse]

Doesn't work for instance models.

Tracing through the debugger and seen open() does, the problem comes up in GlobalURIEditorOpener.selectAndReveal() where it tries to adapt the editor into an XTextEditor. This fails for Aadl2ModelEditor, and thus it cannot jump to the URI fragment.

[AaronGreenhouse]

Tried replacing

					} else if (selected instanceof AObject) {
						editorOpener.open(EcoreUtil.getURI((AObject) selected), true);
					}

with

					} else if (selected instanceof Element) {
						UiUtil.openEditorFor((Element) selected);
					}

but this doesn't jump to the correct node either.

Need to add method to UIUtil that opens the editor, adapts the EditorPart to an ISelectionProvider and sets the selection to the Element. I don't know if this will force the selection to be visible though.