Allon Mureinik has uploaded a new change for review. Change subject: core,webadmin: Match member's naming convention ......................................................................
core,webadmin: Match member's naming convention Changed Match's data members and methods to proper Java naming conventions. Change-Id: I3e25491850638ab8c00da0df446b9da88c79e9cc Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/TimeZoneType.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java M backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RegexTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/Match.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java 6 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/21605/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/TimeZoneType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/TimeZoneType.java index f73ef85..5302669 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/TimeZoneType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/TimeZoneType.java @@ -232,11 +232,11 @@ int a = 0, b = 0; Match match1 = Regex.Match(o1.toString(), TimeZoneExtractTimePattern); Match match2 = Regex.Match(o2.toString(), TimeZoneExtractTimePattern); - if (match1.Success() && match1.Groups().size() > 0) { - a = Integer.parseInt(match1.Groups().get(0).getValue().substring(3).replace(":", "").replace("+", "")); + if (match1.success() && match1.groups().size() > 0) { + a = Integer.parseInt(match1.groups().get(0).getValue().substring(3).replace(":", "").replace("+", "")); } - if (match2.Success() && match2.Groups().size() > 0) { - b = Integer.parseInt(match2.Groups().get(0).getValue().substring(3).replace(":", "").replace("+", "")); + if (match2.success() && match2.groups().size() > 0) { + b = Integer.parseInt(match2.groups().get(0).getValue().substring(3).replace(":", "").replace("+", "")); } if (a == b) { diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java index c3fcc4d..63faf09 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java @@ -9,37 +9,37 @@ */ @Deprecated public class Match { - private String Value; - private boolean Success; - private ArrayList<Match> Groups; + private String value; + private boolean success; + private ArrayList<Match> groups; public Match(MatchResult mr, boolean success) { - Groups = new ArrayList<Match>(); + groups = new ArrayList<Match>(); if (success) { - this.Success = success; + this.success = success; for (int x = 1; x <= mr.groupCount(); x++) { - Groups.add(new Match(mr.group(x))); + groups.add(new Match(mr.group(x))); } - Value = mr.group(); + value = mr.group(); } else { - Value = null; + value = null; } } public Match(String value) { - this.Value = value; - this.Success = true; + this.value = value; + this.success = true; } public String getValue() { - return Value; + return value; } - public ArrayList<Match> Groups() { - return Groups; + public ArrayList<Match> groups() { + return groups; } - public boolean Success() { - return Success; + public boolean success() { + return success; } } diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RegexTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RegexTest.java index a8bbd34..737419b 100644 --- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RegexTest.java +++ b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RegexTest.java @@ -38,7 +38,7 @@ @Test public void testGroups() { Match match = Regex.Match("ABC,123", "([A-Z]+),([0-9]+)"); - assertEquals("First Group", "ABC", match.Groups().get(0).getValue()); - assertEquals("Second Group", "123", match.Groups().get(1).getValue()); + assertEquals("First Group", "ABC", match.groups().get(0).getValue()); + assertEquals("Second Group", "123", match.groups().get(1).getValue()); } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java index 29d068d..11c77c2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java @@ -104,11 +104,11 @@ String version = ""; Match match = Regex.Match(app, "(.*) ([0-9.]+)", RegexOptions.Singleline | RegexOptions.IgnoreCase); - if (match.Groups().size() > 1) { - product = match.Groups().get(1).getValue(); + if (match.groups().size() > 1) { + product = match.groups().get(1).getValue(); } - if (match.Groups().size() > 2) { - version = match.Groups().get(2).getValue(); + if (match.groups().size() > 2) { + version = match.groups().get(2).getValue(); } _writer.WriteStartElement("ProductSection"); diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/Match.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/Match.java index 075ffb0..ce75399 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/Match.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/Match.java @@ -34,7 +34,7 @@ this.success = true; } - public ArrayList<Match> Groups() { + public ArrayList<Match> groups() { return groups; } @@ -42,7 +42,7 @@ return value; } - public boolean Success() { + public boolean success() { return success; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java index 8a71de2..b0dfbfb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java @@ -224,13 +224,13 @@ String pageStringRegex = PAGE_STRING_REGEX; Match match = Regex.Match(getSearchString(), pageStringRegex, RegexOptions.IgnoreCase); - if (match.Success()) + if (match.success()) { // retrieve the page number itself: String pageString = match.getValue(); // == "page <n>" String pageNumberRegex = PAGE_NUMBER_REGEX; match = Regex.Match(pageString, pageNumberRegex); - if (match.Success()) + if (match.success()) { final Integer retValue = IntegerCompat.tryParse(match.getValue()); if (retValue != null) -- To view, visit http://gerrit.ovirt.org/21605 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e25491850638ab8c00da0df446b9da88c79e9cc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
