Revert adding property to ITreeNode

The property plainTextTitle was reverted. If you need to give a plain
text title you can override the method toPlainText.

319634

Author: work-lto

eclipse-scout-core/src/tree/TreeNode.ts

@@ -33,7 +33,6 @@ export class TreeNode implements TreeNodeModel, ObjectWithType, FilterElement {
   parentNode: TreeNode;
   session: Session;
   text: string;
-  plainTextTitle: string;
   tooltipText: string;
   foregroundColor: string;
   backgroundColor: string;
@@ -89,7 +88,6 @@ export class TreeNode implements TreeNodeModel, ObjectWithType, FilterElement {
     this.rendered = false;
     this.session = null;
     this.text = null;
-    this.plainTextTitle = null;
 
     this._loadChildrenPromise = null;
   }
@@ -466,10 +464,6 @@ export class TreeNode implements TreeNodeModel, ObjectWithType, FilterElement {
     this.htmlEnabled = htmlEnabled;
   }
 
-  setPlainTextTitle(plainTextTitle: string) {
-    this.plainTextTitle = plainTextTitle;
-  }
-
   setParentNode(parentNode: TreeNode) {
     this.parentNode = parentNode;
   }

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/services/common/bookmark/DefaultBookmarkAdapter.java

@@ -37,12 +37,12 @@ public String getIdentifier() {
 
   @Override
   public String getTitle() {
-    return m_page.toPlainTextTitle();
+    return m_page.toPlainText();
   }
 
   @Override
   public String getText() {
-    return m_page.toPlainTextTitle();
+    return m_page.toPlainText();
   }
 
   @Override

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/basic/tree/AbstractTree.java

@@ -1078,7 +1078,7 @@ public String getPathText(ITreeNode selectedNode, String delimiter) {
         if (pathStr.length() != 0) {
           pathStr.insert(0, delimiter);
         }
-        pathStr.insert(0, node.toPlainTextTitle());
+        pathStr.insert(0, node.toPlainText());
       }
       // next
       node = node.getParentNode();
@@ -2597,7 +2597,7 @@ private void processDecorationBuffer() {
               interceptDecorateCell(node, node.getCellForUpdate());
             }
             catch (Exception t) {
-              LOG.warn("node {} ({})", node.getClass(), node.toPlainTextTitle(), t);
+              LOG.warn("node {} ({})", node.getClass(), node.toPlainText(), t);
             }
           }
         }
@@ -2828,7 +2828,7 @@ public void setNodesCheckedFromUI(List<ITreeNode> nodes, boolean checked) {
         StringBuilder msg = new StringBuilder();
         for (ITreeNode node : nodes) {
           msg.append("[");
-          msg.append(node.toPlainTextTitle());
+          msg.append(node.toPlainText());
           msg.append("]");
         }
         throw BEANS.get(PlatformExceptionTranslator.class).translate(e)
@@ -2860,7 +2860,7 @@ public void setNodeExpandedFromUI(ITreeNode node, boolean on, boolean lazy) {
       catch (RuntimeException e) {
         if (node != null) {
           throw BEANS.get(PlatformExceptionTranslator.class).translate(e)
-              .withContextInfo("node", node.toPlainTextTitle());
+              .withContextInfo("node", node.toPlainText());
         }
         throw e;
       }
@@ -2894,7 +2894,7 @@ public void setNodeSelectedAndExpandedFromUI(ITreeNode node) {
       catch (RuntimeException e) {
         if (node != null) {
           throw BEANS.get(PlatformExceptionTranslator.class).translate(e)
-              .withContextInfo("cell", node.toPlainTextTitle());
+              .withContextInfo("cell", node.toPlainText());
         }
         throw e;
       }

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/basic/tree/AbstractTreeNode.java

@@ -77,7 +77,6 @@ public abstract class AbstractTreeNode implements ITreeNode, ICellObserver, ICon
   private final OptimisticLock m_childrenLoadedLock;
   private final Cell m_cell;
 
-  private String m_plainTextTitle;
   private List<ITreeNode> m_childNodeList;
   private volatile List<ITreeNode> m_filteredChildNodes;
   private int m_status;
@@ -414,23 +413,13 @@ public final Cell getCellForUpdate() {
     return m_cell;
   }
 
-  @Override
-  public String getPlainTextTitle() {
-    return m_plainTextTitle;
-  }
-
-  @Override
-  public void setPlainTextTitle(String cellTitle) {
-    m_plainTextTitle = cellTitle;
-  }
-
   @Override
   public final void decorateCell() {
     try {
       interceptDecorateCell(m_cell);
     }
     catch (Exception t) {
-      LOG.error("node {} {}", getClass(), toPlainTextTitle(), t);
+      LOG.error("node {} {}", getClass(), toPlainText(), t);
     }
   }
 

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/basic/tree/ITreeNode.java

@@ -137,15 +137,8 @@ public interface ITreeNode extends IVisibleDimension, IEnabledDimension, IContex
 
   Cell getCellForUpdate();
 
-  /**
-   * Makes it possible to differentiate between the cell text (which could be html) and what the cell represents (e.g. a label)
-   */
-  String getPlainTextTitle();
-
-  void setPlainTextTitle(String title);
-
-  default String toPlainTextTitle() {
-    return getPlainTextTitle() == null ? getCell().toPlainText() : getPlainTextTitle();
+  default String toPlainText() {
+    return getCell().toPlainText();
   }
 
   Object getPrimaryKey();

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/DesktopEvent.java

@@ -209,7 +209,7 @@ public String toString() {
       buf.append(" ").append(m_messageBox.getHeader());
     }
     if (m_outline != null) {
-      buf.append(" ").append(m_outline.getRootNode().toPlainTextTitle());
+      buf.append(" ").append(m_outline.getRootNode().toPlainText());
     }
     buf.append("]");
     return buf.toString();

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/AbstractBookmarkTreeField.java

@@ -833,7 +833,7 @@ protected void execAction() {
         ITree tree = getTree();
         for (ITreeNode node : tree.getSelectedNodes()) {
           if (isBookmarkNode(node)) {
-            items.add(node.toPlainTextTitle());
+            items.add(node.toPlainText());
             filteredNodes.add(node);
           }
         }

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/desktop/bookmark/view/BookmarkViewForm.java

@@ -172,7 +172,7 @@ protected void execChangedDisplayText() {
            */
           @Override
           public boolean accept(ITreeNode node, int level) {
-            String text = node.toPlainTextTitle();
+            String text = node.toPlainText();
             return text == null || m_lowercaseFilterPattern == null || m_lowercaseFilterPattern.matcher(text.toLowerCase()).matches();
           }
         }

org.eclipse.scout.rt.datamodel.client/src/main/java/org/eclipse/scout/rt/client/ui/form/fields/composer/internal/ComposerDisplayTextBuilder.java

@@ -63,7 +63,7 @@ else if (node instanceof EitherOrNode) {
   private void visitOrNodes(List<? extends EitherOrNode> nodes, StringBuilder buf, String prefix) {
     for (EitherOrNode node : nodes) {
       buf.append(prefix);
-      buf.append(node.toPlainTextTitle());
+      buf.append(node.toPlainText());
       buf.append("\n");
       // add children
       visitAndNodes(node.getChildNodes(), buf, prefix + " ");
@@ -72,15 +72,15 @@ private void visitOrNodes(List<? extends EitherOrNode> nodes, StringBuilder buf,
 
   private void visitEntityNode(EntityNode node, StringBuilder buf, String prefix) {
     buf.append(prefix);
-    buf.append(node.toPlainTextTitle());
+    buf.append(node.toPlainText());
     buf.append("\n");
     // add children
     visitAndNodes(node.getChildNodes(), buf, prefix + " ");
   }
 
   private void visitAttributeNode(AttributeNode node, StringBuilder buf, String prefix) {
     buf.append(prefix);
-    buf.append(node.toPlainTextTitle());
+    buf.append(node.toPlainText());
     buf.append("\n");
     // add children
     visitAndNodes(node.getChildNodes(), buf, prefix + " ");

org.eclipse.scout.rt.datamodel.client/src/main/java/org/eclipse/scout/rt/client/ui/form/fields/composer/node/AbstractComposerNode.java

@@ -104,6 +104,6 @@ protected IMenu createAddEntityMenu(IDataModelEntity e) {
 
   @Override
   public String toString() {
-    return getClass().getSimpleName() + "[" + toPlainTextTitle() + "]";
+    return getClass().getSimpleName() + "[" + toPlainText() + "]";
   }
 }