Allon Mureinik has uploaded a new change for review. Change subject: core,webadmin: TimeSpan: Parse -> parse ......................................................................
core,webadmin: TimeSpan: Parse -> parse Renamed method in order to comply to proper Java naming conventions. Change-Id: I7c28b499253832b8c6a47ba94bbc7ffbbc8a4aff Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java M backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java 4 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/21606/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java index 0c157e8..525199d 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java @@ -126,7 +126,7 @@ // The format for a timespan is: // [ws][-]{ d | d.hh:mm[:ss[.ff]] | hh:mm[:ss[.ff]] }[ws] - public static TimeSpan Parse(String argvalue) { + public static TimeSpan parse(String argvalue) { String cleaned = argvalue.trim(); int multiplier = 1; if (cleaned.contains("-")) { @@ -178,7 +178,7 @@ public static TimeSpan tryParse(String string) { try { - return TimeSpan.Parse(string); + return TimeSpan.parse(string); } catch (IllegalArgumentException e) { // eat it, return null return null; diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java index c626d06..4faed3a 100644 --- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java +++ b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java @@ -30,33 +30,33 @@ @Test public void testParsing() { - TimeSpan span = TimeSpan.Parse("1"); + TimeSpan span = TimeSpan.parse("1"); assertEquals("days1", 1, span.Days); - span = TimeSpan.Parse("-1"); + span = TimeSpan.parse("-1"); assertEquals("days2", -1, span.Days); - span = TimeSpan.Parse("1.02:03"); + span = TimeSpan.parse("1.02:03"); assertEquals("days3", 1, span.Days); assertEquals("hours3", 2, span.Hours); assertEquals("min3", 3, span.Minutes); - span = TimeSpan.Parse("1.02:03:04.05"); + span = TimeSpan.parse("1.02:03:04.05"); assertEquals("days4", 1, span.Days); assertEquals("hours4", 2, span.Hours); assertEquals("min4", 3, span.Minutes); assertEquals("sec4", 4, span.Seconds); assertEquals("ms4", 5, span.Milliseconds); - span = TimeSpan.Parse("-1.02:03:04.05"); + span = TimeSpan.parse("-1.02:03:04.05"); assertEquals("days5", -1, span.Days); assertEquals("hours5", -2, span.Hours); assertEquals("min5", -3, span.Minutes); assertEquals("sec5", -4, span.Seconds); assertEquals("ms5", -5, span.Milliseconds); - span = TimeSpan.Parse("02:03:04.05"); + span = TimeSpan.parse("02:03:04.05"); assertEquals("days6", 0, span.Days); assertEquals("hours6", 2, span.Hours); assertEquals("min6", 3, span.Minutes); assertEquals("sec6", 4, span.Seconds); assertEquals("ms6", 5, span.Milliseconds); - span = TimeSpan.Parse("-02:03:04.05"); + span = TimeSpan.parse("-02:03:04.05"); assertEquals("days7", 0, span.Days); assertEquals("hours7", -2, span.Hours); assertEquals("min7", -3, span.Minutes); @@ -66,7 +66,7 @@ @Test(expected = IllegalArgumentException.class) public void testInvalidParse() { - TimeSpan.Parse("1.02.03"); + TimeSpan.parse("1.02.03"); } @Test diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java index 06ed895..5c4b32b 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java @@ -145,7 +145,7 @@ } else if ("UPTIME".equals(fieldName)) { pair.setSecond(StringHelper.trim(pair.getSecond(), '\'')); - TimeSpan ts = TimeSpan.Parse(pair.getSecond()); + TimeSpan ts = TimeSpan.parse(pair.getSecond()); pair.setSecond(StringFormat.format("'%1$s'", ts.TotalSeconds)); } else if ("CREATIONDATE".equals(fieldName)) { diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java index ea9f243..37fd350 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java @@ -79,7 +79,7 @@ // The format for a timespan is: // [ws][-]{ d | d.hh:mm[:ss[.ff]] | hh:mm[:ss[.ff]] }[ws] - public static TimeSpan Parse(String argvalue) { + public static TimeSpan parse(String argvalue) { String cleaned = argvalue.trim() ; int multiplier = 1 ; if (cleaned.contains("-")) { @@ -133,7 +133,7 @@ public static TimeSpan tryParse(String string) { try { - return TimeSpan.Parse(string); + return TimeSpan.parse(string); } catch (IllegalArgumentException e) { //eat it, return null return null; -- To view, visit http://gerrit.ovirt.org/21606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c28b499253832b8c6a47ba94bbc7ffbbc8a4aff 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
