Allon Mureinik has uploaded a new change for review. Change subject: core: Remove MatchGroups class ......................................................................
core: Remove MatchGroups class MatchGroups is a marker class that extends ArrayList<Match> and does not add any functionality. Since GWT can handle ArrayLists, this class is redundant, and should be removed. Change-Id: I7cbae4e4aded51246ef8b350ebaa088838eab510 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Match.java D backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/MatchGroups.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/Match.java 4 files changed, 7 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/21603/1 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 7dd1641..c3fcc4d 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 @@ -1,5 +1,6 @@ package org.ovirt.engine.core.compat; +import java.util.ArrayList; import java.util.regex.MatchResult; // I believe this is a wrapper for java.util.regex.MatchResult @@ -10,10 +11,10 @@ public class Match { private String Value; private boolean Success; - private MatchGroups Groups; + private ArrayList<Match> Groups; public Match(MatchResult mr, boolean success) { - Groups = new MatchGroups(); + Groups = new ArrayList<Match>(); if (success) { this.Success = success; for (int x = 1; x <= mr.groupCount(); x++) { @@ -34,7 +35,7 @@ return Value; } - public MatchGroups Groups() { + public ArrayList<Match> Groups() { return Groups; } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/MatchGroups.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/MatchGroups.java deleted file mode 100644 index d455430..0000000 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/MatchGroups.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.ovirt.engine.core.compat; - -import java.util.ArrayList; - -@Deprecated -public class MatchGroups extends ArrayList<Match> { -} 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 1a12c1f..89d02c4 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 @@ -22,7 +22,6 @@ <include name="compat/DateTime.java" /> <include name="compat/DayOfWeek.java" /> <include name="compat/RegEx.java" /> - <include name="compat/MatchGroups.java" /> <!-- Required by common->action->VdcActionParametersBase.java --> <include name="compat/TransactionScopeOption.java" /> 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 9a6709e..075ffb0 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 @@ -1,5 +1,6 @@ package org.ovirt.engine.core.compat; +import java.util.ArrayList; import com.google.gwt.regexp.shared.MatchResult; /** @@ -13,7 +14,7 @@ private final boolean success; private final String value; - private final MatchGroups groups = new MatchGroups(); + private final ArrayList<Match> groups = new ArrayList<Match>(); public Match(MatchResult matchResult) { if (matchResult != null) { @@ -33,7 +34,7 @@ this.success = true; } - public MatchGroups Groups() { + public ArrayList<Match> Groups() { return groups; } -- To view, visit http://gerrit.ovirt.org/21603 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cbae4e4aded51246ef8b350ebaa088838eab510 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
