Refact

src/main/java/fr/soleil/bensikin/actions/context/AbsRefreshAction.java

@@ -171,19 +171,19 @@ public abstract class AbsRefreshAction extends BensikinAction {
         Condition cond;
 
         cond = getCondition(source.getSelectId().getSelectedItem(), source.getTextId().getText(),
-                SnapConst.TAB_SNAP[0]);
+                SnapConst.ID_SNAP);
         ret.addCondition(cond);
 
         cond = getCondition(source.getSelectStartTime().getSelectedItem(), source.getTextStartTime().getText(),
-                SnapConst.TAB_SNAP[2]);
+               SnapConst.time);
         ret.addCondition(cond);
 
         cond = getCondition(source.getSelectEndTime().getSelectedItem(), source.getTextEndTime().getText(),
-                SnapConst.TAB_SNAP[2]);
+               SnapConst.time);
         ret.addCondition(cond);
 
         cond = getCondition(source.getSelectComment().getSelectedItem(), source.getTextComment().getText(),
-                SnapConst.TAB_SNAP[3]);
+                SnapConst.snap_comment);
         ret.addCondition(cond);
 
         return ret;

src/main/java/fr/soleil/bensikin/actions/context/MatchContextAttributesAction.java

@@ -177,16 +177,16 @@ public class MatchContextAttributesAction extends BensikinAction {
             // attribute level)
         }
 
-        cond = new Condition(SnapConst.TAB_DEF[4], SnapConst.OP_EQUALS, domain);
+        cond = new Condition(SnapConst.domain, SnapConst.OP_EQUALS, domain);
         ret.addCondition(cond);
 
-        cond = new Condition(SnapConst.TAB_DEF[5], SnapConst.OP_EQUALS, family);
+        cond = new Condition(SnapConst.family, SnapConst.OP_EQUALS, family);
         ret.addCondition(cond);
 
-        cond = new Condition(SnapConst.TAB_DEF[6], SnapConst.OP_EQUALS, member);
+        cond = new Condition(SnapConst.member, SnapConst.OP_EQUALS, member);
         ret.addCondition(cond);
 
-        cond = new Condition(SnapConst.TAB_DEF[7], SnapConst.OP_EQUALS, attribute);
+		cond = new Condition(SnapConst.attName, SnapConst.OP_EQUALS, attribute);
         ret.addCondition(cond);
 
         return ret;

src/main/java/fr/soleil/bensikin/actions/context/SearchContextsAction.java

@@ -166,7 +166,7 @@ public class SearchContextsAction extends BensikinAction {
         final Criterions ret = new Criterions();
         Condition cond;
 
-        cond = getCondition(source.selectId.getSelectedItem(), source.textId.getText(), SnapConst.TAB_CONTEXT[0]);
+        cond = getCondition(source.selectId.getSelectedItem(), source.textId.getText(), SnapConst.ID_CONTEXT);
         ret.addCondition(cond);
 
         cond = getCondition(source.selectStartTime.getSelectedItem(), source.textStartTime.getText(),
@@ -177,7 +177,7 @@ public class SearchContextsAction extends BensikinAction {
                 SnapConst.TAB_CONTEXT[1]);
         ret.addCondition(cond);
 
-        cond = getCondition(source.selectName.getSelectedItem(), source.textName.getText(), SnapConst.TAB_CONTEXT[2]);
+        cond = getCondition(source.selectName.getSelectedItem(), source.textName.getText(), SnapConst.name);
         ret.addCondition(cond);
 
         cond = getCondition(source.selectAuthor.getSelectedItem(), source.textAuthor.getText(),

src/main/java/fr/soleil/bensikin/data/context/Context.java

@@ -182,7 +182,7 @@ public class Context implements Comparable<Context> {
             searchCriterions = new Criterions();
         }
         searchCriterions.addCondition(
-                new Condition(SnapConst.TAB_CONTEXT[0], SnapConst.OP_EQUALS, ObjectUtils.EMPTY_STRING + contextId));
+                new Condition(SnapConst.ID_CONTEXT, SnapConst.OP_EQUALS, ObjectUtils.EMPTY_STRING + contextId));
         final ISnapManager source = SnapManagerFactory.getCurrentImpl();
         final SnapContext cont = getAsSnapContext();
         if (cont.getId() == 0) {

src/main/java/fr/soleil/bensikin/data/context/manager/ContextDataManager.java

@@ -49,7 +49,7 @@ public class ContextDataManager {
     // }
 
     private void loadContextByDb(int contextId) throws SnapshotingException {
-        Condition condition = new Condition(SnapConst.TAB_CONTEXT[0], SnapConst.OP_EQUALS,
+        Condition condition = new Condition(SnapConst.ID_CONTEXT, SnapConst.OP_EQUALS,
                 String.valueOf(contextId));
         Criterions searchCriterions = new Criterions();
         searchCriterions.addCondition(condition);

src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java

@@ -403,7 +403,7 @@ public class Snapshot implements Comparable<Snapshot> {
     public static Snapshot findSnapshotById(final int id) throws SnapshotingException {
         final ISnapManager snapManager = SnapManagerFactory.getCurrentImpl();
 
-        final Condition condition = new Condition(SnapConst.TAB_SNAP[0], "=", String.valueOf(id));
+        final Condition condition = new Condition(SnapConst.ID_SNAP, "=", String.valueOf(id));
         final Criterions searchCriterions = new Criterions();
         searchCriterions.addCondition(condition);
 

src/main/java/fr/soleil/bensikin/history/History.java

@@ -292,7 +292,7 @@ public class History {
         Criterions searchCriterions;
         for (int i = 0; i < openedSnapshotRefs.length; i++) {
             int id = openedSnapshotRefs[i].getId();
-            Condition condition = new Condition(SnapConst.TAB_SNAP[0], "=", String.valueOf(id));
+            Condition condition = new Condition(SnapConst.ID_SNAP, "=", String.valueOf(id));
             searchCriterions = new Criterions();
             searchCriterions.addCondition(condition);
 
@@ -330,7 +330,7 @@ public class History {
 
         for (int i = 0; i < selectedSnapshotRefs.length; i++) {
             int id = selectedSnapshotRefs[i].getId();
-            Condition condition = new Condition(SnapConst.TAB_SNAP[0], "=", String.valueOf(id));
+            Condition condition = new Condition(SnapConst.ID_SNAP, "=", String.valueOf(id));
             searchCriterions = new Criterions();
             searchCriterions.addCondition(condition);