Bug 558322: [RGraphic] Replace Tool by RTool in rj.eclient.graphics if
appropriate
Change-Id: I67cf52eb7643776d0847d3c7091e28e91d2f3e29
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/EclipseRGraphic.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/EclipseRGraphic.java
index 8d5475a..79d97d1 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/EclipseRGraphic.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/internal/rj/eclient/graphics/EclipseRGraphic.java
@@ -41,7 +41,6 @@
import org.eclipse.statet.jcommons.status.StatusChangeListener;
import org.eclipse.statet.jcommons.status.StatusException;
import org.eclipse.statet.jcommons.status.Statuses;
-import org.eclipse.statet.jcommons.ts.core.Tool;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
@@ -61,6 +60,7 @@
import org.eclipse.statet.rj.server.client.RClientGraphicFactory;
import org.eclipse.statet.rj.services.RService;
import org.eclipse.statet.rj.services.RServiceControlExtension;
+import org.eclipse.statet.rj.ts.core.RTool;
/**
@@ -1191,7 +1191,7 @@
}
@Override
- public @Nullable Tool getRHandle() {
+ public @Nullable RTool getRHandle() {
if (this.actions != null) {
return this.actions.getRHandle();
}
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphic.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphic.java
index 7f72b50..440aa50 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphic.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/ERGraphic.java
@@ -22,9 +22,9 @@
import org.eclipse.statet.jcommons.status.Status;
import org.eclipse.statet.jcommons.status.StatusChangeListener;
import org.eclipse.statet.jcommons.status.StatusException;
-import org.eclipse.statet.jcommons.ts.core.Tool;
import org.eclipse.statet.rj.graphic.core.RGraphic;
+import org.eclipse.statet.rj.ts.core.RTool;
/**
@@ -106,7 +106,7 @@
@Override
boolean isActive();
- @Nullable Tool getRHandle();
+ @Nullable RTool getRHandle();
@Override
List<? extends ERGraphicInstruction> getInstructions();
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 cae3b9b..09ebd30 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
@@ -65,6 +65,7 @@
import org.eclipse.statet.ecommons.ui.workbench.ContextHandlers;
import org.eclipse.statet.rj.ts.core.AbstractRToolRunnable;
+import org.eclipse.statet.rj.ts.core.RTool;
import org.eclipse.statet.rj.ts.core.RToolService;
@@ -183,12 +184,12 @@
}
- protected abstract Tool getTool() throws CoreException;
+ protected abstract RTool getTool() throws CoreException;
@Override
public @Nullable Object execute(final ExecutionEvent event) throws ExecutionException {
try {
- final Tool tool= getTool();
+ final RTool tool= getTool();
if (tool != null) {
tool.getQueue().add(new AbstractRToolRunnable(
"r/rj/gd/new", "New R Graphic") { //$NON-NLS-1$
@@ -224,8 +225,8 @@
@Override
public int compare(final RGraphicSession o1, final RGraphicSession o2) {
- final Tool handle1= o1.graphic.getRHandle();
- final Tool handle2= o2.graphic.getRHandle();
+ final RTool handle1= o1.graphic.getRHandle();
+ final RTool handle2= o2.graphic.getRHandle();
if (handle1 == null) {
if (handle2 == null) {
return 0;
diff --git a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/util/AbstractLocalLocator.java b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/util/AbstractLocalLocator.java
index 3aebcaf..34933d8 100644
--- a/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/util/AbstractLocalLocator.java
+++ b/eclient/org.eclipse.statet.rj.eclient.graphics/src/org/eclipse/statet/rj/eclient/graphics/util/AbstractLocalLocator.java
@@ -29,6 +29,7 @@
import org.eclipse.statet.rj.eclient.graphics.ERGraphic;
import org.eclipse.statet.rj.eclient.graphics.LocatorCallback;
+import org.eclipse.statet.rj.ts.core.RTool;
/**
@@ -44,7 +45,7 @@
private final ERGraphic graphic;
- private final Tool tool;
+ private final RTool tool;
private boolean started;
private boolean graphicLocatorStarted;
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo2/src/org/eclipse/statet/rj/example/rcpdemo/RServiManager.java b/examples/org.eclipse.statet.rj.example.rcpdemo2/src/org/eclipse/statet/rj/example/rcpdemo/RServiManager.java
index 94362b2..ee16292 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo2/src/org/eclipse/statet/rj/example/rcpdemo/RServiManager.java
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo2/src/org/eclipse/statet/rj/example/rcpdemo/RServiManager.java
@@ -33,7 +33,6 @@
import org.eclipse.statet.jcommons.status.ProgressMonitor;
import org.eclipse.statet.jcommons.status.Status;
import org.eclipse.statet.jcommons.status.StatusException;
-import org.eclipse.statet.jcommons.ts.core.Tool;
import org.eclipse.statet.jcommons.ts.core.ToolRunnable;
import org.eclipse.statet.ecommons.runtime.core.util.StatusUtils;
@@ -52,6 +51,7 @@
import org.eclipse.statet.rj.servi.node.RServiNodeConfig;
import org.eclipse.statet.rj.servi.node.RServiNodeFactory;
import org.eclipse.statet.rj.servi.node.RServiNodeManager;
+import org.eclipse.statet.rj.ts.core.RTool;
public class RServiManager implements Disposable {
@@ -191,7 +191,7 @@
}
- public synchronized Tool getRServiSession() throws StatusException {
+ public synchronized RTool getRServiSession() throws StatusException {
if (this.currentSession == null) {
final RServi servi= getRServi("session");
this.currentSession= new RServiSession(servi) {
@@ -218,7 +218,7 @@
public void schedule(final ToolRunnable runnable) throws StatusException {
- final Tool session= getRServiSession();
+ final RTool session= getRServiSession();
final Status status;
if (session != null) {
status= session.getQueue().add(runnable);
