Skip to content

Commit 1b38691

Browse files
GoPlanGoPlan
committed
- Refactoring
1 parent a71a4ec commit 1b38691

25 files changed

+247
-729
lines changed

‎cldeplus/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ set(FOUNDATION_SOURCE
3232
Data/Type/UInt64.cpp
3333
Data/Type/VarChar.cpp
3434
Data/Helper/TimeBasedHelper.cpp
35+
Data/Helper/ValueEnumsHelper.cpp
3536
# Cell.cpp
36-
# Column.cpp
37+
EntityColumn.cpp
3738
# Entity.cpp
3839
# EntityMap.cpp
3940
# EntityProxy.cpp

‎cldeplus/Cell.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
#define CLOUD_E_CPLUS_FOUNDATION_CELL_H
2121

2222
#include "CldePlus-Portable.h"
23-
#include "Column.h"
23+
#include "EntityColumn.h"
2424
#include "Data/Value.h"
2525
#include "Data/Primitive.h"
2626

‎cldeplus/CldePlus-Commons.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ limitations under the License.
2121

2222
namespace CLDEPlus {
2323

24+
enum CommonBufferSize {
25+
ONE = 1,
26+
TWO = 2,
27+
EIGHT = 8,
28+
SIXTEEN = 16,
29+
THIRTYTWO = 32,
30+
SIXTYFOUR = 64,
31+
EIGHTY = 80,
32+
ONEHUNDREDTWENTYEIGHT = 128,
33+
TWOHUNDREDFIFTYSIX = 256,
34+
};
35+
2436
struct IComparable {
2537
virtual bool LessThan(IComparable const &target) const = 0;
2638
virtual bool GreaterThan(IComparable const &target) const = 0;

‎cldeplus/Column.cpp‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎cldeplus/Column.h‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎cldeplus/Data/Helper/ValueEnumsHelper.cpp‎

Lines changed: 93 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -19,104 +19,102 @@ limitations under the License.
1919
#include "ValueEnumsHelper.h"
2020

2121
namespace CLDEPlus {
22-
namespace Foundation {
23-
namespace Data {
24-
namespace Helper {
25-
26-
string ValueEnumsHelper::CopyCategoryToString(const ValueCategory &category) {
27-
28-
string result;
29-
30-
switch (category) {
31-
case ValueCategory::Numeric:
32-
result = "Numeric";
33-
break;
34-
case ValueCategory::CharacterBased:
35-
result = "CharacterBased";
36-
break;
37-
case ValueCategory::UserDefined:
38-
result = "UserDefined";
39-
break;
40-
case ValueCategory::Mathematic:
41-
result = "Mathematic";
42-
break;
43-
case ValueCategory::DateTime:
44-
result = "DateTime";
45-
break;
46-
}
47-
48-
return result;
22+
namespace Data {
23+
namespace Helper {
24+
25+
string ValueEnumsHelper::CopyCategoryToString(const ValueCategory &category) {
26+
27+
string result;
28+
29+
switch (category) {
30+
case ValueCategory::Numeric:
31+
result = "Numeric";
32+
break;
33+
case ValueCategory::CharacterBased:
34+
result = "CharacterBased";
35+
break;
36+
case ValueCategory::UserDefined:
37+
result = "UserDefined";
38+
break;
39+
case ValueCategory::Mathematic:
40+
result = "Mathematic";
41+
break;
42+
case ValueCategory::DateTime:
43+
result = "DateTime";
44+
break;
4945
}
5046

51-
string ValueEnumsHelper::CopyValueTypeToString(const ValueType &type) {
52-
53-
string result;
54-
55-
switch (type) {
56-
case ValueType::Blob:
57-
result = "Blob";
58-
break;
59-
case ValueType::Boolean:
60-
result = "Boolean";
61-
break;
62-
case ValueType::Byte:
63-
result = "Byte";
64-
break;
65-
case ValueType::Int16:
66-
result = "Int16";
67-
break;
68-
case ValueType::Int32:
69-
result = "Int32";
70-
break;
71-
case ValueType::Int64:
72-
result = "Int64";
73-
break;
74-
case ValueType::UInt16:
75-
result = "UInt16";
76-
break;
77-
case ValueType::UInt32:
78-
result = "UInt32";
79-
break;
80-
case ValueType::UInt64:
81-
result = "UInt64";
82-
break;
83-
case ValueType::Double:
84-
result = "Double";
85-
break;
86-
case ValueType::Float:
87-
result = "Float";
88-
break;
89-
case ValueType::String:
90-
result = "String";
91-
break;
92-
case ValueType::VarChar:
93-
result = "VarChar";
94-
break;
95-
case ValueType::Text:
96-
result = "Text";
97-
break;
98-
case ValueType::Currency:
99-
result = "Currency";
100-
break;
101-
case ValueType::Date:
102-
result = "Date";
103-
break;
104-
case ValueType::Time:
105-
result = "Time";
106-
break;
107-
case ValueType::DateTime:
108-
result = "DateTime";
109-
break;
110-
case ValueType::Point:
111-
result = "Point";
112-
break;
113-
case ValueType::Matrix:
114-
result = "Matrix";
115-
break;
116-
}
117-
118-
return result;
47+
return result;
48+
}
49+
50+
string ValueEnumsHelper::CopyValueTypeToString(const ValueType &type) {
51+
52+
string result;
53+
54+
switch (type) {
55+
case ValueType::Blob:
56+
result = "Blob";
57+
break;
58+
case ValueType::Boolean:
59+
result = "Boolean";
60+
break;
61+
case ValueType::Byte:
62+
result = "Byte";
63+
break;
64+
case ValueType::Int16:
65+
result = "Int16";
66+
break;
67+
case ValueType::Int32:
68+
result = "Int32";
69+
break;
70+
case ValueType::Int64:
71+
result = "Int64";
72+
break;
73+
case ValueType::UInt16:
74+
result = "UInt16";
75+
break;
76+
case ValueType::UInt32:
77+
result = "UInt32";
78+
break;
79+
case ValueType::UInt64:
80+
result = "UInt64";
81+
break;
82+
case ValueType::Double:
83+
result = "Double";
84+
break;
85+
case ValueType::Float:
86+
result = "Float";
87+
break;
88+
case ValueType::String:
89+
result = "String";
90+
break;
91+
case ValueType::VarChar:
92+
result = "VarChar";
93+
break;
94+
case ValueType::Text:
95+
result = "Text";
96+
break;
97+
case ValueType::Currency:
98+
result = "Currency";
99+
break;
100+
case ValueType::Date:
101+
result = "Date";
102+
break;
103+
case ValueType::Time:
104+
result = "Time";
105+
break;
106+
case ValueType::DateTime:
107+
result = "DateTime";
108+
break;
109+
case ValueType::Point:
110+
result = "Point";
111+
break;
112+
case ValueType::Matrix:
113+
result = "Matrix";
114+
break;
119115
}
116+
117+
return result;
120118
}
121119
}
122120
}

‎cldeplus/Data/Helper/ValueEnumsHelper.h‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,21 @@ limitations under the License.
1616
1717
*/
1818

19-
#ifndef CLDEPLUS_FOUNDATION_DATA_HELPER_TYPEHELPER_H
20-
#define CLDEPLUS_FOUNDATION_DATA_HELPER_TYPEHELPER_H
19+
#ifndef CLDEPLUS_DATA_HELPER_VALUEENUMSHELPER_H
20+
#define CLDEPLUS_DATA_HELPER_VALUEENUMSHELPER_H
2121

22-
#include "Portable.h"
23-
#include "../ValueEnums.h"
22+
#include "../../Value.h"
2423

2524
namespace CLDEPlus {
26-
namespace Foundation {
27-
namespace Data {
28-
namespace Helper {
29-
struct ValueEnumsHelper {
30-
static string CopyCategoryToString(const ValueCategory &category);
31-
static string CopyValueTypeToString(const ValueType &type);
32-
};
33-
}
25+
namespace Data {
26+
namespace Helper {
27+
struct ValueEnumsHelper {
28+
static string CopyCategoryToString(ValueCategory const &category);
29+
static string CopyValueTypeToString(ValueType const &type);
30+
};
3431
}
3532
}
3633
}
3734

3835

39-
#endif //CLDEPLUS_FOUNDATION_DATA_HELPER_TYPEHELPER_H
36+
#endif //CLDEPLUS_DATA_HELPER_VALUEENUMSHELPER_H

0 commit comments

Comments
 (0)