#5039: rename to BeakerClientManager

twosigma · Jun 20, 2018 · 861c511 · 861c511
1 parent 613658e
commit 861c511
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/...wosigma/beakerx/BeakerxClientManager.java → ...twosigma/beakerx/BeakerClientManager.java b/...wosigma/beakerx/BeakerxClientManager.java → ...twosigma/beakerx/BeakerClientManager.java
@@ -16,7 +16,7 @@
 package com.twosigma.beakerx;
 
 
-public class BeakerxClientManager {
+public class BeakerClientManager {
 
   private static BeakerXClient beakerxClientInst;
 

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/chart/ChartDetails.java b/kernel/base/src/main/java/com/twosigma/beakerx/chart/ChartDetails.java
@@ -16,7 +16,7 @@
 
 package com.twosigma.beakerx.chart;
 
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.widget.CommActions;
 import org.apache.commons.lang3.StringUtils;
 
@@ -90,9 +90,9 @@ protected void onActionDetails(HashMap content, Message message) {
     info.setGraphics(g);
     updateDetails(info);
     if (CommActions.ONCLICK.equals(info.getActionType())) {
-      BeakerxClientManager.get().runByTag(info.getTag());
+      BeakerClientManager.get().runByTag(info.getTag());
     } else if (CommActions.ONKEY.equals(info.getActionType())) {
-      BeakerxClientManager.get().runByTag(info.getTag());
+      BeakerClientManager.get().runByTag(info.getTag());
     }
   }
 

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
@@ -16,7 +16,7 @@
 package com.twosigma.beakerx.evaluator;
 
 import com.twosigma.beakerx.BeakerXClient;
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.DefaultJVMVariables;
 import com.twosigma.beakerx.inspect.Inspect;
 import com.twosigma.beakerx.inspect.InspectResult;
@@ -71,7 +71,7 @@ public BaseEvaluator(String id,
     sessionId = sId;
     executor = cellExecutor;
     tempFolder = tempFolderFactory.createTempFolder();
-    this.beakerxClient = BeakerxClientManager.register(beakerxClient);
+    this.beakerxClient = BeakerClientManager.register(beakerxClient);
     outDir = getOrCreateFile(tempFolder.toString() + File.separator + "outDir").getPath();
     classPath = new Classpath();
     classPath.add(new PathToJar(outDir));

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/AutotranslationHandler.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/AutotranslationHandler.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.kernel.comm;
 
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.kernel.KernelFunctionality;
 import com.twosigma.beakerx.message.Message;
 
@@ -38,7 +38,7 @@ public void handle(Message message) {
 
   private void handleMsg(Message message, KernelFunctionality kernel) {
     Map<String, Object> data = (Map) message.getContent().get("data");
-    BeakerxClientManager.get().update((String) data.get("name"), data.get("value"));
+    BeakerClientManager.get().update((String) data.get("name"), data.get("value"));
   }
 
   @Override

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/GetCodeCellsHandler.java b/kernel/base/src/main/java/com/twosigma/beakerx/kernel/comm/GetCodeCellsHandler.java
@@ -17,7 +17,7 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.CodeCell;
 import com.twosigma.beakerx.jvm.serialization.BasicObjectSerializer;
 import com.twosigma.beakerx.jvm.serialization.BeakerObjectConverter;
@@ -54,7 +54,7 @@ public void handle(Message message) {
   private void handleMsg(Message message) {
     try {
       List<CodeCell> cells = getBeakerCodeCells(getValueFromData(message, getHandlerCommand()));
-      BeakerxClientManager.get().getMessageQueue("CodeCells").put(cells);
+      BeakerClientManager.get().getMessageQueue("CodeCells").put(cells);
     } catch (InterruptedException e) {
       e.printStackTrace();
     }

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/table/TableDisplayActions.java b/kernel/base/src/main/java/com/twosigma/beakerx/table/TableDisplayActions.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.table;
 
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.message.Message;
 import com.twosigma.beakerx.table.action.TableActionDetails;
 import com.twosigma.beakerx.widget.CommActions;
@@ -87,11 +87,11 @@ private void onActionDetails(HashMap content, Message message) {
     tableDisplay.setDetails(details);
     if (CommActions.CONTEXT_MENU_CLICK.equals(details.getActionType())) {
       if (tableDisplay.getContextMenuTags() != null && !tableDisplay.getContextMenuTags().isEmpty() && details.getContextMenuItem() != null && !details.getContextMenuItem().isEmpty()) {
-        BeakerxClientManager.get().runByTag(tableDisplay.getContextMenuTags().get(details.getContextMenuItem()));
+        BeakerClientManager.get().runByTag(tableDisplay.getContextMenuTags().get(details.getContextMenuItem()));
       }
     } else if (CommActions.DOUBLE_CLICK.equals(details.getActionType())) {
       if (tableDisplay.getDoubleClickTag() != null && !tableDisplay.getDoubleClickTag().isEmpty()) {
-        BeakerxClientManager.get().runByTag(tableDisplay.getDoubleClickTag());
+        BeakerClientManager.get().runByTag(tableDisplay.getDoubleClickTag());
       }
     }
   }

diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/widget/Button.java b/kernel/base/src/main/java/com/twosigma/beakerx/widget/Button.java
@@ -15,7 +15,7 @@
  */
 package com.twosigma.beakerx.widget;
 
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.handler.Handler;
 import com.twosigma.beakerx.message.Message;
 
@@ -93,7 +93,7 @@ public void onClick(HashMap content, Message message) {
       actionPerformed.executeAction(content, message);
     }
     if (getTag() != null && !getTag().isEmpty()) {
-      BeakerxClientManager.get().runByTag(getTag());
+      BeakerClientManager.get().runByTag(getTag());
     }
   }
 

diff --git a/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java b/kernel/sql/src/main/java/com/twosigma/beakerx/sql/autocomplete/db/DbExplorerFactory.java
@@ -17,7 +17,7 @@
 package com.twosigma.beakerx.sql.autocomplete.db;
 
 import com.twosigma.beakerx.BeakerXClient;
-import com.twosigma.beakerx.BeakerxClientManager;
+import com.twosigma.beakerx.BeakerClientManager;
 import com.twosigma.beakerx.sql.BeakerParser;
 import com.twosigma.beakerx.sql.ConnectionStringHolder;
 import com.twosigma.beakerx.sql.DBConnectionException;
@@ -40,7 +40,7 @@ public class DbExplorerFactory {
   public static DbInfo getDbInfo(String txt, JDBCClient jdbcClient, String sessionId,
                                  ConnectionStringHolder defaultConnectionString, Map<String, ConnectionStringHolder> namedConnectionString) {
 
-    final BeakerXClient namespaceClient = BeakerxClientManager.get();
+    final BeakerXClient namespaceClient = BeakerClientManager.get();
     final BeakerParser beakerParser;
     try {
       beakerParser = new BeakerParser(txt, namespaceClient,