export of colors for boolean reaction added

converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionToXml.java

@@ -492,7 +492,7 @@ public class ReactionToXml {
     sb.append(getListOfModificationsXmlStringForReaction(reaction));
     sb.append(getListOfGateMembersXmlStringForReaction(reaction));
 
-    sb.append(getLineXmlStringForLines(reaction.getReactants().get(0).getLine()));
+    sb.append(getLineXmlStringForLines(reaction.getLine()));
 
     XmlAnnotationParser xmlAnnotationParser = new XmlAnnotationParser();
     sb.append("</celldesigner:extension>\n");
@@ -584,6 +584,7 @@ public class ReactionToXml {
         }
         result.append("</celldesigner:listOfLineDirection>\n");
         result.append("</celldesigner:connectScheme>\n");
+        result.append(getLineXmlStringForLines(operator.getLine()));
 
         result.append("</celldesigner:GateMember>\n");
 
@@ -684,11 +685,7 @@ public class ReactionToXml {
 
     sb.append(getConnectSchemeXmlStringForLines(new PolylineData[] { reactant.getLine() }));
     sb.append(getEditPointsXmlStringForLine(new PolylineData[] { reactant.getLine() }, 0));
-    sb.append("<celldesigner:line ");
-    sb.append("width=\"" + reactant.getLine().getWidth() + "\" ");
-    sb.append("color=\"" + XmlParser.colorToString(reactant.getLine().getColor()) + "\" ");
-    sb.append("type=\"Straight\" ");
-    sb.append("/>\n");
+    sb.append(getLineXmlStringForLines(reactant.getLine()));
     sb.append("</celldesigner:reactantLink>\n");
     return sb.toString();
   }
@@ -715,13 +712,8 @@ public class ReactionToXml {
 
     sb.append(getConnectSchemeXmlStringForLines(lines));
 
-    // TODO
     sb.append(getEditPointsXmlStringForLine(lines, 0));
-    sb.append("<celldesigner:line ");
-    sb.append("width=\"" + product.getLine().getWidth() + "\" ");
-    sb.append("color=\"" + XmlParser.colorToString(product.getLine().getColor()) + "\" ");
-    sb.append("type=\"Straight\" ");
-    sb.append("/>\n");
+    sb.append(getLineXmlStringForLines(product.getLine()));
     sb.append("</celldesigner:productLink>\n");
     return sb.toString();
   }

converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java

@@ -773,5 +773,18 @@ public class CellDesignerXmlParserTest extends CellDesignerTestFunctions {
     assertFalse("Black wasn't used in reaction coloring", colors.contains(Color.BLACK));
   }
 
+  @Test
+  public void testExportBooleanReactioWithColors() throws Exception {
+    CellDesignerXmlParser parser = new CellDesignerXmlParser();
+    Model model = parser.createModel(new ConverterParams().filename("testFiles/reactions/boolean-colors.xml"));
+
+    model.setName(null);
+    assertNotNull(model);
+    String str = parser.model2String(model);
+    Model model2 = parser.createModel(
+        new ConverterParams().inputStream(new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8))));
+    assertEquals(0, new ModelComparator().compare(model, model2));
+  }
+
 
 }