Tal Nisan has uploaded a new change for review. Change subject: core: Removed classes DateTimeStyles, CultureInfo, TimeFormatValidation ......................................................................
core: Removed classes DateTimeStyles, CultureInfo, TimeFormatValidation Removed the classes DateTimeStyles, CultureInfo, TimeFormatValidation from the compat package, they are no longer needed and all using methods had no references and were removed Change-Id: I765a43e6c5e9a6fc176caedd8294b4b0168f39a6 Signed-off-by: Tal Nisan <[email protected]> --- D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CultureInfo.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTime.java D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTimeStyles.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/IntegerCompat.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/DateTime.java D frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/TimeFormatValidation.java 7 files changed, 0 insertions(+), 88 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/11667/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CultureInfo.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CultureInfo.java deleted file mode 100644 index 28d248b..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CultureInfo.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.ovirt.engine.core.compat; - -public class CultureInfo { - - public static CultureInfo CurrentCulture; - public Object DateTimeFormat; - -} diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTime.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTime.java index ffa2b3b..f8e0a79 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTime.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTime.java @@ -150,10 +150,4 @@ public static String getDayOfTheWeekAsString(int dayOfTheWeek) { return dayNames[dayOfTheWeek]; } - - public static boolean TryParseExact(String value, String string, Object dateTimeFormat, DateTimeStyles none, - RefObject<Date> tempRefObject) { - // TODO Auto-generated method stub - throw new NotImplementedException(); // juicommon - } } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTimeStyles.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTimeStyles.java deleted file mode 100644 index 512a6dd..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/DateTimeStyles.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.ovirt.engine.core.compat; - -public enum DateTimeStyles { - None - -} diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/IntegerCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/IntegerCompat.java index 1170004..643e2a3 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/IntegerCompat.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/IntegerCompat.java @@ -20,17 +20,6 @@ } } - public static boolean TryParse(String value, NumberStyles integer, CultureInfo currentCulture, - RefObject<Integer> tempRefObject) { - // TODO Auto-generated method stub - throw new NotImplementedException(); // juicommon - } - - // public static boolean TryParse(String value, int test) { - // throw new - // NotImplementedException("See the try parse which takes in a refobject"); - // } - /** * Compare two integers safely even if one or both are nulls */ diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml index 0b65e2d..27f0881 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Compat.gwt.xml @@ -25,7 +25,6 @@ <!-- Referenced directly by UICommon --> <include name="compat/CompatException.java" /> - <include name="compat/CultureInfo.java" /> <include name="compat/IntegerCompat.java" /> <include name="compat/NumberStyles.java" /> <include name="compat/RefObject.java" /> @@ -41,7 +40,6 @@ <include name="compat/DateTime.java" /> <include name="compat/DayOfWeek.java" /> - <include name="compat/DateTimeStyles.java" /> <include name="compat/RegEx.java" /> <!-- Required by SearchBackend's SyntaxContainer.java --> diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/DateTime.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/DateTime.java index 11230d8..ed09ce0 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/DateTime.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/DateTime.java @@ -82,19 +82,6 @@ return new Date(-7200000); } - public static boolean TryParseExact(String value, String string, - Object dateTimeFormat, DateTimeStyles none, - RefObject<Date> tempRefObject) { - // TODO Auto-generated method stub - throw new NotImplementedException(); //juicommon - } - - public static Date ParseExact(String entity, String string, - CultureInfo currentCulture) { - // TODO Auto-generated method stub - throw new NotImplementedException(); //juicommon - } - public DateTime AddDays(int i) { Date date = new Date(); CalendarUtil.addDaysToDate(date, i); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/TimeFormatValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/TimeFormatValidation.java deleted file mode 100644 index e4f8ff5..0000000 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/TimeFormatValidation.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ovirt.engine.ui.uicommonweb.validation; - -import org.ovirt.engine.core.compat.CultureInfo; -import org.ovirt.engine.core.compat.DateTime; -import org.ovirt.engine.core.compat.DateTimeStyles; -import org.ovirt.engine.core.compat.RefObject; -import org.ovirt.engine.ui.uicompat.ConstantsManager; - -import java.util.Date; - -@SuppressWarnings("unused") -public class TimeFormatValidation implements IValidation -{ - @Override - public ValidationResult Validate(Object value) - { - ValidationResult result = new ValidationResult(); - - if (value != null && value instanceof String && !((String) value).equals("")) //$NON-NLS-1$ - { - CultureInfo ci = CultureInfo.CurrentCulture; - Date dtValue = new Date(0); - - RefObject<Date> tempRef_dtValue = new RefObject<Date>(dtValue); - boolean tempVar = - !DateTime.TryParseExact((String) value, "t", //$NON-NLS-1$ - ci.DateTimeFormat, - DateTimeStyles.None, - tempRef_dtValue); - dtValue = tempRef_dtValue.argvalue; - if (tempVar) - { - result.setSuccess(false); - result.getReasons().add(ConstantsManager.getInstance() - .getConstants() - .theFieldMustContainTimeValueInvalidReason()); - } - } - - return result; - } -} -- To view, visit http://gerrit.ovirt.org/11667 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I765a43e6c5e9a6fc176caedd8294b4b0168f39a6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
