Martin Mucha has uploaded a new change for review. Change subject: core: moved methods out from non static SyncNetworkParametersBuilder ......................................................................
core: moved methods out from non static SyncNetworkParametersBuilder These methods can be used outside from SyncNetworkParametersBuilder, but in that case their owning class have to be instantiated using CommandContext parameter, which is completely unrelated to these four methods. Change-Id: I8adb975731d8e3a0367585a65993ec53d538fba3 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/32773/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 0a59034..129f0b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -141,8 +141,8 @@ } private boolean allowedNetworkLabelManipulation() { - boolean labelNotChanged = !new SyncNetworkParametersBuilder(getContext()).labelChanged(); - boolean newLabelAssigned = !new SyncNetworkParametersBuilder(getContext()).labelAdded(); + boolean labelNotChanged = !labelChanged(); + boolean newLabelAssigned = !labelAdded(); return !getNetwork().isExternal() && (labelNotChanged || newLabelAssigned); } @@ -466,21 +466,21 @@ } } - private boolean labelChanged() { - return !Objects.equals(getNetwork().getLabel(), getOldNetwork().getLabel()); - } + } - private boolean labelAdded() { - return !NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()); - } + private boolean labelChanged() { + return !Objects.equals(getNetwork().getLabel(), getOldNetwork().getLabel()); + } - private boolean labelRemoved() { - return NetworkUtils.isLabeled(getOldNetwork()) && !NetworkUtils.isLabeled(getNetwork()); - } + private boolean labelAdded() { + return !NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()); + } - private boolean labelRenamed() { - return NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()) && labelChanged(); - } + private boolean labelRemoved() { + return NetworkUtils.isLabeled(getOldNetwork()) && !NetworkUtils.isLabeled(getNetwork()); + } + private boolean labelRenamed() { + return NetworkUtils.isLabeled(getOldNetwork()) && NetworkUtils.isLabeled(getNetwork()) && labelChanged(); } } -- To view, visit http://gerrit.ovirt.org/32773 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8adb975731d8e3a0367585a65993ec53d538fba3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
