aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties24
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java16
2 files changed, 20 insertions, 20 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index fa363d06656..8a881642bbf 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -932,7 +932,7 @@ widget.duplications.files.suffix=\ files
widget.complexity.name=Complexity
widget.complexity.description=Reports on complexity, average complexity and complexity distribution.
-widget.complexity.per_method.suffix=\ /method
+widget.complexity.per_method.suffix=\ /function
widget.complexity.per_class.suffix=\ /class
widget.complexity.per_file.suffix=\ /file
widget.complexity.total=Total
@@ -986,7 +986,7 @@ widget.size.classes=Classes
widget.size.files=Files
widget.size.packages.suffix=\ packages
widget.size.directories.suffix=\ directories
-widget.size.methods.suffix=\ methods
+widget.size.methods.suffix=\ functions
widget.size.accessors.suffix=\ accessors
widget.size.projects.suffix=\ projects
@@ -1765,8 +1765,8 @@ metric.directories.abbreviation=Dirs
metric.files.name=Files
metric.files.description=Number of files
-metric.functions.name=Methods
-metric.functions.description=Methods
+metric.functions.name=Functions
+metric.functions.description=Functions
metric.generated_lines.name=Generated Lines
metric.generated_lines.description=Number of generated lines
@@ -1791,11 +1791,11 @@ metric.public_api.name=Public API
metric.public_api.description=Public API
metric.public_documented_api_density.name=Public documented API (%)
-metric.public_documented_api_density.description=Public documented classes and methods balanced by ncloc
+metric.public_documented_api_density.description=Public documented classes and functions balanced by ncloc
metric.public_documented_api_density.abbreviation=Pub. doc. API(%)
metric.public_undocumented_api.name=Public undocumented API
-metric.public_undocumented_api.description=Public undocumented classes, methods and variables
+metric.public_undocumented_api.description=Public undocumented classes, functions and variables
metric.public_undocumented_api.abbreviation=Pub. undoc. API
metric.statements.name=Statements
@@ -1806,9 +1806,9 @@ metric.class_complexity.name=Complexity /class
metric.class_complexity.description=Complexity average by class
metric.class_complexity.abbreviation=Cmpx/class
-metric.function_complexity.name=Complexity /method
-metric.function_complexity.description=Complexity average by method
-metric.function_complexity.abbreviation=Cmpx/method
+metric.function_complexity.name=Complexity /function
+metric.function_complexity.description=Complexity average by function
+metric.function_complexity.abbreviation=Cmpx/function
metric.file_complexity.name=Complexity /file
metric.file_complexity.description=Complexity average by file
@@ -1817,8 +1817,8 @@ metric.file_complexity.abbreviation=Cmpx/file
metric.class_complexity_distribution.name=Classes distribution /complexity
metric.class_complexity_distribution.description=Classes distribution /complexity
-metric.function_complexity_distribution.name=Methods distribution /complexity
-metric.function_complexity_distribution.description=Methods distribution /complexity
+metric.function_complexity_distribution.name=Functions distribution /complexity
+metric.function_complexity_distribution.description=Functions distribution /complexity
metric.file_complexity_distribution.name=Files distribution /complexity
metric.file_complexity_distribution.description=Files distribution /complexity
@@ -2143,7 +2143,7 @@ metric.rfc_distribution.name=Class distribution /RFC
metric.rfc_distribution.description=Class distribution /RFC
metric.lcom4.name=LCOM4
-metric.lcom4.description=Lack of Cohesion of Methods
+metric.lcom4.description=Lack of Cohesion of Functions
metric.lcom4_blocks.name=LCOM4 blocks
metric.lcom4_blocks.description=LCOM4 blocks
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
index cb4a15aff47..8cba132e0dd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
@@ -130,8 +130,8 @@ public final class CoreMetrics {
.create();
public static final String FUNCTIONS_KEY = "functions";
- public static final Metric FUNCTIONS = new Metric.Builder(FUNCTIONS_KEY, "Methods", Metric.ValueType.INT)
- .setDescription("Methods")
+ public static final Metric FUNCTIONS = new Metric.Builder(FUNCTIONS_KEY, "Functions", Metric.ValueType.INT)
+ .setDescription("Functions")
.setDirection(Metric.DIRECTION_WORST)
.setQualitative(false)
.setDomain(DOMAIN_SIZE)
@@ -225,7 +225,7 @@ public final class CoreMetrics {
public static final String PUBLIC_DOCUMENTED_API_DENSITY_KEY = "public_documented_api_density";
public static final Metric PUBLIC_DOCUMENTED_API_DENSITY = new Metric.Builder(PUBLIC_DOCUMENTED_API_DENSITY_KEY, "Public documented API (%)", Metric.ValueType.PERCENT)
- .setDescription("Public documented classes and methods balanced by ncloc")
+ .setDescription("Public documented classes and functions balanced by ncloc")
.setDirection(Metric.DIRECTION_BETTER)
.setQualitative(true)
.setDomain(DOMAIN_DOCUMENTATION)
@@ -236,7 +236,7 @@ public final class CoreMetrics {
public static final String PUBLIC_UNDOCUMENTED_API_KEY = "public_undocumented_api";
public static final Metric PUBLIC_UNDOCUMENTED_API = new Metric.Builder(PUBLIC_UNDOCUMENTED_API_KEY, "Public undocumented API", Metric.ValueType.INT)
- .setDescription("Public undocumented classes, methods and variables")
+ .setDescription("Public undocumented classes, functions and variables")
.setDirection(Metric.DIRECTION_WORST)
.setQualitative(true)
.setDomain(DOMAIN_DOCUMENTATION)
@@ -321,7 +321,7 @@ public final class CoreMetrics {
* @since 3.6
*/
public static final Metric COMPLEXITY_IN_FUNCTIONS = new Metric.Builder(COMPLEXITY_IN_FUNCTIONS_KEY, "Complexity in functions", Metric.ValueType.INT)
- .setDescription("Cyclomatic complexity in methods")
+ .setDescription("Cyclomatic complexity in functions")
.setDirection(Metric.DIRECTION_WORST)
.setQualitative(false)
.setDomain(DOMAIN_COMPLEXITY)
@@ -335,8 +335,8 @@ public final class CoreMetrics {
* Information about the cyclomatic complexity per function, calculated by divided the complexity in functions by the number of functions.
* If the complexity in functions is not available, the complexity of the file is used.
*/
- public static final Metric FUNCTION_COMPLEXITY = new Metric.Builder(FUNCTION_COMPLEXITY_KEY, "Complexity /method", Metric.ValueType.FLOAT)
- .setDescription("Complexity average by method")
+ public static final Metric FUNCTION_COMPLEXITY = new Metric.Builder(FUNCTION_COMPLEXITY_KEY, "Complexity /function", Metric.ValueType.FLOAT)
+ .setDescription("Complexity average by function")
.setDirection(Metric.DIRECTION_WORST)
.setQualitative(true)
.setDomain(DOMAIN_COMPLEXITY)
@@ -1642,7 +1642,7 @@ public final class CoreMetrics {
public static final String LCOM4_KEY = "lcom4";
public static final Metric LCOM4 = new Metric.Builder(LCOM4_KEY, "LCOM4", Metric.ValueType.FLOAT)
- .setDescription("Lack of Cohesion of Methods")
+ .setDescription("Lack of Cohesion of Functions")
.setDirection(Metric.DIRECTION_WORST)
.setQualitative(true)
.setDomain(DOMAIN_DESIGN)