Release update

gems-uff · Aug 16, 2020 · df3ae31 · df3ae31
1 parent 7ee9182
commit df3ae31
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>gems.ic.uff.br</groupId>
 	<artifactId>prov-matrix</artifactId>
 	<packaging>jar</packaging>
-	<version>1.6</version>
+	<version>1.7</version>
 	<name>prov-matrix</name>
 	<url>http://maven.apache.org</url>
 	<properties>

diff --git a/src/main/java/convertion/ProvMatrixDefaultFactory.java b/src/main/java/convertion/ProvMatrixDefaultFactory.java
@@ -454,19 +454,21 @@ public void buildAgentTypes() {
 			this.agentInstanceOf = new AgentInstance(new ArrayList<String>(this.agents), new HashSet<String>());
 			for (String key : agents) {
 				String value = agentTypes.get(key);
-				if (value != null && value.contains("::") && !value.endsWith("::")) {
-					String[] values = value.split("::");
-					for (int i = 0; i < values.length; i++) {
-						if (!agentInstanceOf.getDestinationTypeAgentsId().contains(values[i])) {
-							agentInstanceOf.getDestinationTypeAgentsId().add(values[i]);
+				if (value != null) {
+					if (value.contains("::") && !value.endsWith("::")) {
+						String[] values = value.split("::");
+						for (int i = 0; i < values.length; i++) {
+							if (!agentInstanceOf.getDestinationTypeAgentsId().contains(values[i])) {
+								agentInstanceOf.getDestinationTypeAgentsId().add(values[i]);
+							}
+							this.agentInstanceOf.add(key, values[i]);
 						}
-						this.agentInstanceOf.add(key, values[i]);
-					}
-				} else {
-					if (!agentInstanceOf.getDestinationTypeAgentsId().contains(value)) {
-						agentInstanceOf.getDestinationTypeAgentsId().add(value);
+					} else {
+						if (!agentInstanceOf.getDestinationTypeAgentsId().contains(value)) {
+							agentInstanceOf.getDestinationTypeAgentsId().add(value);
+						}
+						this.agentInstanceOf.add(key, value);
 					}
-					this.agentInstanceOf.add(key, value);
 				}
 			}
 		}
@@ -478,19 +480,21 @@ public void buildActivityTypes() {
 					new HashSet<String>());
 			for (String key : activities) {
 				String value = activityTypes.get(key);
-				if (value != null && value.contains("::") && !value.endsWith("::")) {
-					String[] values = value.split("::");
-					for (int i = 0; i < values.length; i++) {
-						if (!activityInstanceOf.getDestinationTypeActivitiesId().contains(values[i])) {
-							activityInstanceOf.getDestinationTypeActivitiesId().add(values[i]);
+				if (value != null) {
+					if (value.contains("::") && !value.endsWith("::")) {
+						String[] values = value.split("::");
+						for (int i = 0; i < values.length; i++) {
+							if (!activityInstanceOf.getDestinationTypeActivitiesId().contains(values[i])) {
+								activityInstanceOf.getDestinationTypeActivitiesId().add(values[i]);
+							}
+							this.activityInstanceOf.add(key, values[i]);
 						}
-						this.activityInstanceOf.add(key, values[i]);
-					}
-				} else {
-					if (!activityInstanceOf.getDestinationTypeActivitiesId().contains(value)) {
-						activityInstanceOf.getDestinationTypeActivitiesId().add(value);
+					} else {
+						if (!activityInstanceOf.getDestinationTypeActivitiesId().contains(value)) {
+							activityInstanceOf.getDestinationTypeActivitiesId().add(value);
+						}
+						this.activityInstanceOf.add(key, value);
 					}
-					this.activityInstanceOf.add(key, value);
 				}
 			}
 		}
@@ -501,19 +505,21 @@ public void buildEntityTypes() {
 			this.entityInstanceOf = new EntityInstance(new ArrayList<String>(this.entities), new HashSet<String>());
 			for (String key : entities) {
 				String value = entityTypes.get(key);
-				if (value != null && value.contains("::") && !value.endsWith("::")) {
-					String[] values = value.split("::");
-					for (int i = 0; i < values.length; i++) {
-						if (!entityInstanceOf.getDestinationTypeEntitiesId().contains(values[i])) {
-							entityInstanceOf.getDestinationTypeEntitiesId().add(values[i]);
+				if (value != null) {
+					if (value.contains("::") && !value.endsWith("::")) {
+						String[] values = value.split("::");
+						for (int i = 0; i < values.length; i++) {
+							if (!entityInstanceOf.getDestinationTypeEntitiesId().contains(values[i])) {
+								entityInstanceOf.getDestinationTypeEntitiesId().add(values[i]);
+							}
+							this.entityInstanceOf.add(key, values[i]);
 						}
-						this.entityInstanceOf.add(key, values[i]);
-					}
-				} else {
-					if (!entityInstanceOf.getDestinationTypeEntitiesId().contains(value)) {
-						entityInstanceOf.getDestinationTypeEntitiesId().add(value);
+					} else {
+						if (!entityInstanceOf.getDestinationTypeEntitiesId().contains(value)) {
+							entityInstanceOf.getDestinationTypeEntitiesId().add(value);
+						}
+						this.entityInstanceOf.add(key, value);
 					}
-					this.entityInstanceOf.add(key, value);
 				}
 			}
 		}