Moti Asayag has uploaded a new change for review. Change subject: engine: Remove duplicate semicolons ......................................................................
engine: Remove duplicate semicolons In several cases double semicolons were typed while a single ';' is enough. Change-Id: Ia94b2e1cbcea3445a3a11ab711d99a9e28da86a1 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddImageFromScratchParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java M backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java 12 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/10468/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddImageFromScratchParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddImageFromScratchParameters.java index a330e43..396ec9d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddImageFromScratchParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddImageFromScratchParameters.java @@ -6,7 +6,7 @@ public class AddImageFromScratchParameters extends ImagesActionsParametersBase { private static final long serialVersionUID = 8249273209551108387L; - private Guid masterVmId = Guid.Empty;; + private Guid masterVmId = Guid.Empty; private DiskImageBase diskInfo; public AddImageFromScratchParameters() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java index 5996899..5477455 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java @@ -136,7 +136,7 @@ boolean allowsViewingChildren, ApplicationMode applicationMode) { this(value, type, objectType, allowsViewingChildren); - this.applicationMode = applicationMode.getValue();; + this.applicationMode = applicationMode.getValue(); } private static void initEntitiesMap() { diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java index aebc954..a71d0cb 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java @@ -17,7 +17,7 @@ private static final int SERVER_CONNECTION_COUNT_FOR_SPECIFIC_STORAGE = 7; private static final int SERVER_CONNECTION_COUNT = 9; private static final String EXISTING_DOMAIN_STORAGE_NAME = "fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePk"; - private static final Guid EXISTING_STORAGE_POOL_ID = new Guid("6d849ebf-755f-4552-ad09-9a090cda105d");; + private static final Guid EXISTING_STORAGE_POOL_ID = new Guid("6d849ebf-755f-4552-ad09-9a090cda105d"); private StorageServerConnectionDAO dao; private StorageServerConnections newServerConnection; diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java index fffed0b..86d5e8c 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java @@ -198,7 +198,7 @@ private UriInfo setUpMatrixParamExpectations() { - UriInfo uriInfo = control.createMock(UriInfo.class);; + UriInfo uriInfo = control.createMock(UriInfo.class); List<PathSegment> psl = new ArrayList<PathSegment>(); @@ -227,7 +227,7 @@ } private UriInfo setUpGetMatrixConstraintsExpectations() { - UriInfo uriInfo = control.createMock(UriInfo.class);; + UriInfo uriInfo = control.createMock(UriInfo.class); List<PathSegment> psl = new ArrayList<PathSegment>(); PathSegment ps = control.createMock(PathSegment.class); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java index ecca626..adba25d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/LinkBuilder.java @@ -8,7 +8,7 @@ import org.ovirt.engine.api.model.Response; public class LinkBuilder { - private DetailedLink detailedLink = new DetailedLink();; + private DetailedLink detailedLink = new DetailedLink(); public LinkBuilder url(String url) { detailedLink.setHref(url); return this; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java index cfa99ac..de1179c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java @@ -184,7 +184,7 @@ } public class LinkBuilder { - private DetailedLink link = new DetailedLink();; + private DetailedLink link = new DetailedLink(); public LinkBuilder url(String url) { link.setHref(url); return this; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java index b660df9..8a537fa 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCdRomResourceTest.java @@ -161,7 +161,7 @@ } protected UriInfo setUpChangeCdUriMatrixExpectations() { - UriInfo uriInfo = control.createMock(UriInfo.class);; + UriInfo uriInfo = control.createMock(UriInfo.class); List<PathSegment> psl = new ArrayList<PathSegment>(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java index 56fd648..7254d37 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java @@ -340,7 +340,7 @@ @SuppressWarnings("unchecked") protected UriInfo setUpUriExpectationsWithMax(boolean badFormat) { - UriInfo uriInfo = control.createMock(UriInfo.class);; + UriInfo uriInfo = control.createMock(UriInfo.class); expect(uriInfo.getBaseUri()).andReturn(URI.create(URI_BASE)).anyTimes(); List<PathSegment> psl = new ArrayList<PathSegment>(); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java index 1621824..5388ce8 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java @@ -19,7 +19,7 @@ import org.ovirt.engine.core.common.businessentities.VdsSelectionAlgorithm; import org.ovirt.engine.core.compat.Guid; -import static org.ovirt.engine.api.restapi.utils.VersionUtils.greaterOrEqual;; +import static org.ovirt.engine.api.restapi.utils.VersionUtils.greaterOrEqual; public class ClusterMapper { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 792e6b5..e81ef75 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -608,7 +608,7 @@ public void dispose() { log.info("vdsManager::disposing"); SchedulerUtilQuartzImpl.getInstance().deleteJob(onTimerJobId); - XmlRpcUtils.shutDownConnection(((VdsServerWrapper) _vdsProxy).getHttpClient());; + XmlRpcUtils.shutDownConnection(((VdsServerWrapper) _vdsProxy).getHttpClient()); } /** diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java index 488c774..62589a5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java @@ -10,7 +10,7 @@ @SuppressWarnings("unused") public class SubnetMaskValidation implements IValidation { - private final static IpAddressValidation IP_VALIDATOR = new IpAddressValidation();; + private final static IpAddressValidation IP_VALIDATOR = new IpAddressValidation(); private final static Set<Integer> CORRECT_RANGE = new HashSet<Integer>(); private final static List<String> reasons = new ArrayList<String>(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java index 0d71120..685b78e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java @@ -18,7 +18,7 @@ public class VmStatusCell extends AbstractCell<VM> { - ApplicationResources resources = ClientGinjectorProvider.instance().getApplicationResources();; + ApplicationResources resources = ClientGinjectorProvider.instance().getApplicationResources(); @Override public void render(Context context, VM vm, SafeHtmlBuilder sb) { -- To view, visit http://gerrit.ovirt.org/10468 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia94b2e1cbcea3445a3a11ab711d99a9e28da86a1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
