From 310924f225c21ec62922efa09fa0f13f77ddb83c Mon Sep 17 00:00:00 2001
From: Moemoea Fierin <moemoea.fierin@epita.fr>
Date: Wed, 9 Oct 2019 16:58:53 +0200
Subject: [PATCH] [ZOOM] ADD files check on zooms
-missing override
-changed to new drawString function
---
src/main/java/ui/avatardd/ADDArtifact.java | 2 +-
src/main/java/ui/avatardd/ADDBlockArtifact.java | 2 +-
src/main/java/ui/avatardd/ADDBridgeNode.java | 4 ++--
src/main/java/ui/avatardd/ADDBusNode.java | 4 ++--
src/main/java/ui/avatardd/ADDCPUNode.java | 4 ++--
src/main/java/ui/avatardd/ADDChannelArtifact.java | 2 +-
src/main/java/ui/avatardd/ADDClusterNode.java | 4 ++--
src/main/java/ui/avatardd/ADDCoproMWMRNode.java | 4 ++--
src/main/java/ui/avatardd/ADDCrossbarNode.java | 4 ++--
src/main/java/ui/avatardd/ADDDMANode.java | 4 ++--
src/main/java/ui/avatardd/ADDICUNode.java | 4 ++--
src/main/java/ui/avatardd/ADDMemoryNode.java | 4 ++--
src/main/java/ui/avatardd/ADDTTYNode.java | 4 ++--
src/main/java/ui/avatardd/ADDTimerNode.java | 4 ++--
src/main/java/ui/avatardd/ADDVgmnNode.java | 4 ++--
15 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/ui/avatardd/ADDArtifact.java b/src/main/java/ui/avatardd/ADDArtifact.java
index 168176f98a..bf19919efc 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 5c0610657a..a2ee363f44 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 197ddca0fd..f79bf229a7 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 62d81cb73c..582466cd60 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 9b938ca44e..f2e84d367e 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 7d5944d04d..e767e8d75d 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 9ef5fc5be1..7217501545 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 5cfe395be0..85e2930b37 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 c27505f8d0..10c443c63f 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 b2fc27c22c..90e799bdb1 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 60299f17f3..b3a106f6b7 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 974391901f..e25dbb077e 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 068e154409..3b9422ae40 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 3f29b81ed0..0a9142c7a3 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 97b17316e4..0b80e56759 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);
--
GitLab