Change @Predicate and @term in @id and @param

DeMaCS-UNICAL · Mar 23, 2017 · caee0e0 · caee0e0
1 parent cde37a0
commit caee0e0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/...nical/mat/embasp/languages/Predicate.java → ...va/it/unical/mat/embasp/languages/Id.java b/...nical/mat/embasp/languages/Predicate.java → ...va/it/unical/mat/embasp/languages/Id.java
@@ -7,6 +7,6 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Predicate {
+public @interface Id {
 	String value();
 }
diff --git a/app/src/main/java/it/unical/mat/embasp/languages/Mapper.java b/app/src/main/java/it/unical/mat/embasp/languages/Mapper.java
@@ -94,20 +94,20 @@ public String getString(final Object obj) throws IllegalAccessException, Illegal
 		final HashMap<Integer, Object> parametersMap = new HashMap<>();
 		for (final Field field : obj.getClass().getDeclaredFields()) {
 			if (field.isSynthetic()) continue;
-			if (field.isAnnotationPresent(Term.class)) {
+			if (field.isAnnotationPresent(Param.class)) {
 				final Object value = obj.getClass().getMethod("get" + Character.toUpperCase(field.getName().charAt(0)) + field.getName().substring(1))
 						.invoke(obj);
-				parametersMap.put(field.getAnnotation(Term.class).value(), value);
+				parametersMap.put(field.getAnnotation(Param.class).value(), value);
 			}
 		}
         return getActualString(predicate, parametersMap);
 	}
 
 	private void populateObject(final Class<?> cl, final String[] parameters, final Object obj) throws IllegalAccessException, InvocationTargetException {
 		for (final Field field : cl.getDeclaredFields())
-			if (field.isAnnotationPresent(Term.class)) {
+			if (field.isAnnotationPresent(Param.class)) {
 
-				final int term = field.getAnnotation(Term.class).value();
+				final int term = field.getAnnotation(Param.class).value();
 				final String nameMethod = "set" + Character.toUpperCase(field.getName().charAt(0)) + field.getName().substring(1);
 				final Method method = classSetterMethod.get(cl).get(nameMethod);
 
@@ -127,12 +127,12 @@ private void populateObject(final Class<?> cl, final String[] parameters, final
 	 */
 	public String registerClass(final Class<?> cl) throws ObjectNotValidException, IllegalAnnotationException {
 
-		final Annotation annotation = cl.getAnnotation(Predicate.class);
+		final Annotation annotation = cl.getAnnotation(Id.class);
 
 		if (annotation == null)
 			throw new IllegalAnnotationException();
 
-		final String predicate = ((Predicate) annotation).value();
+		final String predicate = ((Id) annotation).value();
 
 		if (predicate.contains(" "))
 			throw new ObjectNotValidException();
@@ -149,12 +149,12 @@ public String registerClass(final Class<?> cl) throws ObjectNotValidException, I
 
 	public void unregisterClass(final Class<?> cl) throws IllegalAnnotationException  {
 
-		final Annotation annotation = cl.getAnnotation(Predicate.class);
+		final Annotation annotation = cl.getAnnotation(Id.class);
 
 		if (annotation == null)
 			throw new IllegalAnnotationException();
 
-		final String predicate = ((Predicate) annotation).value();
+		final String predicate = ((Id) annotation).value();
 
 		predicateClass.remove(predicate);
 		classSetterMethod.remove(cl);

diff --git a/.../it/unical/mat/embasp/languages/Term.java → ...it/unical/mat/embasp/languages/Param.java b/.../it/unical/mat/embasp/languages/Term.java → ...it/unical/mat/embasp/languages/Param.java
@@ -7,6 +7,6 @@
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Term {
+public @interface Param {
 	int value();
 }
diff --git a/app/src/test/java/it/unical/mat/embasp/language/asp/Arity0.java b/app/src/test/java/it/unical/mat/embasp/language/asp/Arity0.java
@@ -1,8 +1,8 @@
 package it.unical.mat.embasp.language.asp;
 
-import it.unical.mat.embasp.languages.Predicate;
+import it.unical.mat.embasp.languages.Id;
 
-@Predicate("a")
+@Id("a")
 public class Arity0 {
 
 	@Override

diff --git a/app/src/test/java/it/unical/mat/embasp/specializations/dlv/Cell.java b/app/src/test/java/it/unical/mat/embasp/specializations/dlv/Cell.java
@@ -1,15 +1,15 @@
 package it.unical.mat.embasp.specializations.dlv;
 
-import it.unical.mat.embasp.languages.Predicate;
-import it.unical.mat.embasp.languages.Term;
+import it.unical.mat.embasp.languages.Id;
+import it.unical.mat.embasp.languages.Param;
 
-@Predicate("cell")
+@Id("cell")
 public class Cell {
-	@Term(0)
+	@Param(0)
 	private int row;
-	@Term(1)
+	@Param(1)
 	private int column;
-	@Term(2)
+	@Param(2)
 	private int value;
 
 	public Cell() {

diff --git a/app/src/test/java/it/unical/mat/embasp/specializations/solver_planning_domains/PickUp.java b/app/src/test/java/it/unical/mat/embasp/specializations/solver_planning_domains/PickUp.java
@@ -3,13 +3,13 @@
  */
 package it.unical.mat.embasp.specializations.solver_planning_domains;
 
-import it.unical.mat.embasp.languages.Predicate;
-import it.unical.mat.embasp.languages.Term;
+import it.unical.mat.embasp.languages.Id;
+import it.unical.mat.embasp.languages.Param;
 
-@Predicate("pick-up")
+@Id("pick-up")
 public class PickUp {
 
-	@Term(0)
+	@Param(0)
 	private String block;
 
 	/**