You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/10/28 10:41:51 UTC
[1/2] ignite git commit: IGNITE-1749 Close input stream.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 ec266e3cd -> 6a35c4c95
IGNITE-1749 Close input stream.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db3548eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db3548eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db3548eb
Branch: refs/heads/ignite-843-rc1
Commit: db3548eba2e708f629f63d8557b5de69fcbb04fb
Parents: ec266e3
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Oct 28 16:40:15 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Oct 28 16:40:15 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/generator/generator-java.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/db3548eb/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 971c87d..32642d5 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -1692,7 +1692,9 @@ $generatorJava.cluster = function (cluster, javaClass, clientNearCfg) {
res.line(res.importClass('java.net.URL') + ' res = IgniteConfiguration.class.getResource("/secret.properties");');
res.line(res.importClass('java.io.File') + ' propsFile = new File(res.toURI());');
res.line(res.importClass('java.util.Properties') + ' props = new Properties();');
- res.line('props.load(new ' + res.importClass('java.io.FileInputStream') + '(propsFile));');
+ res.startBlock('try (' + res.importClass('java.io.InputStream') + ' in = new ' + res.importClass('java.io.FileInputStream') + '(propsFile)) {');
+ res.line('props.load(in);');
+ res.endBlock('}');
res.needEmptyLine = true;
}
[2/2] ignite git commit: IGNITE-1729 Hiding of showed element details
by filtration.
Posted by an...@apache.org.
IGNITE-1729 Hiding of showed element details by filtration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a35c4c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a35c4c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a35c4c9
Branch: refs/heads/ignite-843-rc1
Commit: 6a35c4c95ff9300585303c9b99ecb1dd0f11ab98
Parents: db3548e
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Oct 28 16:41:39 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Oct 28 16:41:39 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/configuration/caches.jade | 2 +-
.../src/main/js/views/configuration/metadata.jade | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a35c4c9/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 1727ba7..c50d16a 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -37,7 +37,7 @@ block content
.panel-tip-container(ng-show='backupItem')
a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
hr
- form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
+ form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('general', 'backupItem')
div(ng-show='ui.expanded')
http://git-wip-us.apache.org/repos/asf/ignite/blob/6a35c4c9/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index 0a15840..9242c8e 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -62,7 +62,7 @@ block content
.panel-tip-container(ng-show='backupItem')
a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset
hr
- form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)
+ form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('metadata', 'backupItem')
.section