opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.7'

Browse Source 
* stable-2.7:
  Use "abbreviation" instead of "abbreviatedName" for labels
  Update the 2.6 release notes
  Update 2.6 release notes to include fixes from 2.5.3 and 2.5.4
This commit is contained in:
Shawn Pearce
2013-05-22 17:52:42 -07:00
parent 1aa7494673 2c7acce786
commit 98dcb7e98c
8 changed files with 86 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
View File

@@ -93,7 +93,7 @@ public class LabelType {
protected String name;
protected String abbreviatedName;
protected String abbreviation;
protected String functionName;
protected boolean copyMinScore;
protected boolean copyMaxScore;
@@ -114,7 +114,7 @@ public class LabelType {
canOverride = true;
values = sortValues(valueList);
abbreviatedName = defaultAbbreviation(name);
abbreviation = defaultAbbreviation(name);
functionName = "MaxWithBlock";
maxNegative = Short.MIN_VALUE;
@@ -137,12 +137,12 @@ public class LabelType {
return psa.getLabelId().get().equalsIgnoreCase(name);
}
public String getAbbreviatedName() {
return abbreviatedName;
public String getAbbreviation() {
return abbreviation;
}
public void setAbbreviatedName(String abbreviatedName) {
this.abbreviatedName = abbreviatedName;
public void setAbbreviation(String abbreviation) {
this.abbreviation = abbreviation;
}
public String getFunctionName() {