From 5d8282af6225db79416b071de0f6d20ffdf48054 Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Fri, 21 Sep 2018 16:38:53 +0200
Subject: [PATCH] Code cleanup
---
.../java/avatartranslator/AvatarConstant.java | 4 +-
.../tmlad/TestTMLADComponentsDisabling.java | 97 -------------------
2 files changed, 2 insertions(+), 99 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarConstant.java b/src/main/java/avatartranslator/AvatarConstant.java
index 03a1710ccc..04f9b617ca 100644
--- a/src/main/java/avatartranslator/AvatarConstant.java
+++ b/src/main/java/avatartranslator/AvatarConstant.java
@@ -52,11 +52,11 @@ public class AvatarConstant extends AvatarTerm {
public static final AvatarConstant FALSE = new AvatarConstant ("false", null);
public boolean isLeftHand (){
- return false;
+ return false;
}
public AvatarConstant (String _name, Object _referenceObject) {
- super (_name, _referenceObject);
+ super(_name, _referenceObject);
}
@Override
diff --git a/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java b/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
index 69f7e84ff5..a7fe2826d9 100644
--- a/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
+++ b/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
@@ -160,103 +160,6 @@ public class TestTMLADComponentsDisabling extends AbstractUITest {
assertFalse( stopElement.canBeDisabled() );
}
-// @Test
-// public void testDisableTGConnectorTMLADWithChoice() {
-// final TGComponent startElement = new TMLADStartState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-// diagramPanel.addComponent( startElement, startElement.getX(), startElement.getY(), false, true );
-//
-// final TGComponent requestElement = new TMLADSendRequest( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-// diagramPanel.addComponent( requestElement, requestElement.getX(), requestElement.getY(), false, true );
-//
-// final TGComponent con1 = new TGConnectorTMLAD( 0,
-// 0,
-// diagramPanel.getMinX(),
-// diagramPanel.getMaxX(),
-// diagramPanel.getMinY(),
-// diagramPanel.getMaxY(),
-// false,
-// null,
-// diagramPanel,
-// startElement.getTGConnectingPointAtIndex( 0 ),
-// requestElement.getTGConnectingPointAtIndex( 0 ),
-// new Vector<Point>() );
-// diagramPanel.addComponent( con1, con1.getX(), con1.getY(), false, true );
-//
-// final TGComponent actionElement = new TMLADActionState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-// diagramPanel.addComponent( actionElement, actionElement.getX(), actionElement.getY(), false, true );
-//
-// final TGComponent con2 = new TGConnectorTMLAD( 0,
-// 0,
-// diagramPanel.getMinX(),
-// diagramPanel.getMaxX(),
-// diagramPanel.getMinY(),
-// diagramPanel.getMaxY(),
-// false,
-// null,
-// diagramPanel,
-// requestElement.getTGConnectingPointAtIndex( 1 ),
-// actionElement.getTGConnectingPointAtIndex( 0 ),
-// new Vector<Point>() );
-// diagramPanel.addComponent( con2, con2.getX(), con2.getY(), false, true );
-//
-// final TGComponent stopElement = new TMLADStopState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-// diagramPanel.addComponent( stopElement, stopElement.getX(), stopElement.getY(), false, true );
-//
-// final TGComponent con3 = new TGConnectorTMLAD( 0,
-// 0,
-// diagramPanel.getMinX(),
-// diagramPanel.getMaxX(),
-// diagramPanel.getMinY(),
-// diagramPanel.getMaxY(),
-// false,
-// null,
-// diagramPanel,
-// actionElement.getTGConnectingPointAtIndex( 1 ),
-// stopElement.getTGConnectingPointAtIndex( 0 ),
-// new Vector<Point>() );
-// diagramPanel.addComponent( con3, con3.getX(), con3.getY(), false, true );
-//
-// assertTrue( con1.canBeDisabled() );
-// assertTrue( con2.canBeDisabled() );
-// assertFalse( con3.canBeDisabled() );
-//
-// con1.setEnabled( false );
-// assertTrue( startElement.isEnabled() );
-// assertTrue( con1.isEnabled() );
-// assertFalse( requestElement.isEnabled() );
-// assertTrue( con2.isEnabled() );
-// assertFalse( actionElement.isEnabled() );
-// assertTrue( con3.isEnabled() );
-// assertTrue( stopElement.isEnabled() );
-//
-// con1.setEnabled( true );
-// assertTrue( startElement.isEnabled() );
-// assertTrue( con1.isEnabled() );
-// assertTrue( requestElement.isEnabled() );
-// assertTrue( con2.isEnabled() );
-// assertTrue( actionElement.isEnabled() );
-// assertTrue( con3.isEnabled() );
-// assertTrue( stopElement.isEnabled() );
-//
-// con2.setEnabled( false );
-// assertTrue( startElement.isEnabled() );
-// assertTrue( con1.isEnabled() );
-// assertTrue( requestElement.isEnabled() );
-// assertTrue( con2.isEnabled() );
-// assertFalse( actionElement.isEnabled() );
-// assertTrue( con3.isEnabled() );
-// assertTrue( stopElement.isEnabled() );
-//
-// con2.setEnabled( true );
-// assertTrue( startElement.isEnabled() );
-// assertTrue( con1.isEnabled() );
-// assertTrue( requestElement.isEnabled() );
-// assertTrue( con2.isEnabled() );
-// assertTrue( actionElement.isEnabled() );
-// assertTrue( con3.isEnabled() );
-// assertTrue( stopElement.isEnabled() );
-// }
-
@Test
public void testDisableTMLADActionState() {
final CDElement element = new TMLADActionState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
--
GitLab