From 7d1a192574234780fce8a04a74c33d1428615aa4 Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Wed, 30 Jan 2019 13:54:46 +0100
Subject: [PATCH] Changed inheritance for implementing zoom
---
.../java/ui/ad/TADComponentWithoutSubcomponents.java | 4 ++--
src/main/java/ui/ad/TADOneLineText.java | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ui/ad/TADComponentWithoutSubcomponents.java b/src/main/java/ui/ad/TADComponentWithoutSubcomponents.java
index f55ad3d18a..29aaac24b9 100644
--- a/src/main/java/ui/ad/TADComponentWithoutSubcomponents.java
+++ b/src/main/java/ui/ad/TADComponentWithoutSubcomponents.java
@@ -1,7 +1,7 @@
package ui.ad;
import ui.TDiagramPanel;
-import ui.TGCWithoutInternalComponent;
+import ui.TGCScalableWithoutInternalComponent;
import ui.TGComponent;
/**
@@ -9,7 +9,7 @@ import ui.TGComponent;
* @author dblouin
*
*/
-public abstract class TADComponentWithoutSubcomponents extends TGCWithoutInternalComponent {
+public abstract class TADComponentWithoutSubcomponents extends TGCScalableWithoutInternalComponent /* Issue #31 TGCWithoutInternalComponent*/ {
public TADComponentWithoutSubcomponents(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY,
boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/main/java/ui/ad/TADOneLineText.java b/src/main/java/ui/ad/TADOneLineText.java
index db8fc5c86f..27a58d0196 100644
--- a/src/main/java/ui/ad/TADOneLineText.java
+++ b/src/main/java/ui/ad/TADOneLineText.java
@@ -1,10 +1,12 @@
package ui.ad;
+import ui.ScalableTGComponent;
import ui.TDiagramPanel;
import ui.TGCOneLineText;
import ui.TGComponent;
+import ui.ZoomUtil;
-public abstract class TADOneLineText extends TGCOneLineText {
+public abstract class TADOneLineText extends TGCOneLineText implements ScalableTGComponent {
public TADOneLineText(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father,
TDiagramPanel _tdp) {
@@ -22,4 +24,9 @@ public abstract class TADOneLineText extends TGCOneLineText {
return visitor.isCanBeDisabled();
}
+
+ @Override
+ public void rescale( final double scaleFactor ) {
+ ZoomUtil.rescale( this, scaleFactor );
+ }
}
--
GitLab