ST6RI-178 Fixed non-standard library upload and some typos

Author: TheKorpos

org.omg.sysml/src/org/omg/sysml/util/repository/APIModel.java

@@ -118,7 +118,7 @@ public void merge(APIModel other) {
 	 * @param delta changes to apply.
 	 */
 	public void merge(APIModelDelta delta) {
-		throw new UnsupportedOperationException("Not impelemnted");
+		throw new UnsupportedOperationException("Not implemented");
 	}
 
 	/**

org.omg.sysml/src/org/omg/sysml/util/repository/APIModelDelta.java

@@ -94,7 +94,7 @@ public boolean isEmpty() {
 	 * 
 	 * @return list model changes acceptable by the API server
 	 */
-	public List<DataVersion> toTrasferableDelta() {
+	public List<DataVersion> toTransferableDelta() {
 		List<DataVersion> delta = new LinkedList<>();
 
 		for (Element addition: getAdditions()) {
@@ -126,7 +126,7 @@ public List<DataVersion> toTrasferableDelta() {
 	 * @return JSON string
 	 */
 	public String toJson(Gson gson) {
-		return gson.toJson(toTrasferableDelta());
+		return gson.toJson(toTransferableDelta());
 	}
 
 	/**
@@ -136,34 +136,34 @@ public String toJson(Gson gson) {
 	 * @return JSON string
 	 */
 	public JsonElement toJsonTree(Gson gson) {
-		return gson.toJsonTree(toTrasferableDelta());
+		return gson.toJsonTree(toTransferableDelta());
 	}
 
 	/**
 	 * Creates an {@link APIModelDelta} between two {@link APIModel}s
 	 * 
-	 * @param thisModel model to compare with baseline
+	 * @param current model to compare with baseline
 	 * @param baseline model to use as a baseline
 	 * 
 	 * @return {@link APIModelDelta} of the two models
 	 */
-	public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
-		if (thisModel == null) thisModel = APIModel.createEmpty();
+	public static APIModelDelta create(APIModel current, APIModel baseline) {
+		if (current == null) current = APIModel.createEmpty();
 		if (baseline == null) baseline = APIModel.createEmpty();
 
 		Set<Element> additions = new HashSet<>();
 		Set<UUID> deletions = new HashSet<>();
 		Map<UUID, ChangedElement> changes = new HashMap<>();
 
-		Map<UUID, Element> elementsFromThis = thisModel.getModelElements();
+		Map<UUID, Element> currentElements = current.getModelElements();
 
-		for (UUID id: elementsFromThis.keySet()) {
+		for (UUID id: currentElements.keySet()) {
 			Element baselineElement = baseline.getElement(id);
 			if (baselineElement == null) {
-				additions.add(thisModel.getElement(id));
+				additions.add(current.getElement(id));
 			} else {
-				Element thisElement = thisModel.getElement(id);
-				ChangedElement change = createElementDelta(thisElement, baselineElement);
+				Element currentElement = current.getElement(id);
+				ChangedElement change = createElementDelta(currentElement, baselineElement);
 				if (change != null) {
 					changes.put(id, change);
 				}
@@ -173,7 +173,7 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
 		Map<UUID, Element> elementsFromBaseline = baseline.getModelElements();
 
 		for (UUID id: elementsFromBaseline.keySet()) {
-			Element element = thisModel.getElement(id);
+			Element element = current.getElement(id);
 			if (element == null) {
 				deletions.add(id);
 			}
@@ -185,31 +185,31 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
 	/**
 	 * Creates a {@link Data} object which contains changed fields and their new values
 	 * 
-	 * @param thisElement element to compare with baseline
+	 * @param currentElement element to compare with baseline
 	 * @param baselineElement element to use as a baseline
 	 * @return changed fields and their new values wrapped in a {@link Data} object.
 	 */
-	public static ChangedElement createElementDelta(Element thisElement, Element baselineElement) {
+	public static ChangedElement createElementDelta(Element currentElement, Element baselineElement) {
 		ChangedElement change = null;
-		Set<String> fieldsInThis = thisElement.keySet();
+		Set<String> fieldsInThis = currentElement.keySet();
 		for (String field: fieldsInThis) {
-			Object thisValue = thisElement.get(field);
+			Object currentValue = currentElement.get(field);
 			Object baselineValue = baselineElement.get(field);
-			if (!Objects.equal(thisValue, baselineValue)) {
+			if (!Objects.equal(currentValue, baselineValue)) {
 				if (change == null) change = new ChangedElement(baselineElement);
-				change.add(field, thisValue);
+				change.add(field, currentValue);
 			}
 		}
 
 		return change;
 	}
 
 	private static class ChangedElement {
-		private Element originalElement;
+		private Element baselineElement;
 		private Map<String, Object> changes = new HashMap<>();
 
-		public ChangedElement(Element originalElement) {
-			this.originalElement = originalElement;
+		public ChangedElement(Element baselineElement) {
+			this.baselineElement = baselineElement;
 		}
 
 		public void add(String field, Object thisValue) {
@@ -218,7 +218,7 @@ public void add(String field, Object thisValue) {
 
 		public Data toData() {
 			Data data = new Data();
-			data.putAll(originalElement);
+			data.putAll(baselineElement);
 			data.putAll(changes);
 			return data;
 		}

org.omg.sysml/src/org/omg/sysml/util/repository/ProjectRepository.java

@@ -350,7 +350,8 @@ public Commit commitChanges(UUID projectId, UUID branchId, UUID previousCommitId
 	}
 
 	protected ProjectApi getProjectApi() {
-		return projectApi;	}
+		return projectApi;
+	}
 
 	protected ElementApi getElementApi() {
 		return elementApi;

org.omg.sysml/src/org/omg/sysml/util/repository/Revision.java

@@ -127,7 +127,7 @@ public Revision pushChanges(APIModelDelta changes) {
 			return this;
 		}
 		APIModelDelta localChanges = getLocalChanges();
-		return pushChanges(localChanges.toTrasferableDelta());
+		return pushChanges(localChanges.toTransferableDelta());
 	}
 
 	/**

org.omg.sysml/src/org/omg/sysml/util/traversal/facade/impl/JsonElementProcessingFacade.java

@@ -35,6 +35,7 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.omg.sysml.lang.sysml.Element;
+import org.omg.sysml.lang.sysml.LibraryPackage;
 import org.omg.sysml.util.ElementUtil;
 import org.omg.sysml.util.repository.APIModel;
 import org.omg.sysml.util.repository.APIModelDelta;
@@ -182,7 +183,7 @@ protected org.omg.sysml.model.Element createApiModelElement(Element element) {
 			//unstable library membership UUIDs in the EMFModelRefresher.
 			if ((this.isIncludeDerived() || !feature.isDerived() || "importedElement".equals(feature.getName())) && 
 					// Skip implementation-specific features.
-					!(/*"Feature".equals(className) && */"isNonunique".equals(featureName) || 
+					!("isNonunique".equals(featureName) || 
 					  "OperatorExpression".equals(className) && "operand".equals(featureName) || 
 					  apiElement.containsKey(featureName))) {
 				Object value = element.eGet(feature);
@@ -266,11 +267,16 @@ public void postProcess(Element element) {
 		org.omg.sysml.model.Element apiModelElement = this.createApiModelElement(element);
 		UUID id = UUID.fromString(apiModelElement.get("@id").toString());
 
-		if (element.eContainer() == null || element.isLibraryElement()) {
+		if (element.eContainer() == null || isStandardLibraryElement(element)) {
 			this.getLocalModel().addModelRoot(id, apiModelElement);
 		}
 		this.getLocalModel().addModelElement(id, apiModelElement);;
 	}
+	
+	boolean isStandardLibraryElement(Element element) {
+		return element.eResource().getContents().stream().filter(LibraryPackage.class::isInstance)
+				.map(LibraryPackage.class::cast).anyMatch(LibraryPackage::isStandard);
+	}
 
 	protected APIModel getLocalModel() {
 		return localModel;