Merge branch 'master' of https://gitlab.telecom-paristech.fr/mbe-tools/TTool

build.txt

-12357
+12358
\ No newline at end of file

src/main/java/tmltranslator/TMLCPLib.java

@@ -144,17 +144,34 @@ public class TMLCPLib extends TMLElement {
 
     public String toXML() {
 	String s = "<TMLCPLIB name=\"" + name + "\" cpMECType=\"" + cpMECType + "\" typeName=\"" + typeName + "\">\n";
-	for(TMLCPLibArtifact arti: artifacts) {
+	if (artifacts != null) {
+	    for(TMLCPLibArtifact arti: artifacts) {
 	    s += arti.toXML();
+	    }
 	}
-	for(String mu: mappedUnits) {
-	    s += "<MAPPEUNIT unit=\"" + mu + "\" />\n"; 
+	
+	if (mappedUnits != null) {
+	    for(String mu: mappedUnits) {
+		if (mu != null) {
+		    s += "<MAPPEUNIT unit=\"" + mu + "\" />\n";
+		}
+	    }
 	}
-	for(String aa: assignedAttributes) {
-	    s += "<ASSIGNEDATTRIBUTE attr=\"" + aa + "\" />\n"; 
+
+	if (assignedAttributes!= null) {
+	    for(String aa: assignedAttributes) {
+		if (aa != null) {
+		    s += "<ASSIGNEDATTRIBUTE attr=\"" + aa + "\" />\n";
+		}
+	    }
 	}
-	for(Integer i: transferTypes) {
-	    s += "<TRANSFERTYPE type=\"" + i.toString() + "\" />\n"; 
+
+	if (transferTypes != null) {
+	    for(Integer i: transferTypes) {
+		if (i != null) {
+		    s += "<TRANSFERTYPE type=\"" + i.toString() + "\" />\n";
+		}
+	    }
 	}
 	s += "</TMLCPLIB>";
 	return s;

src/main/java/ui/util/DefaultText.java

@@ -51,8 +51,8 @@ package ui.util;
  */
 public class DefaultText  {
 
-    public static String BUILD = "12356";
-    public static String DATE = "2017/09/07 02:01:14 CET";
+    public static String BUILD = "12357";
+    public static String DATE = "2017/09/08 09:10:46 CET";
     
     
     public static StringBuffer sbAbout = makeAbout();