diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java')
-rw-r--r-- | openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java index 4ae2b2c086..4bd3eabc7e 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ItemVersionConflict.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,35 +17,34 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.conflicts.types; -import org.openecomp.sdc.versioning.dao.types.Version; - import java.util.ArrayList; import java.util.Collection; +import org.openecomp.sdc.versioning.dao.types.Version; public class ItemVersionConflict { - private Conflict<Version> versionConflict; - private Collection<ConflictInfo> elementConflicts = new ArrayList<>(); - public Conflict<Version> getVersionConflict() { - return versionConflict; - } + private Conflict<Version> versionConflict; + private Collection<ConflictInfo> elementConflicts = new ArrayList<>(); + + public Conflict<Version> getVersionConflict() { + return versionConflict; + } - public void setVersionConflict(Conflict<Version> versionConflict) { - this.versionConflict = versionConflict; - } + public void setVersionConflict(Conflict<Version> versionConflict) { + this.versionConflict = versionConflict; + } - public Collection<ConflictInfo> getElementConflicts() { - return elementConflicts; - } + public Collection<ConflictInfo> getElementConflicts() { + return elementConflicts; + } - public void setElementConflicts(Collection<ConflictInfo> elementConflicts) { - this.elementConflicts = elementConflicts; - } + public void setElementConflicts(Collection<ConflictInfo> elementConflicts) { + this.elementConflicts = elementConflicts; + } - public void addElementConflictInfo(ConflictInfo conflictInfo) { - elementConflicts.add(conflictInfo); - } + public void addElementConflictInfo(ConflictInfo conflictInfo) { + elementConflicts.add(conflictInfo); + } } |