[RJ-Client] Make RClientGraphicDummyFactory public
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 ac4acfd..7e9e006 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
@@ -23,7 +23,6 @@
import java.rmi.ConnectException;
import java.rmi.RemoteException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -38,7 +37,6 @@
import java.util.concurrent.locks.ReentrantLock;
import org.eclipse.statet.jcommons.lang.NonNull;
-import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.jcommons.status.ErrorStatus;
import org.eclipse.statet.jcommons.status.InfoStatus;
@@ -124,27 +122,6 @@
private static final Random RAND= new Random();
- @NonNullByDefault
- private static class DummyFactory implements RClientGraphicFactory {
-
- @Override
- public Map<String, ? extends Object> getInitServerProperties() {
- return Collections.emptyMap();
- }
-
- @Override
- public RClientGraphic newGraphic(final int devId, final double w, final double h,
- final InitConfig config,
- final boolean active, final @Nullable RClientGraphicActions actions, final int options) {
- return new RClientGraphicDummy(devId, w, h);
- }
-
- @Override
- public void closeGraphic(final RClientGraphic graphic) {
- }
-
- }
-
private final static class RunnableList {
private Runnable[] array;
@@ -300,7 +277,7 @@
}
}
else {
- this.graphicFactory= new DummyFactory();
+ this.graphicFactory= new RClientGraphicDummyFactory();
log(new WarningStatus(RJ_CLIENT_ID,
"No R client graphic factory configured." ));
}
diff --git a/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/RClientGraphicDummyFactory.java b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/RClientGraphicDummyFactory.java
new file mode 100644
index 0000000..e7fdc5a
--- /dev/null
+++ b/core/org.eclipse.statet.rj.client/src/org/eclipse/statet/rj/server/client/RClientGraphicDummyFactory.java
@@ -0,0 +1,50 @@
+/*=============================================================================#
+ # Copyright (c) 2019 Stephan Wahlbrink <sw@wahlbrink.eu> and others.
+ #
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ #
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ #
+ # Contributors:
+ # Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================*/
+
+package org.eclipse.statet.rj.server.client;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
+import org.eclipse.statet.rj.server.client.RClientGraphic.InitConfig;
+
+
+@NonNullByDefault
+public class RClientGraphicDummyFactory implements RClientGraphicFactory {
+
+
+ public RClientGraphicDummyFactory() {
+ }
+
+
+ @Override
+ public Map<String, ? extends Object> getInitServerProperties() {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public RClientGraphic newGraphic(final int devId, final double w, final double h,
+ final InitConfig config,
+ final boolean active, final @Nullable RClientGraphicActions actions, final int options) {
+ return new RClientGraphicDummy(devId, w, h);
+ }
+
+ @Override
+ public void closeGraphic(final RClientGraphic graphic) {
+ }
+
+}
