Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check null condition of editor setting and return default setting

Browse source
This commit is contained in:
Mina Lee 2016-10-24 10:57:06 +09:00
parent 38d5e355b5
commit c5667066a2
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pig/src/main/resources/interpreter-setting.json
View file

@ -18,7 +18,8 @@
}
},
"editor": {
"language": "pig"
"language": "pig",
"editOnDblClick": false
}
},
{

17
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -127,6 +127,10 @@ public class InterpreterFactory implements InterpreterGroupFactory {
private Interpreter devInterpreter;
private static final Map<String, Object> DEFAULT_EDITOR = ImmutableMap.of(
"language", (Object) "text",
"editOnDblClick", false);
public InterpreterFactory(ZeppelinConfiguration conf,
AngularObjectRegistryListener angularObjectRegistryListener,
RemoteInterpreterProcessListener remoteInterpreterProcessListener,
@ -429,11 +433,15 @@ public class InterpreterFactory implements InterpreterGroupFactory {
String className) {
List<InterpreterInfo> intpInfos = intpSetting.getInterpreterInfos();
for (InterpreterInfo intpInfo : intpInfos) {
if (className.equals(intpInfo.getClassName())) {
if (intpInfo.getEditor() == null) {
break;
}
return intpInfo.getEditor();
}
}
return ImmutableMap.of("language", (Object) "text");
return DEFAULT_EDITOR;
}
private void loadInterpreterDependencies(final InterpreterSetting setting) {
@ -1349,10 +1357,7 @@ public class InterpreterFactory implements InterpreterGroupFactory {
public Map<String, Object> getEditorSetting(String user, String noteId, String replName) {
Interpreter intp = getInterpreter(user, noteId, replName);
Map<String, Object> editor = Maps.newHashMap(
ImmutableMap.<String, Object>builder()
.put("language", "text")
.put("editOnDblClick", false).build());
Map<String, Object> editor = DEFAULT_EDITOR;
String defaultSettingName = getDefaultInterpreterSetting(noteId).getName();
String group = StringUtils.EMPTY;
try {
@ -1373,7 +1378,7 @@ public class InterpreterFactory implements InterpreterGroupFactory {
}
}
} catch (NullPointerException e) {
logger.warn("Couldn't get interpreter editor language");
logger.warn("Couldn't get interpreter editor setting");
}
return editor;
}