Commit 7ace2613 authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	community/pom.xml
parents e0f6f87b c8836a53
...@@ -45,21 +45,6 @@ public class CustomProcessDiagramEditor extends ProcessDiagramEditor { ...@@ -45,21 +45,6 @@ public class CustomProcessDiagramEditor extends ProcessDiagramEditor {
repositoryAccessor.getWorkspace().addResourceChangeListener(webPageNameResourceChangeListener); repositoryAccessor.getWorkspace().addResourceChangeListener(webPageNameResourceChangeListener);
} }
} }
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
if(part == null) {
BonitaStudioLog.error("Part is null !", Activator.PLUGIN_ID);
return;
}
if(part.getSite() == null) {
BonitaStudioLog.error(String.format("Part site is null for %s (%s)", part.getTitle(), part.toString()), Activator.PLUGIN_ID);
}
if(part.getSite().getPage() == null) {
BonitaStudioLog.error(String.format("Site page is null for %s (%s)", part.getTitle(), part.toString()), Activator.PLUGIN_ID);
}
super.selectionChanged(part, selection);
}
@Override @Override
protected void setPartName(String partName) { protected void setPartName(String partName) {
...@@ -68,6 +53,15 @@ public class CustomProcessDiagramEditor extends ProcessDiagramEditor { ...@@ -68,6 +53,15 @@ public class CustomProcessDiagramEditor extends ProcessDiagramEditor {
updateWebPageChangeListener(partName); updateWebPageChangeListener(partName);
} }
} }
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
if(getSite() == null || getSite().getPage() == null) {
//invalid editor
return;
}
super.selectionChanged(part, selection);
}
private void updateWebPageChangeListener(String processName) { private void updateWebPageChangeListener(String processName) {
DiagramFileStore fileStore = RepositoryManager.getInstance() DiagramFileStore fileStore = RepositoryManager.getInstance()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment