Revision 44163 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

View differences:

DefaultExpression.java
54 54
    }
55 55

  
56 56
    @Override
57
    public boolean isEmpty() {
58
        if( !StringUtils.isBlank(this.phrase) ) {
59
            return false;
60
        }
61
        if( this.scripts!=null && !this.scripts.isEmpty() ) {
62
            return false;
63
        }
64
        if( !StringUtils.isBlank(this.userScript.getCode()) ) {
65
            return false;
66
        }
67
        return true;
68
    }
69

  
70
    @Override
57 71
    public Script getUserScript() {
58 72
        return this.userScript;
59 73
    }
......
70 84
    }
71 85

  
72 86
    @Override
73
    public void setPhrase(String phrase) {
87
    public Expression setPhrase(String phrase) {
74 88
        this.phrase = phrase;
75 89
        this.code = null;
76 90
        this.hasNotBeenOptimized = true;
91
        return this;
77 92
    }
78 93

  
79 94
    @Override
80
    public void setUserScript(String code, String languaje) {
95
    public Expression setUserScript(String code, String languaje) {
81 96
        if (this.userScript == null) {
82 97
            ScriptManager scriptMananger = ToolsLocator.getScriptManager();
83 98
            this.userScript = scriptMananger.createScript("user", code, languaje);
......
87 102
            ScriptManager scriptMananger = ToolsLocator.getScriptManager();
88 103
            this.userScript = scriptMananger.createScript("user", code, languaje);
89 104
        }
105
        return this;
90 106
    }
91 107

  
92 108
    @Override
93
    public void setUserScript(Script script) {
109
    public Expression setUserScript(Script script) {
94 110
        this.userScript = script;
111
        return this;
95 112
    }
96 113

  
97 114
    @Override
98
    public void setUserScript(String code) {
115
    public Expression setUserScript(String code) {
99 116
        this.setUserScript(code, "python");
117
        return this;
100 118
    }
101 119

  
102 120
    @Override
......
106 124
    }
107 125

  
108 126
    @Override
109
    public void addScript(Script script) {
127
    public Expression addScript(Script script) {
110 128
        if (this.scripts == null) {
111 129
            this.scripts = new ArrayList<>();
112 130
        }
113 131
        this.scripts.add(script);
132
        return this;
114 133
    }
115 134

  
116 135
    @Override

Also available in: Unified diff