diff --git a/src/main/java/ui/avatardd/ADDArtifact.java b/src/main/java/ui/avatardd/ADDArtifact.java
index 168176f98ae540799e9edccb7271b88f60ae759b..bf19919efc4c984f6e6e31af9c47e3d5a481f0fb 100755
--- a/src/main/java/ui/avatardd/ADDArtifact.java
+++ b/src/main/java/ui/avatardd/ADDArtifact.java
@@ -115,7 +115,7 @@ public class ADDArtifact extends TGCWithoutInternalComponent implements Swallowe
 
         g.drawImage(IconManager.img9, x+width-space-fileX + 3, y + space + 7, null);
 
-        g.drawString(value, x + textX , y + textY);
+        drawSingleString(g, value, x + textX , y + textY);
 
     }
 
diff --git a/src/main/java/ui/avatardd/ADDBlockArtifact.java b/src/main/java/ui/avatardd/ADDBlockArtifact.java
index 5c0610657a9e220132dd21db5cc64016e9b37fd5..a2ee363f441e0d44cf3ff8a0f7928c385b9547a6 100755
--- a/src/main/java/ui/avatardd/ADDBlockArtifact.java
+++ b/src/main/java/ui/avatardd/ADDBlockArtifact.java
@@ -116,7 +116,7 @@ public class ADDBlockArtifact extends TGCWithoutInternalComponent implements Swa
 		
 		g.drawImage(IconManager.img9, x+width-space-fileX + 3, y + space + 7, null);
         
-        g.drawString(value, x + textX , y + textY);
+        drawSingleString(g, value, x + textX , y + textY);
         
     }
     
diff --git a/src/main/java/ui/avatardd/ADDBridgeNode.java b/src/main/java/ui/avatardd/ADDBridgeNode.java
index 197ddca0fd89d31d204bc0de7a0e641d898806b6..f79bf229a70bb108acf9671b86ecce9f0189a196 100755
--- a/src/main/java/ui/avatardd/ADDBridgeNode.java
+++ b/src/main/java/ui/avatardd/ADDBridgeNode.java
@@ -128,9 +128,9 @@ public class ADDBridgeNode extends ADDCommunicationNode implements WithAttribute
         // Strings
         String ster = "<<" + stereotype + ">>";
         int w  = g.getFontMetrics().stringWidth(ster);
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         w  = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 		
 		// Icon
 		//g.drawImage(IconManager.imgic1104.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDBusNode.java b/src/main/java/ui/avatardd/ADDBusNode.java
index 62d81cb73ca3b51701bce97898f803b5787c6366..582466cd602986228f74ec1bff865cb74c72f250 100755
--- a/src/main/java/ui/avatardd/ADDBusNode.java
+++ b/src/main/java/ui/avatardd/ADDBusNode.java
@@ -138,10 +138,10 @@ public class ADDBusNode extends ADDCommunicationNode implements WithAttributes {
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         g.setFont(f);
         w  = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         //g.drawImage(IconManager.imgic1102.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDCPUNode.java b/src/main/java/ui/avatardd/ADDCPUNode.java
index 9b938ca44e76481921b72df3796850632c8875dd..f2e84d367e04361e899c302452a10f17fbc34b77 100755
--- a/src/main/java/ui/avatardd/ADDCPUNode.java
+++ b/src/main/java/ui/avatardd/ADDCPUNode.java
@@ -148,10 +148,10 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         g.setFont(f);
         w  = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         g.drawImage(IconManager.imgic1100.getImage(), x + 4, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDChannelArtifact.java b/src/main/java/ui/avatardd/ADDChannelArtifact.java
index 7d5944d04d35fd29c1c731435c290dad1ea62a7c..e767e8d75dc9dadf2193b801e4e7ba792b89aca6 100755
--- a/src/main/java/ui/avatardd/ADDChannelArtifact.java
+++ b/src/main/java/ui/avatardd/ADDChannelArtifact.java
@@ -117,7 +117,7 @@ public class ADDChannelArtifact extends TGCWithoutInternalComponent implements S
 
         g.drawImage(IconManager.img9, x+width-space-fileX + 3, y + space + 7, null);
 
-        g.drawString(value, x + textX , y + textY);
+        drawSingleString(g, value, x + textX , y + textY);
     }
 
     public void setValue(String val, Graphics g) {
diff --git a/src/main/java/ui/avatardd/ADDClusterNode.java b/src/main/java/ui/avatardd/ADDClusterNode.java
index 9ef5fc5be1cf6c3ed37d87af32a8a296393ecbda..721750154595d6c6294c39278ef82b84d8645c6e 100644
--- a/src/main/java/ui/avatardd/ADDClusterNode.java
+++ b/src/main/java/ui/avatardd/ADDClusterNode.java
@@ -135,10 +135,10 @@ public class ADDClusterNode extends ADDNode implements WithAttributes {
 		int w  = g.getFontMetrics().stringWidth(ster);
 		Font f = g.getFont();
 		g.setFont(f.deriveFont(Font.BOLD));
-		g.drawString(ster, x + (width - w)/2, y + textY1);
+		drawSingleString(g, ster, x + (width - w)/2, y + textY1);
 		g.setFont(f);
 		w  = g.getFontMetrics().stringWidth(name);
-		g.drawString(name, x + (width - w)/2, y + textY2);
+		drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
 		// Icon
 		g.drawImage(IconManager.imgic8006.getImage(), x + 4, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
index 5cfe395be0b1f127be14ff8f85c0c7e462c77dcc..85e2930b3787cdb930671bba584aaf1a1dc53db5 100755
--- a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
@@ -147,10 +147,10 @@ public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttrib
 		int w  = g.getFontMetrics().stringWidth(ster);
 		Font f = g.getFont();
 		g.setFont(f.deriveFont(Font.BOLD));
-		g.drawString(ster, x + (width - w)/2, y + textY1);
+		drawSingleString(g, ster, x + (width - w)/2, y + textY1);
 		w  = g.getFontMetrics().stringWidth(name);
 		g.setFont(f);
-		g.drawString(name, x + (width - w)/2, y + textY2);
+		drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
 		// Icon
 		//g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDCrossbarNode.java b/src/main/java/ui/avatardd/ADDCrossbarNode.java
index c27505f8d03715d41ee828992aca9e0a32681c9e..10c443c63fb7c840c89e8833c913668f3296d159 100755
--- a/src/main/java/ui/avatardd/ADDCrossbarNode.java
+++ b/src/main/java/ui/avatardd/ADDCrossbarNode.java
@@ -142,10 +142,10 @@ public class ADDCrossbarNode extends ADDCommunicationNode implements WithAttribu
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         g.setFont(f);
         w  = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         //g.drawImage(IconManager.imgic1102.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDDMANode.java b/src/main/java/ui/avatardd/ADDDMANode.java
index b2fc27c22cd9c5070020a40aa64f80ae4845c103..90e799bdb1cc66c31830ecd08c21052f1cb83dc7 100755
--- a/src/main/java/ui/avatardd/ADDDMANode.java
+++ b/src/main/java/ui/avatardd/ADDDMANode.java
@@ -132,10 +132,10 @@ public class ADDDMANode extends ADDCommunicationNode implements WithAttributes {
         int w  = g.getFontMetrics().stringWidth(ster);
 		Font f = g.getFont();
 		g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         w  = g.getFontMetrics().stringWidth(name);
 		g.setFont(f);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 		
 		// Icon
 		//g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDICUNode.java b/src/main/java/ui/avatardd/ADDICUNode.java
index 60299f17f32030ccf14fa15636819f68408b3cea..b3a106f6b70b9459c1285bf13473abf6ffd1fee6 100755
--- a/src/main/java/ui/avatardd/ADDICUNode.java
+++ b/src/main/java/ui/avatardd/ADDICUNode.java
@@ -137,10 +137,10 @@ public class ADDICUNode extends ADDCommunicationNode implements WithAttributes {
         int w  = g.getFontMetrics().stringWidth(ster);
 		Font f = g.getFont();
 		g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         w  = g.getFontMetrics().stringWidth(name);
 		g.setFont(f);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 		
 		// Icon
 		//g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDMemoryNode.java b/src/main/java/ui/avatardd/ADDMemoryNode.java
index 974391901f33bcf84f32e24a358f2005d4314e01..e25dbb077ed123352281e50979bbef054ddaec1f 100755
--- a/src/main/java/ui/avatardd/ADDMemoryNode.java
+++ b/src/main/java/ui/avatardd/ADDMemoryNode.java
@@ -101,10 +101,10 @@ public abstract class ADDMemoryNode extends ADDCommunicationNode implements With
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         w  = g.getFontMetrics().stringWidth(name);
         g.setFont(f);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDTTYNode.java b/src/main/java/ui/avatardd/ADDTTYNode.java
index 068e154409db8caaeb19f407d6ca8797eb746f46..3b9422ae40c6c4c519a196d1feba4adb924fd5f7 100755
--- a/src/main/java/ui/avatardd/ADDTTYNode.java
+++ b/src/main/java/ui/avatardd/ADDTTYNode.java
@@ -137,10 +137,10 @@ public class ADDTTYNode extends ADDNode implements WithAttributes {
 		int w  = g.getFontMetrics().stringWidth(ster);
 		Font f = g.getFont();
 		g.setFont(f.deriveFont(Font.BOLD));
-		g.drawString(ster, x + (width - w)/2, y + textY1);
+		drawSingleString(g, ster, x + (width - w)/2, y + textY1);
 		g.setFont(f);
 		w  = g.getFontMetrics().stringWidth(name);
-		g.drawString(name, x + (width - w)/2, y + textY2);
+		drawSingleString(g, name, x + (width - w)/2, y + textY2);
 		
 		// Icon
 		g.drawImage(IconManager.imgic1100.getImage(), x + 4, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDTimerNode.java b/src/main/java/ui/avatardd/ADDTimerNode.java
index 3f29b81ed004dd08bf29126058fd12f8d3ce53d9..0a9142c7a3cab105eba46ca39b85424766573d3b 100755
--- a/src/main/java/ui/avatardd/ADDTimerNode.java
+++ b/src/main/java/ui/avatardd/ADDTimerNode.java
@@ -137,10 +137,10 @@ public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         w  = g.getFontMetrics().stringWidth(name);
         g.setFont(f);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         //g.drawImage(IconManager.imgic1108.getImage(), x + width - 20, y + 4, null);
diff --git a/src/main/java/ui/avatardd/ADDVgmnNode.java b/src/main/java/ui/avatardd/ADDVgmnNode.java
index 97b17316e470affcc3f8eaa5077606996cf4b75b..0b80e567592ad158207593d71bd9036612167f1e 100755
--- a/src/main/java/ui/avatardd/ADDVgmnNode.java
+++ b/src/main/java/ui/avatardd/ADDVgmnNode.java
@@ -142,10 +142,10 @@ public class ADDVgmnNode extends ADDCommunicationNode implements WithAttributes
         int w  = g.getFontMetrics().stringWidth(ster);
         Font f = g.getFont();
         g.setFont(f.deriveFont(Font.BOLD));
-        g.drawString(ster, x + (width - w)/2, y + textY1);
+        drawSingleString(g, ster, x + (width - w)/2, y + textY1);
         g.setFont(f);
         w  = g.getFontMetrics().stringWidth(name);
-        g.drawString(name, x + (width - w)/2, y + textY2);
+        drawSingleString(g, name, x + (width - w)/2, y + textY2);
 
         // Icon
         //g.drawImage(IconManager.imgic1102.getImage(), x + width - 20, y + 4, null);