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

Fix order of properties in ui and java code style

Browse source
This commit is contained in:
Mina Lee 2016-10-24 17:32:19 +09:00
parent 1a2a41dc44
commit 4eba177c9b
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
View file

@ -263,10 +263,10 @@ limitations under the License.
<th>description</th>
<th>action</th>
</tr>
<tr ng-repeat="(key, value) in newInterpreterSetting.properties">
<tr ng-repeat="key in newInterpreterSetting.properties | sortByKey">
<td>{{key}}</td>
<td><textarea msd-elastic ng-model="value.value"></textarea></td>
<td>{{value.description}}</td>
<td><textarea msd-elastic ng-model="newInterpreterSetting.properties[key].value"></textarea></td>
<td>{{newInterpreterSetting.properties[key].description}}</td>
<td>
<button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
</button>

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

@ -286,7 +286,7 @@ public class InterpreterFactory implements InterpreterGroupFactory {
private InterpreterSetting createFromInterpreterSettingRef(InterpreterSetting o) {
InterpreterSetting setting =
new InterpreterSetting(o.getName(), o.getName(), o.getInterpreterInfos(),
convertInterpreterProperties((Map <String, InterpreterProperty>)o.getProperties()),
convertInterpreterProperties((Map <String, InterpreterProperty>) o.getProperties()),
o.getDependencies(), o.getOption(), o.getPath());
setting.setInterpreterGroupFactory(this);
return setting;
@ -612,7 +612,8 @@ public class InterpreterFactory implements InterpreterGroupFactory {
throws InterpreterException, IOException, RepositoryException {
ArrayList<InterpreterInfo> infos = new ArrayList<>();
infos.add(interpreterInfo);
return add(group, infos, new ArrayList<Dependency>(), defaultOption, interpreterProperties, path);
return add(group, infos, new ArrayList<Dependency>(), defaultOption,
interpreterProperties, path);
}
/**
@ -667,8 +668,8 @@ public class InterpreterFactory implements InterpreterGroupFactory {
} else {
interpreterSetting =
new InterpreterSetting(group, null, interpreterInfos, interpreterProperties, dependencies, option,
path);
new InterpreterSetting(group, null, interpreterInfos, interpreterProperties,
dependencies, option, path);
interpreterSettingsRef.put(group, interpreterSetting);
}
}