"Team Workflow" - D8K0F - "Ampersand is not properly handled in an action/ branch name"

6 files changed, 35 insertions, 23 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java
index f0cbbbe5694..ed89550228a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java
@@ -4,6 +4,7 @@ import java.text.NumberFormat;
 import java.util.logging.Level;

 import org.eclipse.osee.framework.core.data.TransactionDelta;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

+import org.eclipse.osee.framework.jdk.core.util.AXml;

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

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

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

@@ -45,17 +46,18 @@ public final class BaseToHeadHandler implements IChangeReportUiHandler {
    }

 

    @Override

-   public String getScenarioDescription(ChangeUiData changeUiData) throws OseeCoreException {

+   public String getScenarioDescriptionHtml(ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       NumberFormat formatter = NumberFormat.getInstance();

       return String.format(

             "Shows all changes made to [<b>%s</b>] from when it was created (transaction <b>%s</b>) until it was last modified (transaction <b>%s</b>).",

-            txDelta.getStartTx().getBranch(), formatter.format(txDelta.getStartTx().getId()),

-            formatter.format(txDelta.getEndTx().getId()));

+            AXml.textToXml(txDelta.getStartTx().getBranch().getName()),

+            AXml.textToXml(formatter.format(txDelta.getStartTx().getId())),

+            AXml.textToXml(formatter.format(txDelta.getEndTx().getId())));

    }

 

    @Override

-   public void appendTransactionInfo(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

+   public void appendTransactionInfoHtml(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       sb.append("<b>Created: </b><br/>");

       ChangeReportInfoPresenter.addTransactionInfo(sb, txDelta.getStartTx());

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java
index 31f4973f6ed..9f3224edb35 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java
@@ -10,6 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.logging.Level;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.model.TransactionRecord;

+import org.eclipse.osee.framework.jdk.core.util.AXml;

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

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.UserManager;

@@ -82,7 +83,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget {
          sb.append("<br/>");

          addAssociated(sb);

          try {

-            changeData.getCompareType().getHandler().appendTransactionInfo(sb, changeData);

+            changeData.getCompareType().getHandler().appendTransactionInfoHtml(sb, changeData);

          } catch (OseeCoreException ex) {

             OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);

          }

@@ -95,8 +96,9 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget {
    private void addInterpretation(StringBuilder sb) {

       sb.append("<b>Description: </b> ");

       try {

-         sb.append(changeData.getCompareType().getHandler().getScenarioDescription(changeData));

+         sb.append(changeData.getCompareType().getHandler().getScenarioDescriptionHtml(changeData));

       } catch (OseeCoreException ex) {

+         OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);

          sb.append(changeData.getCompareType().getHandler().getActionDescription());

       }

       sb.append("");

@@ -106,7 +108,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget {
       String message = "";

       Artifact associatedArtifact = changeData.getAssociatedArtifact();

       if (associatedArtifact != null) {

-         message = associatedArtifact.getName();

+         message = AXml.textToXml(associatedArtifact.getName());

       } else {

          message = "Unkown";

       }

@@ -123,8 +125,8 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget {
       }

       DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG);

       sb.append(String.format("               <b>On: </b> %s<br/>", dateFormat.format(transaction.getTimeStamp())));

-      sb.append(String.format("               <b>By: </b> %s<br/>", author));

-      sb.append(String.format("               <b>Comment: </b> %s", transaction.getComment()));

+      sb.append(String.format("               <b>By: </b> %s<br/>", AXml.textToXml(author)));

+      sb.append(String.format("               <b>Comment: </b> %s", AXml.textToXml(transaction.getComment())));

    }

 

    @Override

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java
index d2a3a7529e6..bedb6eafe83 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java
@@ -3,6 +3,7 @@ package org.eclipse.osee.framework.ui.skynet.change.presenter;
 import java.util.logging.Level;

 import org.eclipse.osee.framework.core.data.TransactionDelta;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

+import org.eclipse.osee.framework.jdk.core.util.AXml;

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

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

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

@@ -50,24 +51,26 @@ public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler
    }

 

    @Override

-   public String getScenarioDescription(ChangeUiData changeUiData) throws OseeCoreException {

+   public String getScenarioDescriptionHtml(ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       String data;

       if (changeUiData.isMergeBranchValid()) {

          data =

                String.format(

                      "Shows all changes made to [<b>%s</b>], including changes found in the merge branch compared to branch [<b>%s</b>].",

-                     txDelta.getStartTx().getBranch(), txDelta.getEndTx().getBranch());

+                     AXml.textToXml(txDelta.getStartTx().getBranch().getName()),

+                     AXml.textToXml(txDelta.getEndTx().getBranch().getName()));

       } else {

          data =

                String.format("Shows all changes made to [<b>%s</b>] compared to branch [<b>%s</b>].",

-                     txDelta.getStartTx().getBranch(), txDelta.getEndTx().getBranch());

+                     AXml.textToXml(txDelta.getStartTx().getBranch().getName()),

+                     AXml.textToXml(txDelta.getEndTx().getBranch().getName()));

       }

       return data;

    }

 

    @Override

-   public void appendTransactionInfo(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

+   public void appendTransactionInfoHtml(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       sb.append("<b>Branch 1 Last Modified</b>:<br/>");

       ChangeReportInfoPresenter.addTransactionInfo(sb, txDelta.getStartTx());

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java
index 44378ed25a7..dbb65987159 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java
@@ -3,6 +3,7 @@ package org.eclipse.osee.framework.ui.skynet.change.presenter;
 import java.util.logging.Level;

 import org.eclipse.osee.framework.core.data.TransactionDelta;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

+import org.eclipse.osee.framework.jdk.core.util.AXml;

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

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

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

@@ -50,24 +51,26 @@ public final class CurrentsAgainstParentHandler implements IChangeReportUiHandle
    }

 

    @Override

-   public String getScenarioDescription(ChangeUiData changeUiData) throws OseeCoreException {

+   public String getScenarioDescriptionHtml(ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       String data;

       if (changeUiData.isMergeBranchValid()) {

          data =

                String.format(

                      "Shows all changes made to [<b>%s</b>], including changes found in the merge branch compared to%s branch [<b>%s</b>].",

-                     txDelta.getStartTx().getBranch(), " its parent", txDelta.getEndTx().getBranch());

+                     AXml.textToXml(txDelta.getStartTx().getBranch().getName()), " its parent",

+                     AXml.textToXml(txDelta.getEndTx().getBranch().getName()));

       } else {

          data =

                String.format("Shows all changes made to [<b>%s</b>] compared to%s branch [<b>%s</b>].",

-                     txDelta.getStartTx().getBranch(), " its parent", txDelta.getEndTx().getBranch());

+                     AXml.textToXml(txDelta.getStartTx().getBranch().getName()), " its parent",

+                     AXml.textToXml(txDelta.getEndTx().getBranch().getName()));

       }

       return data;

    }

 

    @Override

-   public void appendTransactionInfo(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

+   public void appendTransactionInfoHtml(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       sb.append("<b>Working Branch Last Modified</b>:<br/>");

       ChangeReportInfoPresenter.addTransactionInfo(sb, txDelta.getStartTx());

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java
index 0545c22f7fe..992e458cada 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/IChangeReportUiHandler.java
@@ -13,12 +13,12 @@ public interface IChangeReportUiHandler {
 

    public KeyedImage getScenarioImage(ChangeUiData changeUiData);

 

-   public String getScenarioDescription(ChangeUiData changeUiData) throws OseeCoreException;

+   public String getScenarioDescriptionHtml(ChangeUiData changeUiData) throws OseeCoreException;

 

    public String getActionDescription();

 

    public String getName(TransactionDelta txDelta);

 

-   public void appendTransactionInfo(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException;

+   public void appendTransactionInfoHtml(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException;

 

 }

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java
index 3c4618d8a47..633c3035af5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java
@@ -4,6 +4,7 @@ import java.text.NumberFormat;
 import java.util.logging.Level;

 import org.eclipse.osee.framework.core.data.TransactionDelta;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

+import org.eclipse.osee.framework.jdk.core.util.AXml;

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

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

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

@@ -51,16 +52,17 @@ public final class SpecificTxsHandler implements IChangeReportUiHandler {
    }

 

    @Override

-   public String getScenarioDescription(ChangeUiData changeUiData) throws OseeCoreException {

+   public String getScenarioDescriptionHtml(ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       NumberFormat formatter = NumberFormat.getInstance();

       return String.format("Shows changes made to [<b>%s</b>] between transactions [<b>%s</b>] and [<b>%s</b>].",

-            txDelta.getStartTx().getBranch(), formatter.format(txDelta.getStartTx().getId()),

-            formatter.format(txDelta.getEndTx().getId()));

+            AXml.textToXml(txDelta.getStartTx().getBranch().getName()),

+            AXml.textToXml(formatter.format(txDelta.getStartTx().getId())),

+            AXml.textToXml(formatter.format(txDelta.getEndTx().getId())));

    }

 

    @Override

-   public void appendTransactionInfo(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

+   public void appendTransactionInfoHtml(StringBuilder sb, ChangeUiData changeUiData) throws OseeCoreException {

       TransactionDelta txDelta = changeUiData.getTxDelta();

       //      sb.append("<b>Branch 1 Last Modified</b>:<br/>");

       //      ChangeReportInfoPresenter.addTransactionInfo(sb, txDelta.getStartTx());