Update R pkg prototype
diff --git a/core/org.eclipse.statet.rj.server.rpkg/.classpath b/core/org.eclipse.statet.rj.server.rpkg/.classpath
index b9bb8ea..df691b6 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/.classpath
+++ b/core/org.eclipse.statet.rj.server.rpkg/.classpath
@@ -4,13 +4,19 @@
<attributes>
<attribute name="module" value="true"/>
<attribute name="annotationpath" value="/org.eclipse.statet/eea/"/>
+ <attribute name="maven.pomderived" value="false"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
- <attribute name="annotationpath" value="/org.eclipse.statet/eea/"/>
+ <attribute name="maven.pomderived" value="false"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>)
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/core/org.eclipse.statet.rj.server.rpkg/.project b/core/org.eclipse.statet.rj.server.rpkg/.project
index e1acb51..91da20b 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/.project
+++ b/core/org.eclipse.statet.rj.server.rpkg/.project
@@ -11,18 +11,18 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
+ <name>org.eclipse.statet.r.resourceProjects.RBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.statet.ide.resourceProjects.Statet</nature>
<nature>org.eclipse.statet.r.resourceProjects.R</nature>
diff --git a/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF
deleted file mode 100644
index c58145b..0000000
--- a/core/org.eclipse.statet.rj.server.rpkg/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.statet.rj.server.rpkg
-Automatic-Module-Name: org.eclipse.statet.rj.server.rpkg
-Bundle-Version: 4.5.0.qualifier
-Bundle-Vendor: Eclipse StatET
-Bundle-Name: StatET RJ - Server - R Package Skeleton + API (Incubation)
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.statet.rj.data;bundle-version="[4.5.0,4.6.0)",
- org.eclipse.statet.rj.server;bundle-version="[4.5.0,4.6.0)"
-Import-Package: org.eclipse.statet.jcommons.lang;version="4.5.0"
diff --git a/core/org.eclipse.statet.rj.server.rpkg/build.properties b/core/org.eclipse.statet.rj.server.rpkg/build.properties
deleted file mode 100644
index 3ff437b..0000000
--- a/core/org.eclipse.statet.rj.server.rpkg/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source..= src/
-output..= target/classes/
-javacDefaultEncoding..= UTF-8
-
-bin.includes= META-INF/,\
- pkg/,\
- about.html
-src.includes=.settings/org.eclipse.core.resources.prefs
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pom.xml b/core/org.eclipse.statet.rj.server.rpkg/pom.xml
new file mode 100644
index 0000000..0ed2673
--- /dev/null
+++ b/core/org.eclipse.statet.rj.server.rpkg/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*=============================================================================#
+ # Copyright (c) 2020, 2021 Stephan Wahlbrink and others.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Apache License, Version 2.0 which is available at
+ # https://www.apache.org/licenses/LICENSE-2.0
+ #
+ # SPDX-License-Identifier: Apache-2.0
+ #
+ # Contributors:
+ # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================*/
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.statet.rj</groupId>
+ <artifactId>rj.core</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.statet.rj.server.rpkg</artifactId>
+ <name>StatET RJ - Server - R Package Skeleton + API (Incubation)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.statet.jcommons</groupId>
+ <artifactId>org.eclipse.statet.jcommons.util</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.statet.rj</groupId>
+ <artifactId>org.eclipse.statet.rj.data</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.statet.rj</groupId>
+ <artifactId>org.eclipse.statet.rj.server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/DESCRIPTION
similarity index 94%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/DESCRIPTION
index cb5ab4d..afb6ff0 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/DESCRIPTION
+++ b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/DESCRIPTION
@@ -4,7 +4,7 @@
Title: RJ - R Package for high-level Java-R library RJ
Author: Stephan Wahlbrink and others
Maintainer: Eclipse StatET Project <statet-dev@eclipse.org>
-Depends: R (>= 2.11.0)
+Depends: R (>= 3.5.0)
SystemRequirements: java
Description: R interface for the high-level Java-R library RJ. The
package also includes callback functions for StatET.
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/NAMESPACE
similarity index 91%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/NAMESPACE
index 27d74f3..5b18e59 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/NAMESPACE
+++ b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/NAMESPACE
@@ -18,5 +18,6 @@
export(.console.loadHistory, .console.saveHistory, .console.addtoHistory)
export(rj.GD, .rj.initGD)
export(statet.help, statet.help.start, .statet.initDebug, .statet.initHelp)
-export(openInEditor, openPackageManager, statet.chooseFile, statet.showHistory)
+export(statet.showHistory)
+export(openInEditor, openPackageManager, chooseFile)
export(dbg.updateTracepoints)
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/console.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/console.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/console.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/dataaccess.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/dataaccess.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/dataaccess.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/dataaccess.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/dbg.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/dbg.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/dbg.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/dbg.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ext_commands.R
similarity index 97%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ext_commands.R
index d4a618c..93af5cf 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ext_commands.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ext_commands.R
@@ -42,6 +42,6 @@
options <- options + 1L;
}
.Call("Re_ExecJCommand", paste("ext", commandId, sep= ":"), args, options,
- PACKAGE= "(embedding)" );
+ PACKAGE= "(embedding)" );
}
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/help.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/help.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/help.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/help.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ide.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ide.R
similarity index 95%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/ide.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ide.R
index 27e12f0..3e5b239 100644
--- a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ide.R
+++ b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ide.R
@@ -77,18 +77,19 @@
#'
#' @param new if the choosen file can be new (does not yet exits)
#' @export
-statet.chooseFile <- function(new= FALSE) {
+chooseFile <- function(new= FALSE) {
if (!is.logical(new) || length(new) != 1) {
- stop("Illegal argument: new")
+ stop("Illegal argument: new");
}
answer <- .client.execCommand("common/chooseFile", list(
newResource= new ), wait= TRUE)
if (is.null(answer)) { # operation cancelled
- return (invisible())
+ return (invisible());
}
- return (answer$filename)
+ return (answer$filename);
}
+
#' Shows the Cmd History view in StatET
#'
#' @export
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/ide_internal.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ide_internal.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/ide_internal.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/ide_internal.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/init.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/init.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/init.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/init.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/rgd.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/rgd.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/rgd.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/rgd.R
diff --git a/core/org.eclipse.statet.rj.server.rpkg/pkg/R/utils.R b/core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/utils.R
similarity index 100%
rename from core/org.eclipse.statet.rj.server.rpkg/pkg/R/utils.R
rename to core/org.eclipse.statet.rj.server.rpkg/src/rpkg/R/utils.R
