Bug 540053: [GraphicView] Adapt to enhanced MPBV
Change-Id: I4ed9664ca1cdff29817bb7981f25457e44f3ce0b
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphicsManager.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphicsManager.java
index 75b61c0..189f449 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphicsManager.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphicsManager.java
@@ -16,10 +16,13 @@
import java.util.List;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
/**
* Manager for a collection of R graphics.
*/
+@NonNullByDefault
public interface ERGraphicsManager {
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/PageBookRGraphicView.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/PageBookRGraphicView.java
index 9b09d8f..ab33e7f 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/PageBookRGraphicView.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/PageBookRGraphicView.java
@@ -50,13 +50,16 @@
import org.eclipse.ui.statushandlers.StatusManager;
import org.eclipse.ui.views.IViewDescriptor;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
import org.eclipse.statet.ecommons.ts.core.Tool;
import org.eclipse.statet.ecommons.ui.SharedUIResources;
import org.eclipse.statet.ecommons.ui.actions.HandlerCollection;
import org.eclipse.statet.ecommons.ui.actions.HandlerContributionItem;
import org.eclipse.statet.ecommons.ui.actions.SimpleContributionItem;
-import org.eclipse.statet.ecommons.ui.mpbv.ISession;
import org.eclipse.statet.ecommons.ui.mpbv.ManagedPageBookView;
+import org.eclipse.statet.ecommons.ui.mpbv.PageBookSession;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
import org.eclipse.statet.ecommons.ui.workbench.ContextHandlers;
@@ -69,10 +72,11 @@
* <p>
* No view is registered by this plug-in.</p>
*/
+@NonNullByDefault
public abstract class PageBookRGraphicView extends ManagedPageBookView<PageBookRGraphicView.RGraphicSession> {
- public class RGraphicSession implements ISession {
+ public class RGraphicSession implements PageBookSession {
private final ERGraphic graphic;
@@ -89,7 +93,7 @@
}
@Override
- public ImageDescriptor getImageDescriptor() {
+ public @Nullable ImageDescriptor getImageDescriptor() {
return ImageDescriptor.createFromImage(getTitleImage());
}
@@ -179,7 +183,7 @@
protected abstract Tool getTool() throws CoreException;
@Override
- public Object execute(final ExecutionEvent event) throws ExecutionException {
+ public @Nullable Object execute(final ExecutionEvent event) throws ExecutionException {
try {
final Tool tool= getTool();
if (tool != null) {
@@ -247,7 +251,7 @@
}
@Override
- public Object execute(final ExecutionEvent event) throws ExecutionException {
+ public @Nullable Object execute(final ExecutionEvent event) throws ExecutionException {
try {
final String secondaryId= "t" + System.currentTimeMillis(); //$NON-NLS-1$
this.viewSite.getWorkbenchWindow().getActivePage().showView(this.viewSite.getId(),
@@ -281,11 +285,11 @@
}
- private static ERGraphic newViewGraphic;
+ private static @Nullable ERGraphic newViewGraphic;
private ERGraphicsManager manager;
private final ERGraphicsManager.ListenerShowExtension managerListener= new ERGraphicsManager.ListenerShowExtension() {
- private ERGraphic toShow;
+ private @Nullable ERGraphic toShow;
@Override
public int canShowGraphic(final ERGraphic graphic) {
return PageBookRGraphicView.this.canShowGraphic(graphic);
@@ -349,7 +353,7 @@
@Override
- public void init(final IViewSite site, final IMemento memento) throws PartInitException {
+ public void init(final IViewSite site, final @Nullable IMemento memento) throws PartInitException {
setSessionComparator(new RGraphicComparator());
super.init(site, memento);
this.manager= loadManager();
@@ -378,7 +382,7 @@
}
}
if (active == null && !graphics.isEmpty()) {
- active= graphics.get(graphics.size()-1);
+ active= graphics.get(graphics.size() - 1);
}
}
if (active != null) {
@@ -390,7 +394,7 @@
}
}
- public RGraphicSession getSession(final ERGraphic graphic) {
+ public @Nullable RGraphicSession getSession(final ERGraphic graphic) {
final List<RGraphicSession> sessions= getSessions();
for (final RGraphicSession session : sessions) {
if (session.getGraphic() == graphic) {
@@ -428,7 +432,7 @@
}
@Override
- protected IHandler2 createNewPageHandler() {
+ protected @Nullable IHandler2 createNewPageHandler() {
return null;
}
