Tal Nisan has uploaded a new change for review. Change subject: core: Removed unnecessary calls to StringFormat & StringHelper ......................................................................
core: Removed unnecessary calls to StringFormat & StringHelper Replaced calls to StringFormat.format to String.format where possible (i.e. not code that compile to GWT) and to simple String concatation where possible also replaced calls to StringHelper.EqOp calls in String.equals calls in cases that at least one of the args was not null Change-Id: I57dc0d9d30f9e5cd4f0beacc8bfd35fe5023afc1 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringFormat.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxObject.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java 10 files changed, 70 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/11659/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java index 874f864..d3b4e02 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java @@ -173,7 +173,7 @@ builder.append(StringFormat.format("'%1$s'", gettag_id())); for (tags tag : _children) { - builder.append(StringFormat.format(",%1$s", tag.GetTagIdAndChildrenIds())); + builder.append("," + tag.GetTagIdAndChildrenIds()); } return builder; } @@ -183,7 +183,7 @@ builder.append(StringFormat.format("'%1$s'", gettag_name())); for (tags tag : _children) { - builder.append(StringFormat.format(",%1$s", tag.GetTagNameAndChildrenNames())); + builder.append("," + tag.GetTagNameAndChildrenNames()); } return builder; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java index d5f7bee..71a2a36 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringFormat; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.TimeSpan; public class vm_pools extends IVdcQueryable implements Serializable { @@ -248,9 +247,7 @@ } public void setvm_pool_name(String value) { - if (!StringHelper.EqOp(this.name, value)) { - this.name = value; - } + this.name = value; } public int getvm_assigned_count() { diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringFormat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringFormat.java index 8d6e753..1a49bc7 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringFormat.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/StringFormat.java @@ -2,7 +2,10 @@ /** - * @deprecated Use {@link String#format(String, Object...)} instead. + * @deprecated Use {@link String#format(String, Object...)} instead. Only when not in a code that compiles to GWT + * (common, searchbackend etc..), in GWT compile time StringFormat is replaced with the StringFormat class + * in gwt-extension ui overrides which uses a GWT String formatter since GWT String wrapper does not + * contains a format method */ @Deprecated public final class StringFormat { 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 049fb5b..a70d14b 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 @@ -172,7 +172,7 @@ if (TotalMilliseconds < 0) { prefix = "-"; } - return StringFormat.format("%s%d.%02d:%02d:%02d.%03d", prefix, Days, Hours, Minutes, Seconds, Milliseconds); + return String.format("%s%d.%02d:%02d:%02d.%03d", prefix, Days, Hours, Minutes, Seconds, Milliseconds); } public static TimeSpan tryParse(String string) { diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java index 583de1e..31754c1 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java @@ -39,6 +39,7 @@ mStateMap.put(SyntaxObjectType.CONDITION_VALUE, conditionValueArray); } + @Override public SyntaxContainer analyzeSyntaxState(String searchText, boolean final2) { SyntaxContainer retval = new SyntaxContainer(searchText); IConditionFieldAutoCompleter AdConditionFieldAC; @@ -200,6 +201,7 @@ } + @Override public SyntaxContainer getCompletion(String searchText) { SyntaxContainer retval = analyzeSyntaxState(searchText, false); IConditionFieldAutoCompleter AdConditionFieldAC; @@ -256,6 +258,7 @@ return retval; } + @Override public String generateQueryFromSyntaxContainer(SyntaxContainer syntax, boolean isSafe) { String retval = ""; if (syntax.getvalid()) { @@ -282,14 +285,14 @@ for (SyntaxObject so : syntax) { switch (so.getType()) { case CONDITION_FIELD: - if (StringHelper.EqOp(so.getBody(), "ALLNAMES")) { + if ("ALLNAMES".equals(so.getBody())) { phrase.append(" (|($GIVENNAME={value})(sn={value})($USER_ACCOUNT_NAME={value})($PRINCIPAL_NAME={value}))"); /** * mark this search as findAll for later use */ findAll = true; } else { - phrase.append(StringFormat.format(" (%1$s", conditionFieldAC.getDbFieldName(so.getBody()))); + phrase.append(" (" + conditionFieldAC.getDbFieldName(so.getBody())); } break; case CONDITION_RELATION: @@ -299,7 +302,7 @@ if (!findAll) { phrase.append("="); } - if (StringHelper.EqOp(so.getBody(), "!=")) { + if ("!=".equals(so.getBody())) { nonEqual = true; } break; @@ -311,7 +314,7 @@ */ phrase.replace("{value}", so.getBody().replace("$", "\\$")); } else { - phrase.append(StringFormat.format("%1$s)", so.getBody())); + phrase.append(so.getBody() + ")"); } if (nonEqual) { retval.append(StringFormat.format("(!%1$s)", phrase)); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java index e5d637f..36a883a 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java @@ -98,6 +98,7 @@ } } + @Override public boolean validateFieldValue(String fieldName, String fieldValue) { if (validationDict.containsKey(fieldName)) { final List<ValueValidationFunction> validationList = validationDict.get(fieldName); @@ -110,6 +111,7 @@ return true; } + @Override public String getDbFieldName(String fieldName) { String retval = null; if (columnNameDict.containsKey(fieldName)) { @@ -118,6 +120,7 @@ return retval; } + @Override public String getSortableDbField(String fieldName) { if (sortableFieldDict.containsKey(fieldName)) { return sortableFieldDict.get(fieldName); @@ -126,6 +129,7 @@ } } + @Override public Class<?> getDbFieldType(String fieldName) { Class<?> retval = null; if (typeDict.containsKey(fieldName)) { @@ -136,6 +140,7 @@ } // FIXME Probably Not Hibernate Friendly + @Override public final String buildFreeTextConditionSql(String tableName, String relations, String value, @@ -172,25 +177,27 @@ final static Regex validChar = new Regex("^[^\\<\\>&^#!']*$"); public final static ValueValidationFunction validCharacters = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return validChar.IsMatch(value); } }; public final static ValueValidationFunction validDateTime = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { Date test = DateUtils.parse(value); if (test != null) { return true; } else { // check for enum for (DateEnumForSearch val : DateEnumForSearch.values()) { - if (StringHelper.EqOp(value.toUpperCase(), val.name().toUpperCase())) { + if (val.name().equalsIgnoreCase(value)) { return true; } } // check for week before for (DayOfWeek day : DayOfWeek.class.getEnumConstants()) { - if (StringHelper.EqOp(value.toUpperCase(), day.toString().toUpperCase())) { + if (day.toString().equalsIgnoreCase(value)) { return true; } } @@ -200,24 +207,28 @@ }; public final static ValueValidationFunction validTimeSpan = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return TimeSpan.tryParse(value) != null; } }; public final static ValueValidationFunction validInteger = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return IntegerCompat.tryParse(value) != null; } }; public final static ValueValidationFunction validDecimal = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { return DoubleCompat.tryParse(value) != null; } }; public final ValueValidationFunction validateDateEnumValueByValueAC = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { boolean retval = true; IConditionValueAutoCompleter vlaueAc = getFieldValueAutoCompleter(field); @@ -228,9 +239,7 @@ if (!retval) // check for week before { for (DayOfWeek day : DayOfWeek.values()) { - if (StringHelper.EqOp(value.toUpperCase(), day.toString().toUpperCase())) // Enum.GetName(typeof(DayOfWeek), - // day).ToUpper() - { + if (day.toString().equalsIgnoreCase(value)) { return true; } } @@ -245,6 +254,7 @@ }; public final ValueValidationFunction validateFieldValueByValueAC = new ValueValidationFunction() { + @Override public boolean isValid(String field, String value) { boolean retval = true; IConditionValueAutoCompleter vlaueAc = getFieldValueAutoCompleter(field); @@ -255,14 +265,17 @@ } }; + @Override public IAutoCompleter getFieldRelationshipAutoCompleter(String fieldName) { return null; } + @Override public IConditionValueAutoCompleter getFieldValueAutoCompleter(String fieldName) { return null; } + @Override public void formatValue(String fieldName, RefObject<String> relations, RefObject<String> value, @@ -348,6 +361,7 @@ return formatedValue.resetToMidnight(); } + @Override public final String buildConditionSql(String fieldName, String customizedValue, String customizedRelation, String tableName, boolean caseSensitive) { RefObject<String> tempRefObject = new RefObject<String>(customizedRelation); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java index 0edbcf5..72d80d6 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java @@ -180,6 +180,7 @@ } + @Override public SyntaxContainer analyzeSyntaxState(final String searchText, boolean final2) { final SyntaxContainer syntaxContainer = new SyntaxContainer(searchText); IConditionFieldAutoCompleter curConditionFieldAC = null; @@ -591,6 +592,7 @@ } + @Override public SyntaxContainer getCompletion(String searchText) { SyntaxContainer retval = analyzeSyntaxState(searchText, false); if (retval.getError() == SyntaxError.NO_ERROR) { @@ -680,6 +682,7 @@ return retval; } + @Override public String generateQueryFromSyntaxContainer(SyntaxContainer syntax, boolean isSafe) { String retval = ""; if (syntax.getvalid()) { @@ -843,7 +846,7 @@ ListIterator<String> iter = whereBuilder.listIterator(0); while (iter.hasNext()) { String queryPart = iter.next(); - if (StringHelper.EqOp(queryPart, lookFor[idx])) { + if (lookFor[idx].equals(queryPart)) { iter.remove(); String nextPart = iter.next(); iter.remove(); @@ -871,7 +874,7 @@ // adding the sorting part if required if ("".equals(sortByPhrase)) { - sortByPhrase = StringFormat.format(" ORDER BY %1$s", mSearchObjectAC.getDefaultSort(searchObjStr)); + sortByPhrase = " ORDER BY " + mSearchObjectAC.getDefaultSort(searchObjStr); } // adding the paging phrase String pagePhrase = getPagePhrase(syntax, pageNumber); @@ -944,7 +947,7 @@ try { type = PagingType.valueOf(val); } catch (Exception e) { - log.error(StringFormat.format("Unknown paging type %1$s", val)); + log.error("Unknown paging type " + val); } return type; @@ -1068,8 +1071,7 @@ String customizedValue = safeValue; if (curType == String.class && !StringHelper.isNullOrEmpty(customizedValue) && !"''".equals(customizedValue) && !"'*'".equals(customizedValue)) { - customizedValue = - StringFormat.format(BaseConditionFieldAutoCompleter.getI18NPrefix() + "%1$s", customizedValue); + customizedValue = BaseConditionFieldAutoCompleter.getI18NPrefix() + customizedValue; } if (conditionValueAC != null) { diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java index 7019afb..5c14485 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java @@ -5,7 +5,6 @@ import java.util.List; import org.ovirt.engine.core.compat.StringBuilderCompat; -import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; public class SyntaxContainer implements Iterable<SyntaxObject> { @@ -116,7 +115,7 @@ retval = obj.getBody(); } } - if ((StringHelper.EqOp(retval, "")) + if ("".equals(retval) && ((type == SyntaxObjectType.CROSS_REF_OBJ) || (type == SyntaxObjectType.SEARCH_OBJECT))) { retval = mObjList.getFirst().getBody(); } @@ -166,56 +165,45 @@ if (obj == null) { return null; } - if (StringHelper.EqOp(obj, SearchObjects.AD_USER_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.AD_USER_PLU_OBJ_NAME)) { + if (SearchObjects.AD_USER_OBJ_NAME.equals(obj) || SearchObjects.AD_USER_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.AD_USER_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.AUDIT_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.AUDIT_PLU_OBJ_NAME)) { + else if (SearchObjects.AUDIT_OBJ_NAME.equals(obj) || SearchObjects.AUDIT_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.AUDIT_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.TEMPLATE_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.TEMPLATE_PLU_OBJ_NAME)) { + else if (SearchObjects.TEMPLATE_OBJ_NAME.equals(obj) || SearchObjects.TEMPLATE_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.TEMPLATE_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VDC_USER_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VDC_USER_PLU_OBJ_NAME)) { + else if (SearchObjects.VDC_USER_OBJ_NAME.equals(obj) || SearchObjects.VDC_USER_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VDC_USER_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VDS_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VDS_PLU_OBJ_NAME)) { + else if (SearchObjects.VDS_OBJ_NAME.equals(obj) || SearchObjects.VDS_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VDS_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VM_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VM_PLU_OBJ_NAME)) { + else if (SearchObjects.VM_OBJ_NAME.equals(obj) || SearchObjects.VM_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VM_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.DISK_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.DISK_PLU_OBJ_NAME)) { + else if (SearchObjects.DISK_OBJ_NAME.equals(obj) || SearchObjects.DISK_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.DISK_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.QUOTA_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.QUOTA_PLU_OBJ_NAME)) { + else if (SearchObjects.QUOTA_OBJ_NAME.equals(obj) || SearchObjects.QUOTA_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.QUOTA_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VDC_POOL_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VDC_POOL_PLU_OBJ_NAME)) { + else if (SearchObjects.VDC_POOL_OBJ_NAME.equals(obj) || SearchObjects.VDC_POOL_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VDC_POOL_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VDC_CLUSTER_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME)) { + else if (SearchObjects.VDC_CLUSTER_OBJ_NAME.equals(obj) || SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VDC_CLUSTER_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.VDC_STORAGE_DOMAIN_PLU_OBJ_NAME)) { + else if (SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME.equals(obj) + || SearchObjects.VDC_STORAGE_DOMAIN_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.GLUSTER_VOLUME_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME)) { + else if (SearchObjects.GLUSTER_VOLUME_OBJ_NAME.equals(obj) + || SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.GLUSTER_VOLUME_OBJ_NAME; } - else if (StringHelper.EqOp(obj, SearchObjects.NETWORK_OBJ_NAME) - || StringHelper.EqOp(obj, SearchObjects.NETWORK_PLU_OBJ_NAME)) { + else if (SearchObjects.NETWORK_OBJ_NAME.equals(obj) || SearchObjects.NETWORK_PLU_OBJ_NAME.equals(obj)) { retval = SearchObjects.NETWORK_OBJ_NAME; } else { retval = obj; @@ -236,7 +224,7 @@ sb.AppendLine(mError.toString()); sb.append("CrossRefObjlist = "); for (String cro : getCrossRefObjList()) { - sb.append(StringFormat.format("%1$s, ", cro)); + sb.append(cro + ", "); } sb.append("Syntax object list:"); @@ -258,7 +246,7 @@ sb.append("<BR>Syntax object list:"); sb.append("<BR>CrossRefObjlist = "); for (String cro : getCrossRefObjList()) { - sb.append(StringFormat.format("%1$s, ", cro)); + sb.append(cro + ", "); } for (SyntaxObject obj : mObjList) { sb.append("<BR> "); @@ -270,7 +258,7 @@ public boolean contains(SyntaxObjectType type, String val) { boolean retval = false; for (SyntaxObject obj : mObjList) { - if ((obj.getType() == type) && (StringHelper.EqOp(obj.getBody().toUpperCase(), val.toUpperCase()))) { + if ((obj.getType() == type) && val.equalsIgnoreCase(obj.getBody())) { retval = true; break; } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxObject.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxObject.java index f158fa5..a9209aa 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxObject.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxObject.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.searchbackend; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.StringFormat; + public class SyntaxObject { protected SyntaxObjectType mType = SyntaxObjectType.forValue(0); @@ -36,8 +37,12 @@ @Override public String toString() { - String retval = StringFormat.format("body = '%1$s' , startPos = %2$s , endPos = %3$s, type = %4$s", mBody, - mPos[0], mPos[1], mType); + String retval = + StringFormat.format("body = '%1$s' , startPos = %2$s , endPos = %3$s, type = %4$s", + mBody, + mPos[0], + mPos[1], + mType); return retval; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java index b9d50e3..a3e5ff6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.compat.StringFormat; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; @@ -86,11 +85,11 @@ @Override public void ExecuteCommand(UICommand command) { super.ExecuteCommand(command); - if (StringHelper.stringsEqual(command.getName(), "onRemove")) //$NON-NLS-1$ + if ("onRemove".equals(command.getName())) //$NON-NLS-1$ { onRemove(); } - else if (StringHelper.stringsEqual(command.getName(), "cancel")) //$NON-NLS-1$ + else if ("cancel".equals(command.getName())) //$NON-NLS-1$ { cancel(); } -- To view, visit http://gerrit.ovirt.org/11659 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57dc0d9d30f9e5cd4f0beacc8bfd35fe5023afc1 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
