From 113dcef042cbbe9dc42280f592bd136d1d825e27 Mon Sep 17 00:00:00 2001
From: Arnaud Jelmoni <arnaud.jelmoni@keyconsulting.fr>
Date: Mon, 8 Mar 2021 15:06:29 +0000
Subject: [PATCH] Refact
---
.../soleil/bensikin/actions/context/AbsRefreshAction.java | 8 ++++----
.../actions/context/MatchContextAttributesAction.java | 8 ++++----
.../bensikin/actions/context/SearchContextsAction.java | 4 ++--
.../java/fr/soleil/bensikin/data/context/Context.java | 2 +-
.../bensikin/data/context/manager/ContextDataManager.java | 2 +-
.../java/fr/soleil/bensikin/data/snapshot/Snapshot.java | 2 +-
src/main/java/fr/soleil/bensikin/history/History.java | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
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 ce71aa8..9e480e4 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 5ba3d1a..90a91bc 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 6031d47..99b0382 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 a3a3bfc..9879b14 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 b1dc109..8a99ba1 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 f9ec906..1500cc5 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 37d89a6..921715f 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);
--
GitLab