/ - Diff - Application: gvSIG desktop - gvSIG

     import java.util.List;
     import org.apache.commons.lang3.BooleanUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.cresques.cts.IProjection;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.fmap.dal.DALLocator;
-...
         @Override
         public String toString() {
             try {
                 return String.format("%s %x %s", this.getClass().getSimpleName(), this.hashCode(), this.helper.toString());
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("hash", String.format("%x", this.hashCode()));
                 builder.append("helper", this.helper, true);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }

     import java.util.List;
     import java.util.function.Predicate;
     import org.apache.commons.codec.binary.Hex;
     import org.apache.commons.codec.digest.DigestUtils;
     import org.apache.commons.collections.CollectionUtils;
     import org.apache.commons.collections.iterators.ReverseListIterator;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.ArrayUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.apache.commons.lang3.mutable.MutableBoolean;
     import org.apache.commons.lang3.mutable.MutableObject;
     import org.apache.commons.lang3.tuple.ImmutablePair;
-...
         @Override
         public String toString() {
             try {
                 return String.format("%s %x %s", this.getClass().getSimpleName(), this.hashCode(), this.connectionParameters.getUrl());
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("hash", String.format("%x", this.hashCode()));
                 builder.append("url", this.connectionParameters.getUrl());
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }

     package org.gvsig.fmap.dal.feature.spi;
     import java.util.Iterator;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.FeatureQuery;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.gvsig.tools.dispose.impl.AbstractDisposable;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * Base implementation for {@link FeatureSetProvider}s, adding some utility
-...
     public abstract class AbstractFeatureSetProvider extends AbstractDisposable
     		implements FeatureSetProvider {
             protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractFeatureSetProvider.class);
     	private final AbstractFeatureStoreProvider store;
     	private final FeatureQuery query;
     	private final FeatureType featureType;
-...
     			long index, long elements) throws DataException {
                 return createFastIterator(index);
+            }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("store", this.store, true);
                 builder.append("query", this.query, true);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

     import org.apache.commons.io.FileUtils;
     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.cresques.cts.ICRSFactory;
     import org.cresques.cts.IProjection;
     import org.gvsig.expressionevaluator.Expression;
-...
             throw new UnsupportedOperationException();
+        }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("parameters", this.parameters, true);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.apache.commons.lang3.mutable.MutableObject;
     import org.cresques.cts.IProjection;
     import org.gvsig.expressionevaluator.Expression;
-...
         @Override
         public String toString() {
             try {
                 return String.format("%s %x %s", this.getClass().getSimpleName(), this.hashCode(), this.getFullName());
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("provider", this.provider==null? null:this.provider.getProviderName());
                 builder.append("fullname", this.getFullName());
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }

     import javax.json.JsonObject;
     import javax.json.JsonValue;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluator;
     import org.gvsig.fmap.dal.exception.DataEvaluatorRuntimeException;
-...
     import org.gvsig.tools.evaluator.Evaluator;
     import org.gvsig.tools.evaluator.EvaluatorData;
     import org.gvsig.tools.evaluator.EvaluatorException;
     import org.gvsig.tools.persistence.Persistent;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     import org.slf4j.LoggerFactory;
-...
             @Override
             public String toString() {
                 if (this.evaluator != null) {
                     return this.evaluator.getSQL() + " " + (this.ascending ? "ASC" : "DESC");
                 try {
                     ToStringBuilder builder = new ToStringBuilder(this);
                     if( evaluator==null ) {
                         builder.append("attributeName", this.attributeName);
                     } else {
                         builder.append("evaluator", this.evaluator.getSQL());
+                    }
                     builder.append("ascending", this.ascending ? "ASC" : "DESC");
                     return builder.toString();
                 } catch (Exception e) {
                     return super.toString();
+                }
                 return (this.ascending ? "+" : "-") + this.attributeName;
+            }
+            }
             public boolean hasEvaluator() {
                 return this.evaluator != null;
-...
             this.members = theMembers;
+        }
         @Override
         public String toString() {
             StringBuilder builder = new StringBuilder();
             boolean needComma = false;
             for (FeatureQueryOrderMember member : members) {
                 if (member != null && !StringUtils.isBlank(member.getAttributeName())) {
                     if (needComma) {
                         builder.append(",");
+                    }
                     builder.append(member.toString());
                     needComma = true;
+                }
+            }
             String s = builder.toString();
             if (StringUtils.isBlank(s)) {
                 return null;
+            }
             return s;
+        }
         public Object add(String order) {
             if (StringUtils.isEmpty(order)) {
                 return null;
-...
             state.add("members", members);
             return state;
+        }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("members", this.members, true);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

     import java.util.HashSet;
     import java.util.Iterator;
     import java.util.Set;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.dal.DataStoreNotification;
     import org.gvsig.fmap.dal.exception.DataException;
-...
         @Override
         public String toString() {
             return getClass().getName() + ": " + getSelectedCount()
                     + " features selected, reversed = "
                     + this.getData().isReversed() + ", featureIds contained: "
                     + this.getData().getSelected();
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("featureStore", this.featureStore, true);
                 builder.append("SelectedCount", this.getSelectedCount());
                 builder.append("isReversed", this.isReversed());
                 builder.append("featureIdsContained", selectionData==null?0:this.selectionData.getSelected());
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
         protected boolean isReversed() {
             if (this.selectionData == null) {
                 return false;

     import javax.json.JsonObject;
     import org.apache.commons.lang3.ArrayUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluator;
     import org.gvsig.expressionevaluator.ExpressionUtils;
-...
             return state;
+        }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("storeName", this.storeName);
                 builder.append("filter", this.filter, true);
                 builder.append("order", this.order, true);
                 builder.append("limit", this.limit);
                 builder.append("attributeNames", this.attributeNames, true);
                 builder.append("queryParameters", this.queryParameters, true);
                 builder.append("pageSize", this.pageSize);
                 builder.append("useSubquery", this.useSubquery);
                 builder.append("groupByColumns", this.groupByColumns);
                 builder.append("aggregateFunctions", this.aggregateFunctions);
                 builder.append("featureTypeId", this.featureTypeId);
                 builder.append("extraColumn", this.extraColumns);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.fmap.dal.DataStoreNotification;
     import org.gvsig.fmap.dal.exception.DataException;
-...
             return this.featureReferenceSelection.isAvailable();
+        }
         @Override
         public String toString() {
             ToStringBuilder builder = new ToStringBuilder(this);
             builder.append("store", this.featureReferenceSelection.getFeatureStore(), true);
             return builder.toString();
+        }
+    }

     import java.util.List;
     import java.util.ListIterator;
     import java.util.logging.Level;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.apache.commons.lang3.mutable.MutableBoolean;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
+            }
+        }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("evaluators", this.featureStore, true);
                 builder.append("query", this.query, true);
                 builder.append("selectionUp", this.selectionUp);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

     import java.util.Set;
     import javax.json.JsonObject;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.commons.lang3.builder.ToStringBuilder;
     import org.gvsig.expressionevaluator.Code;
     import org.gvsig.expressionevaluator.Code.Callable;
     import org.gvsig.expressionevaluator.SymbolTable;
-...
             state.add("expression", this.expression);
             return state;
+        }
         @Override
         public String toString() {
             try {
                 ToStringBuilder builder = new ToStringBuilder(this);
                 builder.append("storeName", this.storeName);
                 builder.append("expression", this.expression, true);
                 builder.append("symbolTable", this.symbolTable);
                 return builder.toString();
             } catch (Exception e) {
                 return super.toString();
+            }
+        }
+    }

Application: gvSIG desktop

Revision 47198