[FOray-commit] SF.net SVN: foray:[12204] trunk/foray/foray-render/src/main/java/org/foray /render/xml/XmlRenderer.java

[<vic...@us...>]

Revision: 12204
          http://sourceforge.net/p/foray/code/12204
Author:   victormote
Date:     2021-12-10 14:35:34 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Improvements to area tree renderer.

Modified Paths:
--------------
    trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-10 13:23:16 UTC (rev 12203)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java	2021-12-10 14:35:34 UTC (rev 12204)
@@ -226,7 +226,7 @@
     @Override
     public void render(final BlockContainerArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -236,7 +236,7 @@
     @Override
     public void render(final MainReferenceArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -246,7 +246,7 @@
     @Override
     public void render(final RegionArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -260,7 +260,7 @@
             return;
         }
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -274,7 +274,7 @@
             return;
         }
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -284,7 +284,7 @@
     @Override
     public void render(final NormalBlockArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -298,7 +298,7 @@
      */
     public void renderInlineArea(final GeneralInlineArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         renderChildren(area);
         writeEndTag(area);
@@ -307,7 +307,7 @@
     @Override
     public void render(final ForeignObjectArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -325,7 +325,7 @@
     @Override
     public void render(final ExternalGraphicArea area) {
         final StringBuilder attributes = new StringBuilder();
-        outputGeneratedBy(area, attributes);
+        outputCommonAttributes(area, attributes);
         final URL url = area.getGraphic().getUrl();
         if (url != null) {
             outputAttribute(attributes, "url", url.toExternalForm());
@@ -347,7 +347,7 @@
             return;
         }
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         /* Line areas have no border or padding, so write only the content
          * rectangle.
@@ -368,7 +368,7 @@
             return;
         }
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         outputAttribute(buffer, "leader-pattern",
                 area.traitLeaderPattern().toString());
         outputAttribute(buffer, "leader-length", area.crIpd());
@@ -383,7 +383,7 @@
     @Override
     public void render(final TextArea area) {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         if (this.printFont) {
@@ -413,7 +413,7 @@
     @Override
     public void render(final InlineArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -423,7 +423,7 @@
     @Override
     public void render(final TableArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -433,7 +433,7 @@
     @Override
     public void render(final TableCellArea area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -450,7 +450,7 @@
     @Override
     public void render(final Area area) throws GalleyVisitorException {
         final StringBuilder buffer = new StringBuilder();
-        outputGeneratedBy(area, buffer);
+        outputCommonAttributes(area, buffer);
         writeStartTag(area, buffer);
         outputAllRectangles(area);
         renderChildren(area);
@@ -528,17 +528,18 @@
      * @param area The Area instance whose generatedBy trait is to be output.
      * @param buffer StringBuilder instance in which to append the output.
      */
-    private void outputGeneratedBy(final Area area,
-            final StringBuilder buffer) {
-        if (! area.generatedByExists()) {
-            return;
+    private void outputCommonAttributes(final Area area, final StringBuilder buffer) {
+        if (area.generatedByExists()) {
+            String idString = "";
+            if (area.traitId() != null && ! area.traitId().equals("")) {
+                idString = "(id " + area.traitId() + ")";
+            }
+            outputAttribute(buffer, "generated-by", area.generatedByName() + idString);
         }
-        String idString = "";
-        if (area.traitId() != null && ! area.traitId().equals("")) {
-            idString = "(id " + area.traitId() + ")";
+
+        if (area.destinationName() != null) {
+            outputAttribute(buffer, "destination", area.destinationName());
         }
-        outputAttribute(buffer, "generated-by", area.generatedByName()
-                + idString);
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.