Skip to content

Commit dc161cd

Browse files
committed
Code cosmetic
1 parent 2a7d794 commit dc161cd

File tree

3 files changed

+41
-42
lines changed

3 files changed

+41
-42
lines changed

MPChartLib/src/main/java/com/github/mikephil/charting/data/CandleDataSet.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,19 @@ protected void calcMinMax(CandleEntry e) {
116116
}
117117

118118
@Override
119-
protected void calcMinMaxY(CandleEntry e) {
119+
protected void calcMinMaxY(CandleEntry entry) {
120120

121-
if (e.getHigh() < mYMin)
122-
mYMin = e.getHigh();
121+
if (entry.getHigh() < mYMin)
122+
mYMin = entry.getHigh();
123123

124-
if (e.getHigh() > mYMax)
125-
mYMax = e.getHigh();
124+
if (entry.getHigh() > mYMax)
125+
mYMax = entry.getHigh();
126126

127-
if (e.getLow() < mYMin)
128-
mYMin = e.getLow();
127+
if (entry.getLow() < mYMin)
128+
mYMin = entry.getLow();
129129

130-
if (e.getLow() > mYMax)
131-
mYMax = e.getLow();
130+
if (entry.getLow() > mYMax)
131+
mYMax = entry.getLow();
132132
}
133133

134134
/**

MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -95,32 +95,31 @@ public void calcMinMaxY(float fromX, float toX) {
9595
/**
9696
* Updates the min and max x and y value of this DataSet based on the given Entry.
9797
*/
98-
protected void calcMinMax(T e) {
98+
protected void calcMinMax(T entry) {
9999

100-
if (e == null)
100+
if (entry == null)
101101
return;
102102

103-
calcMinMaxX(e);
104-
105-
calcMinMaxY(e);
103+
calcMinMaxX(entry);
104+
calcMinMaxY(entry);
106105
}
107106

108-
protected void calcMinMaxX(T e) {
107+
protected void calcMinMaxX(T entry) {
109108

110-
if (e.getX() < mXMin)
111-
mXMin = e.getX();
109+
if (entry.getX() < mXMin)
110+
mXMin = entry.getX();
112111

113-
if (e.getX() > mXMax)
114-
mXMax = e.getX();
112+
if (entry.getX() > mXMax)
113+
mXMax = entry.getX();
115114
}
116115

117-
protected void calcMinMaxY(T e) {
116+
protected void calcMinMaxY(T entry) {
118117

119-
if (e.getY() < mYMin)
120-
mYMin = e.getY();
118+
if (entry.getY() < mYMin)
119+
mYMin = entry.getY();
121120

122-
if (e.getY() > mYMax)
123-
mYMax = e.getY();
121+
if (entry.getY() > mYMax)
122+
mYMax = entry.getY();
124123
}
125124

126125
@Override
@@ -212,22 +211,22 @@ public float getXMax() {
212211
}
213212

214213
@Override
215-
public void addEntryOrdered(T e) {
214+
public void addEntryOrdered(T entry) {
216215

217-
if (e == null)
216+
if (entry == null)
218217
return;
219218

220219
if (mEntries == null) {
221220
mEntries = new ArrayList<>();
222221
}
223222

224-
calcMinMax(e);
223+
calcMinMax(entry);
225224

226-
if (!mEntries.isEmpty() && mEntries.get(mEntries.size() - 1).getX() > e.getX()) {
227-
int closestIndex = getEntryIndex(e.getX(), e.getY(), Rounding.UP);
228-
mEntries.add(closestIndex, e);
225+
if (!mEntries.isEmpty() && mEntries.get(mEntries.size() - 1).getX() > entry.getX()) {
226+
int closestIndex = getEntryIndex(entry.getX(), entry.getY(), Rounding.UP);
227+
mEntries.add(closestIndex, entry);
229228
} else {
230-
mEntries.add(e);
229+
mEntries.add(entry);
231230
}
232231
}
233232

@@ -238,33 +237,33 @@ public void clear() {
238237
}
239238

240239
@Override
241-
public boolean addEntry(T e) {
240+
public boolean addEntry(T entry) {
242241

243-
if (e == null)
242+
if (entry == null)
244243
return false;
245244

246245
List<T> values = getEntries();
247246
if (values == null) {
248247
values = new ArrayList<>();
249248
}
250249

251-
calcMinMax(e);
250+
calcMinMax(entry);
252251

253252
// add the entry
254-
return values.add(e);
253+
return values.add(entry);
255254
}
256255

257256
@Override
258-
public boolean removeEntry(T e) {
257+
public boolean removeEntry(T entry) {
259258

260-
if (e == null)
259+
if (entry == null)
261260
return false;
262261

263262
if (mEntries == null)
264263
return false;
265264

266265
// remove the entry
267-
boolean removed = mEntries.remove(e);
266+
boolean removed = mEntries.remove(entry);
268267

269268
if (removed) {
270269
calcMinMax();

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public interface IDataSet<T extends Entry> {
117117
* Returns -1 if doesn't exist.
118118
*
119119
*/
120-
int getEntryIndex(T e);
120+
int getEntryIndex(T entry);
121121

122122

123123
/**
@@ -136,7 +136,7 @@ public interface IDataSet<T extends Entry> {
136136
* values of the DataSet and the value-sum.
137137
*
138138
*/
139-
boolean addEntry(T e);
139+
boolean addEntry(T entry);
140140

141141

142142
/**
@@ -146,7 +146,7 @@ public interface IDataSet<T extends Entry> {
146146
* values of the DataSet and the value-sum.
147147
*
148148
*/
149-
void addEntryOrdered(T e);
149+
void addEntryOrdered(T entry);
150150

151151
/**
152152
* Removes the first Entry (at index 0) of this DataSet from the entries array.
@@ -169,7 +169,7 @@ public interface IDataSet<T extends Entry> {
169169
* be removed.
170170
*
171171
*/
172-
boolean removeEntry(T e);
172+
boolean removeEntry(T entry);
173173

174174
/**
175175
* Removes the Entry object closest to the given x-value from the DataSet.

0 commit comments

Comments
 (0)