X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=dgbuilder%2Fpublic%2Futil%2Fjs%2FdgeToXml.js;h=7e5c97214e84f151527e981f6d60c01fa75a7020;hp=7582d27503fb17ef6a923dd39d6e0388b9a97475;hb=8797a459b6a5c4516032260cc55663e08a2ab538;hpb=d1569975bb18f4359fac18aa98f55b69c248a3ad

diff --git a/dgbuilder/public/util/js/dgeToXml.js b/dgbuilder/public/util/js/dgeToXml.js
index 7582d275..7e5c9721 100644
--- a/dgbuilder/public/util/js/dgeToXml.js
+++ b/dgbuilder/public/util/js/dgeToXml.js
@@ -695,7 +695,12 @@ function getNodeToXml(inputNodeSet){
 				}	
 				xmlStr+=node.xml;
 				startTag = getStartTag(node);
-				fullXmlStr +=xmlStr;
+				//special handling for break node
+				if(xmlStr != undefined && xmlStr != null && xmlStr.trim() == "<break>"){
+					fullXmlStr += "<break/>";
+				}else{	
+					fullXmlStr +=xmlStr;
+				}
 				/*
 				if(level > 0){
 					var spacing = Array(level).join("  ");	
@@ -737,7 +742,9 @@ function getNodeToXml(inputNodeSet){
 
 			//append end tag
 			if(startTag != ""){
-				fullXmlStr += "</" + startTag + ">";
+				if(startTag != "break"){
+                                        fullXmlStr += "</" + startTag + ">";
+                                }
 				/*
 				if(level >0){
 					var spacing = Array(level).join("  ");	
@@ -766,6 +773,11 @@ var jqxhr = $.post( "/getSharedFlow",{"filePath":filePath})
   .done(function(data) {
 	$( "#dgflow-browser-dialog").dialog("close");
 	var migratedNodes = migrateNodes(data);
+	  var nodeSet = getCurrentFlowNodeSet();
+        //console.dir(nodeSet);
+        if(nodeSet != null && nodeSet.length == 0){
+                RED.view.setIsImportAction(true);
+        }
 	//RED.view.importNodes(data)
 	RED.view.importNodes(JSON.stringify(migratedNodes));
     //console.log( "import done");
@@ -1280,6 +1292,8 @@ function migrateNodes(jsonStr){
 			}
 		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<exists") != -1){
 			node.type="exists";
+		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<break") != -1){
+			node.type="break";
 		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<block") != -1){
 			node.type="block";
 			var atomic=getAttributeValue(node.xml,"atomic");
@@ -1293,6 +1307,8 @@ function migrateNodes(jsonStr){
 			}
 		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<save") != -1){
 			node.type="save";
+		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<while") != -1){
+			node.type="while";
 		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<switch") != -1){
 			node.type="switchNode";
 		}else if(node.xml != undefined && node.xml != null && node.xml.indexOf("<record") != -1){