Revision 44340 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultExpression.java
| DefaultExpression.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.expressionevaluator.impl; |
| 2 | 2 |
|
| 3 | 3 |
import java.net.URI; |
| 4 |
import java.net.URL; |
|
| 4 | 5 |
import java.util.ArrayList; |
| 5 | 6 |
import java.util.Iterator; |
| 6 | 7 |
import java.util.List; |
| ... | ... | |
| 236 | 237 |
state.set("userScript_language", this.userScript.getTypeName());
|
| 237 | 238 |
} |
| 238 | 239 |
if (this.scripts != null && !this.scripts.isEmpty()) {
|
| 239 |
List<URI> l = new ArrayList<>();
|
|
| 240 |
List<URL> l = new ArrayList<>();
|
|
| 240 | 241 |
for (Script script : this.scripts) {
|
| 241 |
URI location = script.getURI();
|
|
| 242 |
URL location = script.getURL();
|
|
| 242 | 243 |
if (location != null) {
|
| 243 | 244 |
l.add(location); |
| 244 | 245 |
} |
| ... | ... | |
| 294 | 295 |
definition.addDynFieldString("userScript_code").setMandatory(false);
|
| 295 | 296 |
definition.addDynFieldString("userScript_language").setMandatory(false);
|
| 296 | 297 |
definition.addDynFieldList("scripts")
|
| 297 |
.setClassOfItems(URI.class)
|
|
| 298 |
.setClassOfItems(URL.class)
|
|
| 298 | 299 |
.setMandatory(false); |
| 299 | 300 |
} |
| 300 | 301 |
} |
| ... | ... | |
| 314 | 315 |
if (this.scripts != null && !this.scripts.isEmpty()) {
|
| 315 | 316 |
JSONArray scriptsJson = new JSONArray(); |
| 316 | 317 |
for (Script script : this.scripts) {
|
| 317 |
scriptsJson.put(script.getURI());
|
|
| 318 |
scriptsJson.put(script.getURL());
|
|
| 318 | 319 |
} |
| 319 | 320 |
expressionJson.put("scripts", scriptsJson);
|
| 320 | 321 |
} |
Also available in: Unified diff