12 files changed, 155 insertions, 109 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
index b7e2d51f96b..e8c69e21572 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
@@ -18,8 +18,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
 import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
 import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
 import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;
+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;
 
 /**
  * @author Ryan D. Brooks
@@ -86,7 +89,7 @@ public class AtsWorkflowRenderer extends DefaultArtifactRenderer {
    }
 
    @Override
-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {
+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {
       return artifact != null ? Collections.toString(", ", artifact.getAttributes(attributeTypeName)) : null;
    }
 }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
index be3e43923a3..e90ea397289 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java
@@ -21,6 +21,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
 import org.eclipse.osee.framework.ui.skynet.httpRequests.ArtifactRequest;
+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;
+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -212,7 +214,7 @@ public class DefaultArtifactRenderer implements IRenderer {
     * @see org.eclipse.osee.framework.ui.skynet.render.IRenderer#renderAttribute(java.lang.String)
     */
    @Override
-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {
+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {
       return artifact != null ? Collections.toString(", ", artifact.getAttributes(attributeTypeName)) : null;
    }
 
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
index f278dce6a54..73f124278ab 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/IRenderer.java
@@ -18,6 +18,8 @@ import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;

+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;

 import org.eclipse.swt.graphics.Image;

 

 /**

@@ -35,7 +37,7 @@ public interface IRenderer {
 

    public Image getImage();

 

-   public abstract String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException;

+   public abstract String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException;

 

    public abstract int minimumRanking() throws OseeCoreException;

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
index d621b9a1a55..8ead9a682db 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java
@@ -22,6 +22,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.NativeArtifact;
 import org.eclipse.osee.framework.skynet.core.attribute.Attribute;
 import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
 import org.eclipse.osee.framework.skynet.core.attribute.WordWholeDocumentAttribute;
+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;
+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;
 import org.eclipse.swt.program.Program;
 
 /**
@@ -126,7 +129,7 @@ public class NativeRenderer extends FileRenderer {
    }
 
    @Override
-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {
+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {
       return artifact != null ? Collections.toString(", ", artifact.getAttributes(attributeTypeName)) : null;
    }
 }
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
index e023a86d2c1..911a67a4893 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenOfficeWriterRenderer.java
@@ -9,6 +9,9 @@ import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.NativeArtifact;

+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;

+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;

 import org.eclipse.osee.framework.ui.skynet.templates.TemplateManager;

 import org.eclipse.swt.program.Program;

 

@@ -86,7 +89,7 @@ public class OpenOfficeWriterRenderer extends FileRenderer implements ITemplateR
    }

 

    @Override

-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {

+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {

       return artifact != null ? Collections.toString(", ", artifact.getAttributes(attributeTypeName)) : null;

    }

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
index e990bb62a03..c761a98a74a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java
@@ -35,6 +35,8 @@ import org.eclipse.osee.framework.ui.plugin.util.Jobs;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

 import org.eclipse.osee.framework.ui.skynet.artifact.editor.BrowserComposite;

 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;

+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;

 

 /**

  * @author Ryan D. Brooks

@@ -106,12 +108,13 @@ public class RendererManager {
       return bestRendererPrototype;

    }

 

-   public static String renderAttribute(String attrType, PresentationType presentationType, Artifact artifact) throws OseeCoreException {

-      return renderAttribute(attrType, presentationType, artifact, null);

+   public static String renderAttribute(String attrType, PresentationType presentationType, Artifact artifact, Producer producer, AttributeElement attributeElement) throws OseeCoreException {

+      return renderAttribute(attrType, presentationType, artifact, null, producer, attributeElement);

    }

 

-   public static String renderAttribute(String attrType, PresentationType presentationType, Artifact artifact, VariableMap options) throws OseeCoreException {

-      return getBestRenderer(presentationType, artifact, options).renderAttribute(attrType, artifact, presentationType);

+   public static String renderAttribute(String attrType, PresentationType presentationType, Artifact artifact, VariableMap options, Producer producer, AttributeElement attributeElement) throws OseeCoreException {

+      return getBestRenderer(presentationType, artifact, options).renderAttribute(attrType, artifact, presentationType,

+            producer, options, attributeElement);

    }

 

    public static List<IRenderer> getApplicableRenderer(PresentationType presentationType, Artifact artifact, VariableMap options) throws OseeCoreException {

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
index 1ce6be02388..1e8a87c3b33 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordRenderer.java
@@ -9,6 +9,9 @@ import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
 import org.eclipse.osee.framework.jdk.core.util.Collections;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.word.WordConverter;

+import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;

+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;

 import org.eclipse.swt.program.Program;

 

 /**

@@ -67,7 +70,7 @@ public abstract class WordRenderer extends FileRenderer {
    }

 

    @Override

-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {

+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {

       return artifact != null ? Collections.toString(", ", artifact.getAttributes(attributeTypeName)) : null;

    }

 }
\ No newline at end of file
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
index c40b525eaeb..9ef9ef9d1dc 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
@@ -45,6 +45,9 @@ import org.eclipse.osee.framework.ui.plugin.util.OseeData;
 import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;

 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

+import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement;

+import org.eclipse.osee.framework.ui.skynet.render.word.Producer;

+import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;

 import org.eclipse.osee.framework.ui.skynet.render.word.WordTemplateProcessor;

 import org.eclipse.osee.framework.ui.skynet.templates.TemplateManager;

 import org.w3c.dom.Element;

@@ -357,21 +360,55 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
     * @see org.eclipse.osee.framework.ui.skynet.render.WordRenderer#renderAttribute(java.lang.String, org.eclipse.osee.framework.skynet.core.artifact.Artifact)

     */

    @Override

-   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType) throws OseeCoreException {

+   public String renderAttribute(String attributeTypeName, Artifact artifact, PresentationType presentationType, Producer producer, VariableMap map, AttributeElement attributeElement) throws OseeCoreException {

       String value = "";

+      WordMLProducer wordMl = (WordMLProducer) producer;

+      String format = attributeElement.getFormat();

+      boolean allAttrs = map.getBoolean("allAttrs");

 

       if (attributeTypeName.equals(WordAttribute.WORD_TEMPLATE_CONTENT)) {

-         String data = (String) artifact.getSoleAttribute(attributeTypeName).getValue();

+         Attribute<?> wordTempConAttr = artifact.getSoleAttribute(attributeTypeName);

+         String data = (String) wordTempConAttr.getValue();

+

+         if (attributeElement.getLabel().length() > 0) {

+            wordMl.addParagraph(attributeElement.getLabel());

+         }

 

          if (data != null) {

             value = WordUtil.stripSpellCheck(data);//TODO what is the best way to get at unknown attribute types? (because this isn't it)

             //Change the BinData Id so images do not get overridden by the other images

             value = WordUtil.reassignBinDataID(value);

          }

+

+         if (presentationType == PresentationType.SPECIALIZED_EDIT) {

+            WordTemplateProcessor.writeXMLMetaDataWrapper(wordMl,

+                  WordTemplateProcessor.elementNameFor(attributeTypeName), "ns0:guid=\"" + artifact.getGuid() + "\"",

+                  "ns0:attrId=\"" + wordTempConAttr.getAttributeType().getAttrTypeId() + "\"", value);

+         } else {

+            wordMl.addWordMl(value);

+         }

+         wordMl.resetListValue();

+

       } else {

-         value = super.renderAttribute(attributeTypeName, artifact, presentationType);

-      }

+         wordMl.startParagraph();

+         // assumption: the label is of the form <w:r><w:t> text </w:t></w:r>

+         if (allAttrs) {

+            wordMl.addWordMl("<w:r><w:t> " + attributeTypeName + ": </w:t></w:r>");

+         } else {

+            wordMl.addWordMl(attributeElement.getLabel());

+         }

+

+         String valueList =

+               super.renderAttribute(attributeTypeName, artifact, PresentationType.SPECIALIZED_EDIT, wordMl, map,

+                     attributeElement);

 

+         if (attributeElement.getFormat().contains(">x<")) {

+            wordMl.addWordMl(format.replace(">x<", ">" + valueList + "<"));

+         } else {

+            wordMl.addTextInsideParagraph(valueList);

+         }

+         wordMl.endParagraph();

+      }

       return value;

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java
new file mode 100644
index 00000000000..136b6b61f06
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java
@@ -0,0 +1,70 @@
+/**

+ * 

+ */

+package org.eclipse.osee.framework.ui.skynet.render.word;

+

+import java.util.logging.Level;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+import org.eclipse.osee.framework.logging.OseeLog;

+import org.eclipse.osee.framework.skynet.core.word.WordUtil;

+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

+

+/**

+ * @author Jeff C. Phillips

+ */

+public class AttributeElement {

+   private static final Pattern internalAttributeElementsPattern =

+         Pattern.compile("<((\\w+:)?(Label|Outline|Name|Format|Editable))>(.*?)</\\1>",

+               Pattern.CASE_INSENSITIVE | Pattern.DOTALL | Pattern.MULTILINE);

+   private String outlineNumber;

+   private String label;

+   private String attributeName;

+   private String format;

+

+   public AttributeElement(String element) {

+      Matcher matcher = internalAttributeElementsPattern.matcher(element);

+

+      this.outlineNumber = "";

+      this.label = "";

+      this.attributeName = "";

+      this.format = "";

+

+      while (matcher.find()) {

+         String elementType = matcher.group(3);

+         String value = matcher.group(4).trim();

+         if (elementType.equals("Outline")) {

+            value = WordUtil.textOnly(value);

+            if (value.length() > 0) {

+               outlineNumber = value;

+            } else {

+               outlineNumber = "1.0";

+            }

+         } else if (elementType.equals("Label")) {

+            label = value;

+         } else if (elementType.equals("Name")) {

+            attributeName = WordUtil.textOnly(value);

+         } else if (elementType.equals("Format")) {

+            format = value;

+         } else {

+            OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unexpected element read in Attribute:" + elementType);

+         }

+      }

+   }

+

+   public String getAttributeName() {

+      return attributeName;

+   }

+

+   public String getFormat() {

+      return format;

+   }

+

+   public String getLabel() {

+      return label;

+   }

+

+   public String getOutlineNumber() {

+      return outlineNumber;

+   }

+}

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/Producer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/Producer.java
new file mode 100644
index 00000000000..af691b81fea
--- /dev/null
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/Producer.java
@@ -0,0 +1,11 @@
+/**

+ * 

+ */

+package org.eclipse.osee.framework.ui.skynet.render.word;

+

+/**

+ * @author Jeff C. Phillips

+ */

+public class Producer {

+

+}

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java
index ee7c01e0d81..7b2fdce38fc 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
 /**

  * @author Ryan D. Brooks

  */

-public class WordMLProducer {

+public class WordMLProducer extends Producer {

    public static final String RGB_RED = "FF0000";

    public static final String RGB_GREEN = "00FF00";

    public static final String RGB_BLUE = "0000FF";

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
index d8cc7596cef..05c9d25c327 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
@@ -21,7 +21,6 @@ import java.util.HashSet;
 import java.util.LinkedList;

 import java.util.List;

 import java.util.Set;

-import java.util.logging.Level;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 import org.eclipse.core.resources.IFolder;

@@ -36,7 +35,6 @@ import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
 import org.eclipse.osee.framework.db.connection.exception.OseeWrappedException;

 import org.eclipse.osee.framework.jdk.core.util.Lib;

 import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream;

-import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;

 import org.eclipse.osee.framework.skynet.core.artifact.NativeArtifact;

@@ -53,7 +51,6 @@ import org.eclipse.osee.framework.skynet.core.word.WordUtil;
 import org.eclipse.osee.framework.ui.plugin.util.AIFile;

 import org.eclipse.osee.framework.ui.plugin.util.Displays;

 import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;

-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;

 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;

 import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer;

 import org.eclipse.osee.framework.ui.skynet.render.IRenderer;

@@ -98,9 +95,6 @@ public class WordTemplateProcessor {
    private static final Pattern attributeElementsPattern =

          Pattern.compile("<((\\w+:)?(Attribute))>(.*?)</\\3>",

                Pattern.CASE_INSENSITIVE | Pattern.DOTALL | Pattern.MULTILINE);

-   private static final Pattern internalAttributeElementsPattern =

-         Pattern.compile("<((\\w+:)?(Label|Outline|Name|Format|Editable))>(.*?)</\\1>",

-               Pattern.CASE_INSENSITIVE | Pattern.DOTALL | Pattern.MULTILINE);

 

    private static final Pattern outlineElementsPattern =

          Pattern.compile("<((\\w+:)?(Outline))>(.*?)</\\1>",

@@ -506,7 +500,6 @@ public class WordTemplateProcessor {
          Attribute<?> attribute = artifact.getSoleAttribute(attributeTypeName);

          if (attribute == null) {

             artifact.createAttribute(AttributeTypeManager.getType(attributeTypeName), true);

-            //            artifact.persistAttributes();

          }

       }

 

@@ -521,41 +514,10 @@ public class WordTemplateProcessor {
             return;

          }

 

-         if (attributeTypeName.equals(WordAttribute.WORD_TEMPLATE_CONTENT)) {

-            if (attributeElement.label.length() > 0) {

-               wordMl.addParagraph(attributeElement.label);

-            }

-

-            String wordContent =

-                  RendererManager.renderAttribute(attributeTypeName, PresentationType.SPECIALIZED_EDIT, artifact);

+         VariableMap map = new VariableMap();

+         map.setValue("allAttrs", allAttrs);

 

-            if (presentationType == PresentationType.SPECIALIZED_EDIT) {

-               writeXMLMetaDataWrapper(wordMl, elementNameFor(attributeType.getName()),

-                     "ns0:guid=\"" + artifact.getGuid() + "\"", "ns0:attrId=\"" + attributeType.getAttrTypeId() + "\"",

-                     wordContent);

-            } else {

-               wordMl.addWordMl(wordContent);

-            }

-

-            wordMl.resetListValue();

-         } else {

-            wordMl.startParagraph();

-            // assumption: the label is of the form <w:r><w:t> text </w:t></w:r>

-            if (allAttrs) {

-               wordMl.addWordMl("<w:r><w:t> " + attributeTypeName + ": </w:t></w:r>");

-            } else {

-               wordMl.addWordMl(attributeElement.label);

-            }

-

-            String valueList =

-                  RendererManager.renderAttribute(attributeTypeName, PresentationType.SPECIALIZED_EDIT, artifact);

-            if (attributeElement.format.contains(">x<")) {

-               wordMl.addWordMl(format.replace(">x<", ">" + valueList + "<"));

-            } else {

-               wordMl.addTextInsideParagraph(valueList);

-            }

-            wordMl.endParagraph();

-         }

+         RendererManager.renderAttribute(attributeTypeName, presentationType, artifact, map, wordMl, attributeElement);

       }

    }

 

@@ -600,59 +562,6 @@ public class WordTemplateProcessor {
       }

    }

 

-   private static class AttributeElement {

-      private String outlineNumber;

-      private String label;

-      private String attributeName;

-      private String format;

-

-      public AttributeElement(String element) {

-         Matcher matcher = internalAttributeElementsPattern.matcher(element);

-

-         this.outlineNumber = "";

-         this.label = "";

-         this.attributeName = "";

-         this.format = "";

-

-         while (matcher.find()) {

-            String elementType = matcher.group(3);

-            String value = matcher.group(4).trim();

-            if (elementType.equals("Outline")) {

-               value = WordUtil.textOnly(value);

-               if (value.length() > 0) {

-                  outlineNumber = value;

-               } else {

-                  outlineNumber = "1.0";

-               }

-            } else if (elementType.equals("Label")) {

-               label = value;

-            } else if (elementType.equals("Name")) {

-               attributeName = WordUtil.textOnly(value);

-            } else if (elementType.equals("Format")) {

-               format = value;

-            } else {

-               OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unexpected element read in Attribute:" + elementType);

-            }

-         }

-      }

-

-      public String getAttributeName() {

-         return attributeName;

-      }

-

-      public String getFormat() {

-         return format;

-      }

-

-      public String getLabel() {

-         return label;

-      }

-

-      public String getOutlineNumber() {

-         return outlineNumber;

-      }

-   }

-

    private void loadIgnoreAttributeExtensions() {

       IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();

       if (extensionRegistry != null) {