[R-Help] Rename Application to RHelpServerApplication
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerConfiguration.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerConfiguration.java
index 5df33f4..2e01be1 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerConfiguration.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerConfiguration.java
@@ -23,7 +23,7 @@
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
-import org.eclipse.statet.rhelp.server.Application;
+import org.eclipse.statet.rhelp.server.RHelpServerApplication;
@Configuration
@@ -45,7 +45,7 @@
return dir;
}
else {
- final ApplicationHome applicationHome= new ApplicationHome(Application.class);
+ final ApplicationHome applicationHome= new ApplicationHome(RHelpServerApplication.class);
dir= applicationHome.getDir().toPath();
return dir.resolve("renvs"); //$NON-NLS-1$
}
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerImpl.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerImpl.java
index a1627c1..41791c7 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerImpl.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/renv/REnvManagerImpl.java
@@ -31,7 +31,7 @@
import org.eclipse.statet.jcommons.status.ErrorStatus;
import org.eclipse.statet.rhelp.core.REnvHelpConfiguration;
-import org.eclipse.statet.rhelp.server.Application;
+import org.eclipse.statet.rhelp.server.RHelpServerApplication;
import org.eclipse.statet.rj.renv.core.BasicREnvManager;
import org.eclipse.statet.rj.renv.core.REnvConfiguration;
import org.eclipse.statet.rj.renv.core.REnvManager;
@@ -107,7 +107,7 @@
return config;
}
catch (final Exception e) {
- CommonsRuntime.log(new ErrorStatus(Application.BUNDLE_ID,
+ CommonsRuntime.log(new ErrorStatus(RHelpServerApplication.BUNDLE_ID,
String.format("An error occurred when loading R environment configuration '%1$s'.", id),
e ));
return null;
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexController.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexController.java
index c869347..f1116e3 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexController.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexController.java
@@ -16,7 +16,7 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
-import static org.eclipse.statet.rhelp.server.Application.BUNDLE_ID;
+import static org.eclipse.statet.rhelp.server.RHelpServerApplication.BUNDLE_ID;
import java.util.ArrayList;
import java.util.List;
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexer.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexer.java
index 9ebfcfd..2d9bbd7 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexer.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvIndexer.java
@@ -16,7 +16,7 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
-import static org.eclipse.statet.rhelp.server.Application.BUNDLE_ID;
+import static org.eclipse.statet.rhelp.server.RHelpServerApplication.BUNDLE_ID;
import java.util.concurrent.ScheduledFuture;
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvServiController.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvServiController.java
index 35b09b8..d07acbf 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvServiController.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/REnvServiController.java
@@ -16,7 +16,7 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
-import static org.eclipse.statet.rhelp.server.Application.BUNDLE_ID;
+import static org.eclipse.statet.rhelp.server.RHelpServerApplication.BUNDLE_ID;
import java.util.NoSuchElementException;
@@ -31,7 +31,7 @@
import org.eclipse.statet.jcommons.status.ProgressMonitor;
import org.eclipse.statet.jcommons.status.StatusException;
-import org.eclipse.statet.rhelp.server.Application;
+import org.eclipse.statet.rhelp.server.RHelpServerApplication;
import org.eclipse.statet.rj.RjException;
import org.eclipse.statet.rj.renv.core.REnv;
import org.eclipse.statet.rj.renv.core.REnvConfiguration;
@@ -81,7 +81,7 @@
public void configure() throws StatusException {
final REnvConfiguration rEnvConfig= this.rEnv.get(REnvConfiguration.class);
if (rEnvConfig == null) {
- throw new StatusException(new ErrorStatus(Application.BUNDLE_ID,
+ throw new StatusException(new ErrorStatus(RHelpServerApplication.BUNDLE_ID,
"The configuration for R environment is missing." ));
}
@@ -98,7 +98,7 @@
catch (final ClassNotFoundException e) {
final String url= ClassLoaderUtils.getClassLocationUrlString(REnvServiController.class);
if (!url.startsWith("file:")) {
- throw new StatusException(new ErrorStatus(Application.BUNDLE_ID,
+ throw new StatusException(new ErrorStatus(RHelpServerApplication.BUNDLE_ID,
"An error occurred when configuring protocol handler for fat jar.",
e ));
}
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RLibPathsMonitor.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RLibPathsMonitor.java
index f594aa2..0f08dcc 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RLibPathsMonitor.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RLibPathsMonitor.java
@@ -16,7 +16,7 @@
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
-import static org.eclipse.statet.rhelp.server.Application.BUNDLE_ID;
+import static org.eclipse.statet.rhelp.server.RHelpServerApplication.BUNDLE_ID;
import java.io.IOException;
import java.nio.file.ClosedWatchServiceException;
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RPkgManagerImpl.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RPkgManagerImpl.java
index e4b9c37..b557ca7 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RPkgManagerImpl.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/internal/rhelp/server/update/RPkgManagerImpl.java
@@ -14,7 +14,7 @@
package org.eclipse.statet.internal.rhelp.server.update;
-import static org.eclipse.statet.rhelp.server.Application.BUNDLE_ID;
+import static org.eclipse.statet.rhelp.server.RHelpServerApplication.BUNDLE_ID;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/Application.java b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/RHelpServerApplication.java
similarity index 93%
rename from rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/Application.java
rename to rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/RHelpServerApplication.java
index 560c4ee..df3ef70 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/Application.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/main/java/org/eclipse/statet/rhelp/server/RHelpServerApplication.java
@@ -42,14 +42,14 @@
@ComponentScan (basePackageClasses= { RHelpServerInternals.class })
@ServletComponentScan (basePackageClasses= { RHelpServerInternals.class })
@NonNullByDefault
-public class Application extends BasicAppEnvironment {
+public class RHelpServerApplication extends BasicAppEnvironment {
public static final String BUNDLE_ID= "org.eclipse.statet.rhelp.server"; //$NON-NLS-1$
public static void main(final String[] args) {
- final SpringApplication app= new SpringApplication(Application.class);
+ final SpringApplication app= new SpringApplication(RHelpServerApplication.class);
if (args != null) {
final ImList<String> argList= ImCollections.newList(args);
@@ -68,7 +68,7 @@
private ApplicationContext appContext;
- public Application() throws StatusException {
+ public RHelpServerApplication() throws StatusException {
super(BUNDLE_ID, new ACommonsLoggingStatusLogger(), Bundles.createResolver());
CommonsRuntime.init(this);
diff --git a/rhelp/org.eclipse.statet.rhelp.server/src/test/java/org/eclipse/statet/rhelp/server/ApplicationTests.java b/rhelp/org.eclipse.statet.rhelp.server/src/test/java/org/eclipse/statet/rhelp/server/ApplicationTests.java
index 0e782ea..13c8e89 100644
--- a/rhelp/org.eclipse.statet.rhelp.server/src/test/java/org/eclipse/statet/rhelp/server/ApplicationTests.java
+++ b/rhelp/org.eclipse.statet.rhelp.server/src/test/java/org/eclipse/statet/rhelp/server/ApplicationTests.java
@@ -43,7 +43,7 @@
public void AppEnv_available() {
final AppEnvironment environment= assertNotNull(
CommonsRuntime.getEnvironment() );
- Assertions.assertEquals(Application.BUNDLE_ID, environment.getEnvId());
+ Assertions.assertEquals(RHelpServerApplication.BUNDLE_ID, environment.getEnvId());
}
@Test
