creating another enum from constants

src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj

@@ -367,7 +367,7 @@ void  UpdateQuery(Metadata la) : {  }
 {
 
 	{
-  		astq.setResultForm(ASTQuery.QT_UPDATE);
+  		astq.setResultForm(ASTQuery.ResultForm.QT_UPDATE);
   		astq.set(astu);
   		astu.defProlog();
   	}	
@@ -797,7 +797,7 @@ Exp SelectQuery(Metadata la) : { Exp stack; }
   stack = WhereClause()
   SolutionModifier()  
   {
-    astq.setResultForm(ASTQuery.QT_SELECT);
+    astq.setResultForm(ASTQuery.ResultForm.QT_SELECT);
     return stack; 
   }
 }
@@ -864,7 +864,7 @@ Exp DescribeQuery(Metadata la) : { Exp stack; Variable v; String s; Atom at;}
   ( LOOKAHEAD(2) stack = WhereClause() )?
   SolutionModifier()  
   { 
-    astq.setResultForm(ASTQuery.QT_DESCRIBE);
+    astq.setResultForm(ASTQuery.ResultForm.QT_DESCRIBE);
     astq.setAnnotation(la);	
     return stack; 
   }
@@ -878,7 +878,7 @@ Exp AskQuery(Metadata la) : { Exp stack; Values values;}
   (values = Values()  {astq.setValues(values); } ) ?
 
   {
-  	astq.setResultForm(ASTQuery.QT_ASK);
+  	astq.setResultForm(ASTQuery.ResultForm.QT_ASK);
         astq.setAnnotation(la);	
   	return stack;
   }
@@ -891,7 +891,7 @@ Exp DeleteQuery() : { Exp stack; }
 	stack = WhereClause()
 	{ 
 		astq.setDelete(true);
-		astq.setResultForm(ASTQuery.QT_DELETE);
+		astq.setResultForm(ASTQuery.ResultForm.QT_DELETE);
 		return stack; 
 	}
 }

src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java

@@ -78,13 +78,9 @@ public class ASTQuery
     static final String NL = "\n";
     static int nbt = 0; // to generate an unique id for a triple if needed
     static int nbbnode = 0; // createBlankNode()
-    public final static int QT_SELECT = 0;
-    public final static int QT_ASK = 1;
-    public final static int QT_CONSTRUCT = 2;
-    public final static int QT_DESCRIBE = 3;
-    public final static int QT_DELETE = 4;
-    public final static int QT_UPDATE = 5;
-    public final static int QT_TEMPLATE = 6;
+
+    public enum ResultForm { QT_SELECT, QT_ASK, QT_CONSTRUCT, QT_DESCRIBE, QT_DELETE, QT_UPDATE, QT_TEMPLATE }
+
     public final static int L_PATH = 2;
     public final static int L_LIST = 1;
     public final static int L_DEFAULT = 0;
@@ -159,7 +155,7 @@ public class ASTQuery
     int nbtriple = 0; // rdf*
     int nbd = 0; // to generate an unique id for a variable if needed
     int nbfun = 0, nbvar = 0;
-    int resultForm = QT_SELECT;
+    ResultForm resultForm = ResultForm.QT_SELECT;
     private int priority = 100;
     int countVar = 0;
     // if more, reject 2 times worse projection than best one
@@ -1926,11 +1922,11 @@ public void setOffset(int offset) {
         Offset = offset;
     }
 
-    public int getResultForm() {
+    public ResultForm getResultForm() {
         return resultForm;
     }
 
-    public void setResultForm(int resultForm) {
+    public void setResultForm(ResultForm resultForm) {
         this.resultForm = resultForm;
     }
 
@@ -2013,7 +2009,7 @@ public Variable newBlankNode(Exp exp, String label) {
 
 
     public void setDescribe(Atom at) {
-        setResultForm(QT_DESCRIBE);
+        setResultForm(ResultForm.QT_DESCRIBE);
         for (Atom aa : adescribe) {
             if (aa.getLabel().equals(at.getLabel())) {
                 return;
@@ -2242,20 +2238,20 @@ boolean checkTripleList(Exp body) {
     }
 
     public void setConstruct(Exp constructExp) {
-        this.setResultForm(QT_CONSTRUCT);
+        this.setResultForm(ResultForm.QT_CONSTRUCT);
         this.constructExp = constructExp;
     }
 
     public void setDelete(boolean b) {
         if (b) {
-            setResultForm(QT_DELETE);
+            setResultForm(ResultForm.QT_DELETE);
             isDelete = b;
         }
     }
 
     public void setInsert(boolean b) {
         if (b) {
-            setResultForm(ASTQuery.QT_CONSTRUCT);
+            setResultForm(ResultForm.QT_CONSTRUCT);
             setAdd(true);
         }
     }
@@ -2627,7 +2623,7 @@ void setReverse(List<Boolean> list) {
 
     public void setAsk(boolean b) {
         if (b) {
-            setResultForm(QT_ASK);
+            setResultForm(ResultForm.QT_ASK);
         }
     }
 
@@ -2640,26 +2636,26 @@ public boolean isTemplate() {
     }
 
     public boolean isDescribe() {
-        return (getResultForm() == QT_DESCRIBE);
+        return (getResultForm() == ResultForm.QT_DESCRIBE);
     }
 
     public boolean isAsk() {
-        return (getResultForm() == QT_ASK);
+        return (getResultForm() == ResultForm.QT_ASK);
     }
 
     @Override
     public boolean isConstruct() {
-        return (getResultForm() == QT_CONSTRUCT);
+        return (getResultForm() == ResultForm.QT_CONSTRUCT);
     }
 
     @Override
     public boolean isSelect() {
-        return (getResultForm() == QT_SELECT);
+        return (getResultForm() == ResultForm.QT_SELECT);
     }
 
     @Override
     public boolean isUpdate() {
-        return (getResultForm() == QT_UPDATE);
+        return (getResultForm() == ResultForm.QT_UPDATE);
     }
 
     @Override
@@ -2725,7 +2721,7 @@ public HashMap<String, Expression> getSelectFunctions() {
     }
 
     public void set(ASTUpdate u) {
-        setResultForm(ASTQuery.QT_UPDATE);
+        setResultForm(ResultForm.QT_UPDATE);
         astu = u;
         u.set(this);
     }

src/test/java/fr/inria/corese/core/next/query/impl/sparql/bridge/CoreseAstQueryBuilderLegacyExecutionTest.java

@@ -235,7 +235,7 @@ private static void rejectUnsupportedQueryShape(fr.inria.corese.core.next.query.
 
         private static ASTQuery selectAst() {
             ASTQuery ast = ASTQuery.create();
-            ast.setResultForm(ASTQuery.QT_SELECT);
+            ast.setResultForm(ASTQuery.ResultForm.QT_SELECT);
             ast.setSelectAll(true);
             return ast;
         }