Bug 539762: [RJ-Server] Rename server command Ext(ended)_UI to Ext_Client
- Rename R function rj:::.rj_ui.execCommand to rj::.client.execCommand
Change-Id: I9c32e13f2e203f45e2b41a3e791c2d9da1576778
diff --git a/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
index 4fe855b..121cdef 100644
--- a/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
+++ b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/AbstractRJComClient.java
@@ -57,7 +57,7 @@
import org.eclipse.statet.rj.server.DataCmdItem.Operation;
import org.eclipse.statet.rj.server.DbgCmdItem;
import org.eclipse.statet.rj.server.DbgCmdItem.CustomDataReader;
-import org.eclipse.statet.rj.server.ExtUICmdItem;
+import org.eclipse.statet.rj.server.ExtClientCmdItem;
import org.eclipse.statet.rj.server.GDCmdItem;
import org.eclipse.statet.rj.server.GraOpCmdItem;
import org.eclipse.statet.rj.server.MainCmdC2SList;
@@ -425,7 +425,7 @@
runGC= true;
showMessage(this.mainIO.readString());
continue;
- case MainCmdItem.T_EXTENDEDUI_ITEM:
+ case MainCmdItem.T_EXT_CLIENT_ITEM:
runGC= true;
processUICallback(this.mainIO);
continue;
@@ -462,7 +462,7 @@
public final boolean processUICallback(final RJIO io) throws IOException {
- final ExtUICmdItem item= new ExtUICmdItem(io);
+ final ExtClientCmdItem item= new ExtClientCmdItem(io);
try {
final RList answer= handleUICallback(item.getDataText(), item.getDataArgs(),
this.progressMonitor);
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE b/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE
index 6d74100..5d68d56 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE
@@ -1,4 +1,5 @@
export(.rj.originals, .rj.tmp)
+export(.client.execCommand)
export(.console.loadHistory, .console.saveHistory, .console.addtoHistory)
export(statet.help, statet.help.start, .statet.initDebug, .statet.initHelp)
S3method(print, "help_files_with_topic")
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R
index 58ff270..7e951b0 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R
@@ -15,26 +15,26 @@
.console.loadHistory <- function(filename = ".Rhistory") {
if (!is.character(filename) || length(filename) != 1) {
- stop("Illegal argument: filename")
+ stop("Illegal argument: filename");
}
- .rj_ui.execCommand("console/loadHistory", list(
- filename = filename ), TRUE)
- return (invisible())
+ .client.execCommand("console/loadHistory", list(
+ filename = filename ), TRUE);
+ return (invisible());
}
.console.saveHistory <- function(filename = ".Rhistory") {
if (!is.character(filename) || length(filename) != 1) {
- stop("Illegal argument: filename")
+ stop("Illegal argument: filename");
}
- .rj_ui.execCommand("console/saveHistory", list(
- filename = filename ), TRUE)
- return (invisible())
+ .client.execCommand("console/saveHistory", list(
+ filename = filename ), TRUE);
+ return (invisible());
}
.console.addtoHistory <- function(line) {
if (missing(line) || !is.character(line) || length(line) != 1) {
- stop("Illegal argument: line")
+ stop("Illegal argument: line");
}
- .rj_ui.execCommand("console/addtoHistory", list(
- line = line ), FALSE)
- return (invisible())
+ .client.execCommand("console/addtoHistory", list(
+ line = line ), FALSE);
+ return (invisible());
}
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/uicommands.R b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R
similarity index 64%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/uicommands.R
rename to core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R
index 6edede2..3f5072c 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/uicommands.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R
@@ -13,35 +13,35 @@
#=============================================================================#
-## RJ UI
+## RJ Client (UI)
-#' Sends an UI command to the GUI which executes the command
-#' if it is supported
+#' Sends an custom command to the client which executes the command
+#' if it is supported ("ext client command")
#'
-#' @param commandId the id of the UI command
-#' @param args an optional list with arguments (meaning depends on UI command)
+#' @param commandId the id of the command
+#' @param args an optional list with arguments (meaning depends on command)
#' @param wait if R must wait until the command is executed
#' (necessary if you need a return value)
#' @returnType char
-.rj_ui.execCommand <- function(commandId, args = list(), wait = TRUE) {
+.client.execCommand <- function(commandId, args = list(), wait = TRUE) {
if (missing(commandId)) {
- stop("Missing param: commandId")
+ stop("Missing param: commandId");
}
if (!is.list(args)) {
- stop("Illegal argument: args must be a list")
+ stop("Illegal argument: args must be a list");
}
if (length(args) > 0) {
- args.names <- names(args)
+ args.names <- names(args);
if (is.null(args.names) || any(is.na(args.names))) {
- stop("Illegal argument: args must be named")
+ stop("Illegal argument: args must be named");
}
}
- options <- 0L
+ options <- 0L;
if (wait) {
- options <- options + 1L
+ options <- options + 1L;
}
- .Call("Re_ExecJCommand", paste("ui", commandId, sep=":"), args, options,
- PACKAGE= "(embedding)" )
+ .Call("Re_ExecJCommand", paste("ext", commandId, sep=":"), args, options,
+ PACKAGE= "(embedding)" );
}
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_help.R b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_help.R
index 61eb09f..71912cc 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_help.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_help.R
@@ -145,7 +145,7 @@
if (missing(url) || !is.character(url) || length(url) != 1) {
stop("Illegal argument: url")
}
- .rj_ui.execCommand("r/showHelp", list(
+ .client.execCommand("r/showHelp", list(
url= url ), wait= FALSE)
}
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_workbench.R b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_workbench.R
index 5411397..3360df0 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_workbench.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/pkg/R/statet_workbench.R
@@ -50,7 +50,7 @@
if (!is.character(fileName) || length(fileName) != 1) {
stop("Illegal argument: fileName")
}
- .rj_ui.execCommand("common/showFile", list(
+ .client.execCommand("common/showFile", list(
filename= fileName ), wait= TRUE)
}
else {
@@ -59,7 +59,7 @@
if (length(elementName) != 1) {
stop("Illegal argument: elementName")
}
- .rj_ui.execCommand("showElement", list(
+ .client.execCommand("showElement", list(
elementName= elementName ), wait= TRUE)
}
return (invisible())
@@ -69,7 +69,7 @@
#'
#' @export
openPackageManager <- function() {
- .rj_ui.execCommand("r/openPackageManager", wait= FALSE)
+ .client.execCommand("r/openPackageManager", wait= FALSE)
return (invisible())
}
@@ -81,7 +81,7 @@
if (!is.logical(new) || length(new) != 1) {
stop("Illegal argument: new")
}
- answer <- .rj_ui.execCommand("common/chooseFile", list(
+ answer <- .client.execCommand("common/chooseFile", list(
newResource= new ), wait= TRUE)
if (is.null(answer)) { # operation cancelled
return (invisible())
@@ -93,7 +93,7 @@
#'
#' @export
statet.showHistory <- function() {
- .rj_ui.execCommand("common/showHistory", wait= FALSE)
+ .client.execCommand("common/showHistory", wait= FALSE)
return (invisible())
}
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtUICmdItem.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtClientCmdItem.java
similarity index 89%
rename from core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtUICmdItem.java
rename to core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtClientCmdItem.java
index 9682afe..0492d92 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtUICmdItem.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/ExtClientCmdItem.java
@@ -21,9 +21,9 @@
/**
- * Command item for main loop UI interaction.
+ * Command item for main loop interaction with client.
*/
-public final class ExtUICmdItem extends MainCmdItem {
+public final class ExtClientCmdItem extends MainCmdItem {
private static final int OV_WITHMAP= 0x01000000;
@@ -36,7 +36,7 @@
private RjsStatus status;
- public ExtUICmdItem(final String command, final int options, final RList args, final boolean waitForClient) {
+ public ExtClientCmdItem(final String command, final int options, final RList args, final boolean waitForClient) {
assert (command != null);
this.command= command;
this.options= (waitForClient) ?
@@ -50,7 +50,7 @@
/**
* Constructor for deserialization
*/
- public ExtUICmdItem(final RJIO io) throws IOException {
+ public ExtClientCmdItem(final RJIO io) throws IOException {
this.requestId= io.readInt();
this.command= io.readString();
this.options= io.readInt();
@@ -82,7 +82,7 @@
@Override
public byte getCmdType() {
- return T_EXTENDEDUI_ITEM;
+ return T_EXT_CLIENT_ITEM;
}
@Override
@@ -135,10 +135,10 @@
@Override
public boolean testEquals(final MainCmdItem other) {
- if (!(other instanceof ExtUICmdItem)) {
+ if (!(other instanceof ExtClientCmdItem)) {
return false;
}
- final ExtUICmdItem otherItem= (ExtUICmdItem) other;
+ final ExtClientCmdItem otherItem= (ExtClientCmdItem) other;
if (!getDataText().equals(otherItem.getDataText())) {
return false;
}
@@ -155,7 +155,7 @@
@Override
public String toString() {
final StringBuffer sb= new StringBuffer(100);
- sb.append("ExtUICmdItem ");
+ sb.append("ExtClientCmdItem ");
sb.append(this.command);
sb.append("\n\t").append("options= 0x").append(Integer.toHexString(this.options));
if ((this.options & OV_WITHMAP) != 0) {
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdC2SList.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdC2SList.java
index 7bd4f14..1d05707 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdC2SList.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdC2SList.java
@@ -92,8 +92,8 @@
case MainCmdItem.T_MESSAGE_ITEM:
this.first= new ConsoleMessageCmdItem(io);
break;
- case MainCmdItem.T_EXTENDEDUI_ITEM:
- this.first= new ExtUICmdItem(io);
+ case MainCmdItem.T_EXT_CLIENT_ITEM:
+ this.first= new ExtClientCmdItem(io);
break;
case MainCmdItem.T_GRAPH_ITEM:
this.first= new GDCmdItem.Answer(io);
@@ -133,8 +133,8 @@
case MainCmdItem.T_MESSAGE_ITEM:
item= item.next= new ConsoleMessageCmdItem(io);
continue;
- case MainCmdItem.T_EXTENDEDUI_ITEM:
- item= item.next= new ExtUICmdItem(io);
+ case MainCmdItem.T_EXT_CLIENT_ITEM:
+ item= item.next= new ExtClientCmdItem(io);
continue;
case MainCmdItem.T_GRAPH_ITEM:
item= item.next= new GDCmdItem.Answer(io);
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdItem.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdItem.java
index 7af20ce..2a15c52 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdItem.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdItem.java
@@ -42,9 +42,9 @@
public static final byte T_MESSAGE_ITEM= 0x04;
/**
- * {@link ExtUICmdItem}
+ * {@link ExtClientCmdItem}
*/
- public static final byte T_EXTENDEDUI_ITEM= 0x05;
+ public static final byte T_EXT_CLIENT_ITEM= 0x05;
/**
* {@link GDCmdItem}
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdS2CList.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdS2CList.java
index 34b761e..ca78f24 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdS2CList.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/MainCmdS2CList.java
@@ -103,8 +103,8 @@
case MainCmdItem.T_MESSAGE_ITEM:
this.first= new ConsoleMessageCmdItem(io);
break;
- case MainCmdItem.T_EXTENDEDUI_ITEM:
- this.first= new ExtUICmdItem(io);
+ case MainCmdItem.T_EXT_CLIENT_ITEM:
+ this.first= new ExtClientCmdItem(io);
break;
case MainCmdItem.T_MAIN_CTRL_ITEM:
this.first= new MainCtrlCmdItem(io);
@@ -140,8 +140,8 @@
case MainCmdItem.T_MESSAGE_ITEM:
item= item.next= new ConsoleMessageCmdItem(io);
continue;
- case MainCmdItem.T_EXTENDEDUI_ITEM:
- item= item.next= new ExtUICmdItem(io);
+ case MainCmdItem.T_EXT_CLIENT_ITEM:
+ item= item.next= new ExtClientCmdItem(io);
continue;
case MainCmdItem.T_MAIN_CTRL_ITEM:
this.first= new MainCtrlCmdItem(io);
