Revision 47198 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureQueryOrder.java
DefaultFeatureQueryOrder.java | ||
---|---|---|
32 | 32 |
import javax.json.JsonObject; |
33 | 33 |
import javax.json.JsonValue; |
34 | 34 |
import org.apache.commons.lang3.StringUtils; |
35 |
import org.apache.commons.lang3.builder.ToStringBuilder; |
|
35 | 36 |
import org.gvsig.expressionevaluator.Expression; |
36 | 37 |
import org.gvsig.expressionevaluator.ExpressionEvaluator; |
37 | 38 |
import org.gvsig.fmap.dal.exception.DataEvaluatorRuntimeException; |
... | ... | |
45 | 46 |
import org.gvsig.tools.evaluator.Evaluator; |
46 | 47 |
import org.gvsig.tools.evaluator.EvaluatorData; |
47 | 48 |
import org.gvsig.tools.evaluator.EvaluatorException; |
48 |
import org.gvsig.tools.persistence.Persistent; |
|
49 | 49 |
import org.gvsig.tools.persistence.PersistentState; |
50 | 50 |
import org.gvsig.tools.persistence.exception.PersistenceException; |
51 | 51 |
import org.slf4j.LoggerFactory; |
... | ... | |
83 | 83 |
|
84 | 84 |
@Override |
85 | 85 |
public String toString() { |
86 |
if (this.evaluator != null) { |
|
87 |
return this.evaluator.getSQL() + " " + (this.ascending ? "ASC" : "DESC"); |
|
86 |
try { |
|
87 |
ToStringBuilder builder = new ToStringBuilder(this); |
|
88 |
if( evaluator==null ) { |
|
89 |
builder.append("attributeName", this.attributeName); |
|
90 |
} else { |
|
91 |
builder.append("evaluator", this.evaluator.getSQL()); |
|
92 |
} |
|
93 |
builder.append("ascending", this.ascending ? "ASC" : "DESC"); |
|
94 |
return builder.toString(); |
|
95 |
} catch (Exception e) { |
|
96 |
return super.toString(); |
|
88 | 97 |
} |
89 |
return (this.ascending ? "+" : "-") + this.attributeName;
|
|
90 |
} |
|
98 |
}
|
|
99 |
|
|
91 | 100 |
|
92 | 101 |
public boolean hasEvaluator() { |
93 | 102 |
return this.evaluator != null; |
... | ... | |
177 | 186 |
this.members = theMembers; |
178 | 187 |
} |
179 | 188 |
|
180 |
@Override |
|
181 |
public String toString() { |
|
182 |
StringBuilder builder = new StringBuilder(); |
|
183 |
boolean needComma = false; |
|
184 |
for (FeatureQueryOrderMember member : members) { |
|
185 |
if (member != null && !StringUtils.isBlank(member.getAttributeName())) { |
|
186 |
if (needComma) { |
|
187 |
builder.append(","); |
|
188 |
} |
|
189 |
builder.append(member.toString()); |
|
190 |
needComma = true; |
|
191 |
} |
|
192 |
} |
|
193 |
String s = builder.toString(); |
|
194 |
if (StringUtils.isBlank(s)) { |
|
195 |
return null; |
|
196 |
} |
|
197 |
return s; |
|
198 |
} |
|
199 |
|
|
200 | 189 |
public Object add(String order) { |
201 | 190 |
if (StringUtils.isEmpty(order)) { |
202 | 191 |
return null; |
... | ... | |
515 | 504 |
state.add("members", members); |
516 | 505 |
return state; |
517 | 506 |
} |
518 |
|
|
507 |
|
|
508 |
@Override |
|
509 |
public String toString() { |
|
510 |
try { |
|
511 |
ToStringBuilder builder = new ToStringBuilder(this); |
|
512 |
builder.append("members", this.members, true); |
|
513 |
return builder.toString(); |
|
514 |
} catch (Exception e) { |
|
515 |
return super.toString(); |
|
516 |
} |
|
517 |
} |
|
519 | 518 |
} |
Also available in: Unified diff