From 0782bb736d0ae6ec15a932c796b5e32031ebe4f3 Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Tue, 24 Jul 2018 22:03:25 +0200
Subject: [PATCH] Code cleanup
---
.../java/avatartranslator/AvatarBinaryGuard.java | 5 ++---
.../java/avatartranslator/AvatarComposedGuard.java | 7 ++-----
.../java/avatartranslator/AvatarConstantGuard.java | 9 ++-------
src/main/java/avatartranslator/AvatarGuard.java | 10 +++-------
src/main/java/avatartranslator/AvatarGuardElse.java | 9 ++-------
src/main/java/avatartranslator/AvatarGuardEmpty.java | 11 ++++-------
.../java/avatartranslator/AvatarSimpleGuard.java | 5 -----
.../java/avatartranslator/AvatarSimpleGuardDuo.java | 9 ++-------
.../java/avatartranslator/AvatarSimpleGuardMono.java | 12 ++++++------
src/main/java/avatartranslator/AvatarUnaryGuard.java | 8 ++------
10 files changed, 25 insertions(+), 60 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarBinaryGuard.java b/src/main/java/avatartranslator/AvatarBinaryGuard.java
index 0c473aaafd..070ef547e6 100644
--- a/src/main/java/avatartranslator/AvatarBinaryGuard.java
+++ b/src/main/java/avatartranslator/AvatarBinaryGuard.java
@@ -36,10 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarBinaryGuard
@@ -81,7 +80,7 @@ public class AvatarBinaryGuard extends AvatarComposedGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
this.guardA.replaceAttributes (attributesMapping);
this.guardB.replaceAttributes (attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarComposedGuard.java b/src/main/java/avatartranslator/AvatarComposedGuard.java
index 7115e79a91..e414be224d 100644
--- a/src/main/java/avatartranslator/AvatarComposedGuard.java
+++ b/src/main/java/avatartranslator/AvatarComposedGuard.java
@@ -36,10 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
/**
@@ -49,7 +45,8 @@ package avatartranslator;
* @author Florian LUGOU
*/
public abstract class AvatarComposedGuard extends AvatarGuard {
- public AvatarComposedGuard getOpposite () {
+
+ public AvatarComposedGuard getOpposite () {
return new AvatarUnaryGuard ("not", "(", ")", this);
}
diff --git a/src/main/java/avatartranslator/AvatarConstantGuard.java b/src/main/java/avatartranslator/AvatarConstantGuard.java
index d6a3591d65..d19b4d8640 100644
--- a/src/main/java/avatartranslator/AvatarConstantGuard.java
+++ b/src/main/java/avatartranslator/AvatarConstantGuard.java
@@ -36,14 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
-
+import java.util.Map;
/**
* An AvatarConstantGuard is an {@link AvatarSimpleGuard} that is of the form:
@@ -73,5 +68,5 @@ public class AvatarConstantGuard extends AvatarSimpleGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
}
diff --git a/src/main/java/avatartranslator/AvatarGuard.java b/src/main/java/avatartranslator/AvatarGuard.java
index e02812cb68..69963b20e7 100644
--- a/src/main/java/avatartranslator/AvatarGuard.java
+++ b/src/main/java/avatartranslator/AvatarGuard.java
@@ -36,17 +36,13 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
+import java.util.Map;
+
import myutil.Conversion;
import myutil.TraceManager;
-import java.util.HashMap;
-
/**
* Class AvatarGuard
* Creation: 16/09/2015
@@ -250,5 +246,5 @@ public abstract class AvatarGuard {
* @param attributesMapping
* The mapping used to replace the attributes of the guard. All the attributes of the block should be present as keys.
*/
- public abstract void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
+ public abstract void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarGuardElse.java b/src/main/java/avatartranslator/AvatarGuardElse.java
index 61020187ad..f1135dd8e2 100644
--- a/src/main/java/avatartranslator/AvatarGuardElse.java
+++ b/src/main/java/avatartranslator/AvatarGuardElse.java
@@ -36,14 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
-
+import java.util.Map;
/**
* An AvatarGuardElse is an {@link AvatarGuard} that is of the form:
@@ -100,5 +95,5 @@ public class AvatarGuardElse extends AvatarGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
}
diff --git a/src/main/java/avatartranslator/AvatarGuardEmpty.java b/src/main/java/avatartranslator/AvatarGuardEmpty.java
index 15adf7e610..6e5cdd08ed 100644
--- a/src/main/java/avatartranslator/AvatarGuardEmpty.java
+++ b/src/main/java/avatartranslator/AvatarGuardEmpty.java
@@ -36,13 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
@@ -52,7 +48,8 @@ import java.util.HashMap;
* @author Florian LUGOU
*/
public class AvatarGuardEmpty extends AvatarGuard {
- public AvatarGuardEmpty () {
+
+ public AvatarGuardEmpty () {
}
public boolean isGuarded () {
@@ -69,5 +66,5 @@ public class AvatarGuardEmpty extends AvatarGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
}
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuard.java b/src/main/java/avatartranslator/AvatarSimpleGuard.java
index c45a25e9ef..7b2ea465a8 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuard.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuard.java
@@ -36,13 +36,8 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-
/**
* An AvatarSimpleGuard is an {@link AvatarGuard} that is of the form:
* {@link AvatarTerm} binaryOp {@link AvatarTerm} or simply {@link AvatarTerm}, or else
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
index 2054de4788..d6aa10cb0a 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
@@ -36,14 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
-
+import java.util.Map;
/**
* An AvatarSimpleGuardDuo is an {@link AvatarSimpleGuard} that is of the form:
@@ -85,7 +80,7 @@ public class AvatarSimpleGuardDuo extends AvatarSimpleGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.termA instanceof AvatarAttribute)
{
this.termA = attributesMapping.get(this.termA);
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
index f7ab27ac03..58aeefdd90 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
@@ -41,10 +41,9 @@
* Class AvatarSimpleGuardMono
*/
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
@@ -75,10 +74,11 @@ public class AvatarSimpleGuardMono extends AvatarSimpleGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
- for (AvatarAttribute attr: attributesMapping.keySet())
- {
- }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
+// for (AvatarAttribute attr: attributesMapping.keySet())
+// {
+// }
+
if (this.term instanceof AvatarAttribute)
{
this.term = attributesMapping.get(this.term);
diff --git a/src/main/java/avatartranslator/AvatarUnaryGuard.java b/src/main/java/avatartranslator/AvatarUnaryGuard.java
index 21c1884783..ed463e1d25 100644
--- a/src/main/java/avatartranslator/AvatarUnaryGuard.java
+++ b/src/main/java/avatartranslator/AvatarUnaryGuard.java
@@ -36,13 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarUnaryGuard
@@ -98,7 +94,7 @@ public class AvatarUnaryGuard extends AvatarComposedGuard {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
this.guard.replaceAttributes (attributesMapping);
}
}
--
GitLab