diff --git a/src/main/java/fr/soleil/bensikin/actions/context/AbsRefreshAction.java b/src/main/java/fr/soleil/bensikin/actions/context/AbsRefreshAction.java
index ce71aa81db45f54f4da9131f2363509c544efdb7..9e480e406da945a62cc1c0679ff604460fe6beb9 100644
--- a/src/main/java/fr/soleil/bensikin/actions/context/AbsRefreshAction.java
+++ b/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;
diff --git a/src/main/java/fr/soleil/bensikin/actions/context/MatchContextAttributesAction.java b/src/main/java/fr/soleil/bensikin/actions/context/MatchContextAttributesAction.java
index 5ba3d1a77e96a2e07eb94a20cf137409a0c94ade..90a91bc64802d913195161b3b24be5bf9077b37a 100644
--- a/src/main/java/fr/soleil/bensikin/actions/context/MatchContextAttributesAction.java
+++ b/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;
diff --git a/src/main/java/fr/soleil/bensikin/actions/context/SearchContextsAction.java b/src/main/java/fr/soleil/bensikin/actions/context/SearchContextsAction.java
index 6031d476aecfb0afc10b235981c8fcb20674eaa4..99b0382ddad1d7abc7959ada29a83f1cf3f51481 100644
--- a/src/main/java/fr/soleil/bensikin/actions/context/SearchContextsAction.java
+++ b/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(),
diff --git a/src/main/java/fr/soleil/bensikin/data/context/Context.java b/src/main/java/fr/soleil/bensikin/data/context/Context.java
index a3a3bfc004a52e538a03f3d04f343bba4f7fd9aa..9879b14c03b6fc4b246a661adbad6fccccd2d38b 100644
--- a/src/main/java/fr/soleil/bensikin/data/context/Context.java
+++ b/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) {
diff --git a/src/main/java/fr/soleil/bensikin/data/context/manager/ContextDataManager.java b/src/main/java/fr/soleil/bensikin/data/context/manager/ContextDataManager.java
index b1dc109b870ecb6b980ff36cf629a9a1fbc6fc72..8a99ba18c4a736dd477c384ccd1d6fe14bebe8da 100644
--- a/src/main/java/fr/soleil/bensikin/data/context/manager/ContextDataManager.java
+++ b/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);
diff --git a/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java b/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java
index f9ec906144758360c52d979cc3691077b453a6ef..1500cc54cdb359e365fdcd914531da27185697ad 100644
--- a/src/main/java/fr/soleil/bensikin/data/snapshot/Snapshot.java
+++ b/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);
diff --git a/src/main/java/fr/soleil/bensikin/history/History.java b/src/main/java/fr/soleil/bensikin/history/History.java
index 37d89a6128d6ccd564044eae8fda21c20f569f12..921715f3c045aa8e97d78b4f9388d7348d54f0de 100644
--- a/src/main/java/fr/soleil/bensikin/history/History.java
+++ b/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);