Revision 2718

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/workspace/tables/RemoteChangesTable.java
2 2

  
3 3
import java.util.List;
4 4
import javax.json.JsonObject;
5
import javax.json.JsonString;
6
import javax.json.JsonValue;
5 7
import org.apache.commons.lang3.StringUtils;
6 8
import org.gvsig.fmap.dal.DALLocator;
7 9
import org.gvsig.fmap.dal.DataManager;
8
import org.gvsig.fmap.dal.DataQuery;
9 10
import org.gvsig.fmap.dal.feature.EditableFeatureType;
10 11
import org.gvsig.fmap.dal.feature.Feature;
11 12
import org.gvsig.fmap.dal.feature.FeatureQuery;
......
190 191
                }
191 192
                return f.getString(this.getEntity().getFieldForLabel());
192 193
            }
193
            return this.getDataAsJson().getString(this.getEntity().getFieldForLabel(), null);
194
            JsonValue jsonValue = this.getDataAsJson().get(this.getEntity().getFieldForLabel());
195
            return convertJsonValueToString(jsonValue);
194 196
        }
195 197
        
198
        private static String convertJsonValueToString(JsonValue jsonValue) {
199
            if (jsonValue instanceof JsonString) {
200
                String jsonString = jsonValue.toString();
201
                return jsonString.substring(1, jsonString.length() - 1);
202
            } else {
203
                return jsonValue.toString();
204
            }
205
        }
206
        
196 207
                @Override
197 208
        public String toString() {
198 209
            switch (this.getOperation()) {

Also available in: Unified diff