From 7fb34dbf5994d9c9b56bad1d2b3721b456632cf1 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 25 Mar 2015 09:40:26 +0100 Subject: apply rules feedback --- .../src/main/hbs/coding-rules/coding-rules-rule-details.hbs | 2 +- server/sonar-web/src/main/js/coding-rules/rule-details-view.js | 9 +++++++-- server/sonar-web/src/main/js/nav/global-navbar-view.js | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-details.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-details.hbs index c4eca54f63d..f889780e6c6 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-details.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-details.hbs @@ -10,7 +10,7 @@ {{else}} {{/if}} - + {{/if}} diff --git a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js index 433acd69bf5..2f608db03a3 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js @@ -66,6 +66,7 @@ define([ if (this.model.get('isTemplate')) { this.fetchCustomRules(); } + this.listenTo(this.options.app.state, 'change:selectedIndex', this.select); }, onRender: function () { @@ -129,12 +130,10 @@ define([ var that = this; key('up', 'details', function () { that.options.app.controller.selectPrev(); - that.options.app.controller.showDetailsForSelected(); return false; }); key('down', 'details', function () { that.options.app.controller.selectNext(); - that.options.app.controller.showDetailsForSelected(); return false; }); key('left, backspace', 'details', function () { @@ -177,6 +176,12 @@ define([ }); }, + select: function () { + var selected = this.options.app.state.get('selectedIndex'), + selectedRule = this.options.app.list.at(selected); + this.options.app.controller.showDetails(selectedRule); + }, + serializeData: function () { var isManual = this.model.get('isManual'), isCustom = this.model.has('templateKey'), diff --git a/server/sonar-web/src/main/js/nav/global-navbar-view.js b/server/sonar-web/src/main/js/nav/global-navbar-view.js index 6103084b73c..64b199752a1 100644 --- a/server/sonar-web/src/main/js/nav/global-navbar-view.js +++ b/server/sonar-web/src/main/js/nav/global-navbar-view.js @@ -83,9 +83,9 @@ define([ userName: window.SS.userName, isUserAdmin: window.SS.isUserAdmin, - canManageGlobalDashboards: window.SS.user != null, - canManageIssueFilters: window.SS.user != null, - canManageMeasureFilters: window.SS.user != null + canManageGlobalDashboards: !!window.SS.user, + canManageIssueFilters: !!window.SS.user, + canManageMeasureFilters: !!window.SS.user }); } }); -- cgit v1.2.3 From b8962af7e846abbd93e8840326b5e16a22c694bf Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 25 Mar 2015 15:36:32 +0100 Subject: Improve javadoc of org.sonar.api.utils.log.Logger --- .../main/java/org/sonar/api/utils/log/Logger.java | 107 ++++++++++++++++----- 1 file changed, 84 insertions(+), 23 deletions(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Logger.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Logger.java index 93d25ffd89f..9c8244bc1bb 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Logger.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Logger.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; /** * SonarQube plugins are not coupled with external logging libraries like SLF4J or Logback. - *

+ *

* Example: * 
  * public class MyClass {
@@ -35,13 +35,13 @@ import javax.annotation.Nullable;
  *   }
  * }
  *
- *

+ *

* Message arguments are defined with {}, but not with {@link java.util.Formatter} syntax. * - *

+ *

* INFO, WARN and ERROR levels are always enabled. They can't be disabled by users. * DEBUG and TRACE levels are enabled on demand with the property sonar.log.level. - *

+ *

* See {@link org.sonar.api.utils.log.LogTester} for testing facilities. * @since 5.1 */ @@ -50,7 +50,9 @@ public interface Logger { boolean isTraceEnabled(); /** - * Logs a TRACE message. TRACE messages must + * Logs a TRACE message. + *

+ * TRACE messages must * be valuable for diagnosing production problems. They must not be used for development debugging. * They can significantly slow down performances. The standard use-case is logging of * SQL and Elasticsearch requests. @@ -58,17 +60,39 @@ public interface Logger { void trace(String msg); /** - * @see #trace(String) + * Logs an TRACE parameterized message according to the specified format and argument. Example: + * trace("Value is {}", value) + *

+ * TRACE messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. + * They can significantly slow down performances. The standard use-case is logging of + * SQL and Elasticsearch requests. */ void trace(String pattern, @Nullable Object arg); /** - * @see #trace(String) + * Logs an TRACE parameterized message according to the specified format and arguments. Example: + * trace("Values are {} and {}", value1, value2) + *

+ * TRACE messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. + * They can significantly slow down performances. The standard use-case is logging of + * SQL and Elasticsearch requests. */ void trace(String msg, @Nullable Object arg1, @Nullable Object arg2); /** - * @see #trace(String) + * Logs an TRACE parameterized message according to the specified format and arguments. Example: + * trace("Values are {} and {}", value1, value2) + *

+ * TRACE messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. + * They can significantly slow down performances. The standard use-case is logging of + * SQL and Elasticsearch requests. + *

+ * This variant incurs the hidden cost of creating an Object[] before invoking the method. + * The variants taking one and two arguments exist solely in order to avoid this hidden cost. See + * {@link #trace(String, Object)} and {@link #trace(String, Object, Object)} */ void trace(String msg, Object... args); @@ -81,17 +105,33 @@ public interface Logger { void debug(String msg); /** - * @see #debug(String) + * Logs an DEBUG parameterized message according to the specified format and argument. Example: + * debug("Value is {}", value) + *

+ * Debug messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. */ void debug(String pattern, @Nullable Object arg); /** - * @see #debug(String) + * Logs an DEBUG parameterized message according to the specified format and arguments. Example: + * debug("Values are {} and {}", value1, value2) + *

+ * Debug messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. */ void debug(String msg, @Nullable Object arg1, @Nullable Object arg2); /** - * @see #debug(String) + * Logs an DEBUG parameterized message according to the specified format and arguments. Example: + * debug("Values are {}, {} and {}", value1, value2, value3) + *

+ * Debug messages must + * be valuable for diagnosing production problems. They must not be used for development debugging. + * *

+ * This variant incurs the hidden cost of creating an Object[] before invoking the method. + * The variants taking one and two arguments exist solely in order to avoid this hidden cost. See + * {@link #debug(String, Object)} and {@link #debug(String, Object, Object)} */ void debug(String msg, Object... args); @@ -101,17 +141,24 @@ public interface Logger { void info(String msg); /** - * @see #info(String) + * Logs an INFO parameterized message according to the specified format and argument. Example: + * info("Value is {}", value) */ void info(String msg, @Nullable Object arg); /** - * @see #info(String) + * Logs an INFO parameterized message according to the specified format and arguments. Example: + * info("Values are {} and {}", value1, value2) */ void info(String msg, @Nullable Object arg1, @Nullable Object arg2); /** - * @see #info(String) + * Logs an INFO parameterized message according to the specified format and arguments. Example: + * info("Values are {}, {} and {}", value1, value2, value3) + *

+ * This variant incurs the hidden cost of creating an Object[] before invoking the method. + * The variants taking one and two arguments exist solely in order to avoid this hidden cost. See + * {@link #info(String, Object)} and {@link #info(String, Object, Object)} */ void info(String msg, Object... args); @@ -121,17 +168,24 @@ public interface Logger { void warn(String msg); /** - * @see #warn(String) + * Logs a WARN parameterized message according to the specified format and argument. Example: + * warn("Value is {}", value) */ void warn(String msg, @Nullable Object arg); /** - * @see #warn(String) + * Logs a WARN parameterized message according to the specified format and arguments. Example: + * warn("Values are {} and {}", value1, value2) */ void warn(String msg, @Nullable Object arg1, @Nullable Object arg2); /** - * @see #warn(String) + * Logs a WARN parameterized message according to the specified format and arguments. Example: + * warn("Values are {}, {} and {}", value1, value2, value3) + *

+ * This variant incurs the hidden cost of creating an Object[] before invoking the method. + * The variants taking one and two arguments exist solely in order to avoid this hidden cost. See + * {@link #warn(String, Object)} and {@link #warn(String, Object, Object)} */ void warn(String msg, Object... args); @@ -141,22 +195,29 @@ public interface Logger { void error(String msg); /** - * @see #error(String) + * Logs an ERROR parameterized message according to the specified format and argument. Example: + * error("Value is {}", value) */ void error(String msg, @Nullable Object arg); /** - * @see #error(String) + * Logs a ERROR parameterized message according to the specified format and arguments. Example: + * error("Values are {} and {}", value1, value2) */ void error(String msg, @Nullable Object arg1, @Nullable Object arg2); /** - * @see #error(String) + * Logs a ERROR parameterized message according to the specified format and arguments. Example: + * error("Values are {}, {} and {}", value1, value2, value3) + *

+ * This variant incurs the hidden cost of creating an Object[] before invoking the method. + * The variants taking one and two arguments exist solely in order to avoid this hidden cost. See + * {@link #error(String, Object)} and {@link #error(String, Object, Object)} */ void error(String msg, Object... args); /** - * @see #error(String) + * Logs an exception at the ERROR level with an accompanying message. */ void error(String msg, Throwable thrown); @@ -164,10 +225,10 @@ public interface Logger { * Attempt to change logger level. Return true if it succeeded, false if * the underlying logging facility does not allow to change level at * runtime. - *

+ *

* This method must not be used to enable DEBUG or TRACE logs in tests. Use * {@link org.sonar.api.utils.log.LogTester#setLevel(LoggerLevel)} instead. - *

+ *

* The standard use-case is to customize logging of embedded 3rd-party * libraries. */ -- cgit v1.2.3