From 33c3782a9a19d75f087e587da598e14393021da4 Mon Sep 17 00:00:00 2001
From: karma <karma@world>
Date: Fri, 27 Sep 2019 16:37:48 +0200
Subject: [PATCH] [ZOOM] Issue #31 missing overrides in all internalfunc
---
.../AvatarMethodologyDiagramName.java | 2 +-
.../AvatarMethodologyDiagramToolbar.java | 4 ++--
.../AvatarMethodologyReferenceToAnalysis.java | 8 +++----
...atarMethodologyReferenceToAssumptions.java | 8 +++----
...AvatarMethodologyReferenceToPrototype.java | 8 +++----
...atarMethodologyReferenceToRequirement.java | 8 +++----
.../DiplodocusMethodologyDiagramName.java | 21 ++++++++-----------
...hodologyDiagramReferenceToApplication.java | 6 +++---
...sMethodologyDiagramReferenceToMapping.java | 8 +++----
...hodologyDiagramReferenceToRequirement.java | 8 +++----
.../DiplodocusMethodologyDiagramToolbar.java | 4 ++--
11 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 3e4cc09348..6111097a86 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -110,7 +110,7 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
myImageIcon = IconManager.imgic302;
}
-
+ @Override
public void internalDrawing(Graphics g) {
if ((y + Y_MARGIN) > (getFather().getY() + getFather().getHeight()))
return;
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 458f7828ae..dffc06435b 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -63,7 +63,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
super(_mgui);
}
-
+ @Override
protected void setActive(boolean b) {
mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
mgui.actions[TGUIAction.ACT_ZOOM_LESS].setEnabled(b);
@@ -89,7 +89,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
}
-
+ @Override
protected void setButtons() {
JButton button;
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 1f4a2511d3..be55883f7e 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -70,11 +70,11 @@ public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagr
addTGConnectingPointsCommentTop();
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARMETHODOLOGY_REF_ANALYSIS;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
if (panel instanceof AvatarAnalysisPanel) {
return true;
@@ -82,11 +82,11 @@ public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagr
return panel instanceof AttackTreePanel;
}
-
+ @Override
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
dn.setValidationsNumber(0);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
return true;
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index 726333ad14..9e4042771c 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -69,20 +69,20 @@ public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDi
addTGConnectingPointsCommentTop();
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARMETHODOLOGY_REF_ASSUMPTIONS;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return panel instanceof AvatarMADsPanel;
}
-
+ @Override
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
dn.setValidationsNumber(0);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
return true;
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index de63bfa669..547115e705 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -69,22 +69,22 @@ public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiag
addTGConnectingPointsCommentTop();
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARMETHODOLOGY_REF_PROTOTYPE;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return panel instanceof AvatarDesignPanel;
}
-
+ @Override
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
dn.setValidationsNumber(1);
dn.setValidationsInfo(0, AvatarMethodologyDiagramName.PROTO);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
switch(index) {
case 0:
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index 0256cc187f..15d6d70adb 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -71,20 +71,20 @@ public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDi
addTGConnectingPointsCommentTop();
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARMETHODOLOGY_REF_REQUIREMENT;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return panel instanceof AvatarRequirementPanel;
}
-
+ @Override
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
dn.setValidationsNumber(0);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
return true;
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 5bd2dbeed1..dc53d11fc5 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -117,14 +117,11 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
name = "value ";
-
-
initScaling(10, 10);
-
-
+
myImageIcon = IconManager.imgic302;
}
-
+ @Override
public void internalDrawing(Graphics g) {
boolean onMe = false;
@@ -132,13 +129,13 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
onMe = true;
}
- if (getFather() == null) {
- return;
- }
-
- if ((y+Y_MARGIN) > (getFather().getY()+getFather().getHeight())) {
- return;
- }
+ if (getFather() == null) {
+ return;
+ }
+
+ if ((y+Y_MARGIN) > (getFather().getY()+getFather().getHeight())) {
+ return;
+ }
//TraceManager.addDev("Internal drawing ...");
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index a0a07e0129..7601ebb046 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -72,16 +72,16 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
}
-
+ @Override
public int getType() {
return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_APPLICATION;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return (panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel);
}
-
+ @Override
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
dn.setValidationsNumber(5);
dn.setValidationsInfo(0, DiplodocusMethodologyDiagramName.SIM_ANIM_APP_DIPLO);
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 903b036d93..bdbcc9dfbe 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -74,16 +74,16 @@ public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMe
}
-
+ @Override
public int getType() {
return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_MAPPING;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return panel instanceof TMLArchiPanel;
}
-
+ @Override
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
dn.setValidationsNumber(4);
dn.setValidationsInfo(0, DiplodocusMethodologyDiagramName.SIM_ANIM_MAPPING_DIPLO);
@@ -91,7 +91,7 @@ public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMe
dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.FV_MAPPING_DIPLO);
dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.TML_MAPPING_DIPLO);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
String tmp;
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index dc56aab289..ec02141fd7 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -69,20 +69,20 @@ public class DiplodocusMethodologyDiagramReferenceToRequirement extends Diplodoc
addTGConnectingPointsCommentTop();
}
-
+ @Override
public int getType() {
return TGComponentManager.DIPLODODUSMETHODOLOGY_REF_REQUIREMENT;
}
-
+ @Override
public boolean isAValidPanelType(TURTLEPanel panel) {
return panel instanceof AvatarRequirementPanel;
}
-
+ @Override
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
dn.setValidationsNumber(0);
}
-
+ @Override
public boolean makeCall(String diagramName, int index) {
return true;
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
index df678ddc5b..7c58c5e10a 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
@@ -62,7 +62,7 @@ public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
super(_mgui);
}
-
+ @Override
protected void setActive(boolean b) {
mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
mgui.actions[TGUIAction.ACT_ZOOM_LESS].setEnabled(b);
@@ -88,7 +88,7 @@ public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
}
-
+ @Override
protected void setButtons() {
JButton button;
--
GitLab