/ - Diff - Application: gvSIG desktop - gvSIG

                 public Object parse(GMLHandler.Handler arg, GeometryFactory gf) throws SAXException {
                     Object exterior = arg.children.get(0);
                     Object interior = null;
                     if(arg.children.size() > 1){
                     if(arg.children.size() > 1){ //FIXME: Ver si se est? cogiendo solo un agujero
                         interior = arg.children.get(1);
+                    }
                     return new ImmutablePair(exterior, interior);

     		 * @throws SAXException
     		 */
     		public Object create(GeometryFactory gf) throws SAXException {
                         System.out.println("create "+this.strategy.getClass().getSimpleName());
     //                    System.out.println("create "+this.strategy.getClass().getSimpleName());
                         return strategy.parse(this, gf);
+    		}
+    	}
-...
     	 */
     	public void endElement(String uri, String localName, String qName)
     			throws SAXException {
                 System.out.println("endElement: "+localName +" , "+qName);
     //            System.out.println("endElement: "+localName +" , "+qName);
     		Handler thisAction = (Handler) stack.pop();
     		((Handler) stack.peek()).keep(thisAction.create(gf));
+    	}
-...
     	 */
     	public void startElement(String uri, String localName, String qName,
     			Attributes attributes) throws SAXException {
                 System.out.println("startElement: "+localName +" , "+qName);
     //            System.out.println("startElement: "+localName +" , "+qName);
     		// create a handler
     		ParseStrategy ps = GeometryStrategies.findStrategy(uri, localName);
     		if (ps == null) {

     import java.nio.charset.Charset;
     import java.util.List;
     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.io.IOUtils;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.crs.CRSFactory;
     import org.gvsig.fmap.dal.store.gml.virtualrows.GfsFile;
     import org.gvsig.fmap.dal.store.gml.virtualrows.XMLFileAsList;
     import org.gvsig.fmap.dal.store.simplereader.SimpleReaderStoreParameters;
-...
                 gfs.save(gfsFile);
+            }
             this.gml = new XMLFileAsList(
                     gmlFile,
                     gmlIdx,
                     Charset.forName(SimpleReaderStoreParameters.getCharset(theParameters)),
                     gfs.getBaseElementPath(),
                     gfs.getGeometryElementPaths(),
                     gfs.getPropertiesPaths()
             );
             this.gml = null;
             this.columns = -1;
             this.header = null;
             this.parameters = theParameters;
+        }
         private XMLFileAsList getGml(){
             if(this.gml == null){
                 this.gml = (XMLFileAsList) this.getVirtualRows(SimpleTaskStatus.FAKE_STATUS);
+            }
             return this.gml;
+        }
         @Override
         public String[] getHeader() throws IOException {
             if (this.header == null) {
                 String[] theHeader = new String[gfs.size()];
                 List<String> geoms = gfs.getGeometryElementPaths();
                 String[] theHeader = new String[gfs.size()+(geoms==null?0:geoms.size())];
                 int i = 0;
                 for (GfsFile.PropertyDefn item : gfs) {
                     theHeader[i++] = item.getName();
+                }
                 if(geoms != null) {
                     List<String> srss = gfs.getGeometryElementSrss();
                     for (int j = 0; j < geoms.size(); j++) {
                         IProjection srs = CRSFactory.getCRS(srss.get(j));
                         if(srs == null){
                             theHeader[i++] = FilenameUtils.getBaseName(geoms.get(j));
                         } else {
                             theHeader[i++] = FilenameUtils.getBaseName(geoms.get(j))+"/Geometry/set/srs="+srs.getAbrev().replace(":", "@");
+                        }
+                    }
+                }
                 this.header = theHeader;
+            }
             return this.header;
-...
+        }
         public List<String> read(int rowNumber) throws IOException {
             if (rowNumber < gml.size()) {
                 List<String> values = gml.get(rowNumber);
             if (rowNumber < this.getGml().size64()) {
                 List<String> values = this.getGml().get64(rowNumber);
                 return values;
+            }
             return null;
-...
         @Override
         public void close() throws IOException {
             this.gml.close();
             IOUtils.closeQuietly(this.gml);
             this.gml = null;
             this.gfs = null;
+        }
-...
         @Override
         public List<String> skip(int lines) throws IOException {
             this.currentElement += lines;
             if (this.currentElement > this.gml.size()) {
             if (this.currentElement > this.getGml().size64()) {
                 return null;
+            }
             return read(this.currentElement);
-...
         @Override
         public int getLine() {
             if (this.gml == null) {
             if (this.getGml() == null) {
                 return 0;
+            }
             return this.currentElement;
-...
+        }
         @Override
         public GetItemWithSize64<List<String>>  getVirtualRows(SimpleTaskStatus status) {
             return this.gml;
         public GetItemWithSize64<List<String>> getVirtualRows(SimpleTaskStatus status) {
             try {
                 File gmlFile = this.parameters.getFile();
                 File gmlIdx = new File(FilenameUtils.removeExtension(gmlFile.getAbsolutePath()) + ".gmlidx");
                 XMLFileAsList x = new XMLFileAsList(
                     gmlFile,
                     gmlIdx,
                     Charset.forName(SimpleReaderStoreParameters.getCharset(this.parameters)),
                     gfs.getBaseElementPath(),
                     gfs.getGeometryElementPaths(),
                     gfs.getPropertiesPaths()
                 );
                 return x;
             } catch (IOException ex) {
                 throw new RuntimeException("Can't get virtual rows", ex);
+            }
+        }
+    }

         private DataTypeDetector dataTypeDetector;
         private boolean isAttr;
         private String ns;
         private String srs;
         protected XMLAttributeInfoImpl(Locale locale) {
             this.path = null;
-...
         public boolean isAttr() {
             return this.isAttr;
+        }
         public void setSrs(String value) {
             this.srs = value;
+        }
         public String getSrs() {
             return srs;
+        }
+    }

                             xmlinfo.addTag(info);
+                        }
                         XMLAttributeInfoImpl parentinfo = null;
                         if( path.size()>1 ) {
                             List<String> parentpath = path.subList(0, path.size()-1);
                             String parentpath_s = StringUtils.join(parentpath, "/");
                             XMLAttributeInfoImpl parentinfo = xmlinfo.getTag(parentpath_s);
                             parentinfo = xmlinfo.getTag(parentpath_s);
                             parentinfo.incrChildCount(localName);
                             parentinfo.setLastChildID(localName, idvalue);
+                        }
-...
                                 infoChild.setIsAttr(true);
                                 xmlinfo.addTag(infoChild);
+                            }
                             if(StringUtils.equalsIgnoreCase(name, "srsName")){
                                 infoChild.setSrs(value);
                                 if(parentinfo != null){
                                     parentinfo.setSrs(value);
+                                }
+                            }
                             info.incrChildCount(infoChild.getName());
                             info.setLastChildID(infoChild.getName(), idvalueChild);
                             infoChild.addValue(value);

     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.fmap.dal.store.gml.virtualrows.GfsFile.PropertyDefn;
     import org.gvsig.fmap.dal.store.gml.virtualrows.xmlinfo.XMLAttributeInfoImpl;
     import org.gvsig.fmap.dal.store.gml.virtualrows.xmlinfo.XMLInfoImpl;
     import org.gvsig.fmap.dal.store.gml.virtualrows.GfsFile.PropertyDefn;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.DataTypes;
     import org.gvsig.tools.dataTypes.DataTypesManager;
-...
         private String baseElementPath;
         private Map<String, PropertyDefn> properties;
         private int gmlVersion;
         private List<String> geometryElementSrss;
         public String getName() {
             return name;
-...
             this.name = name;
+        }
         public List<String> getGeometryElementSrss() {
             return geometryElementSrss;
+        }
         public List<String> getGeometryElementPaths() {
             return geometryElementPaths;
+        }
-...
             this.geometryElementPaths.add(geometryElementPath);
+        }
         public void addGeometryElementSrs(String geometryElementSrs) {
             if(StringUtils.isBlank(geometryElementSrs)){
                 return;
+            }
             if(this.geometryElementSrss == null){
                 this.geometryElementSrss = new ArrayList<>();
+            }
             if(StringUtils.equalsIgnoreCase("null", geometryElementSrs)){
                 this.geometryElementSrss.add(null);
             } else {
                 this.geometryElementSrss.add(geometryElementSrs);
+            }
+        }
         public String getBaseElementPath() {
             return baseElementPath;
+        }
-...
             return possibleMemberPath;
+        }
         private List<String> findGeometryElementSrss(XMLInfoImpl xmlinfo, List<String> elementPaths) {
             List<String> result = new ArrayList<>();
             for (String elementPath : elementPaths) {
                 XMLAttributeInfoImpl x = xmlinfo.getTag(elementPath);
                 if(x==null){
                     result.add(null);
                 } else {
                     result.add(x.getSrs());
+                }
+            }
             return result;
+        }
         private List<String> findGeometryElementPaths(XMLInfoImpl xmlinfo) {
             List<String> result = new ArrayList<>();
             List<String> paths = new ArrayList<>();
-...
+                    }
                     if (p != null) {
                         result.add(p);
     //                    tag.setSrs(nextTag.getSrs());
+                    }
+                }
+            }
-...
                 for (String geometryElementPath : getGeometryElementPaths()) {
                     builder.append("    <GeometryElementPath>"+geometryElementPath+"</GeometryElementPath>\n");
+                }
                 for (String geometryElementSrs : getGeometryElementSrss()) {
                     builder.append("    <GeometryElementSrs>"+geometryElementSrs+"</GeometryElementSrs>\n");
+                }
                 for (PropertyDefn property : properties.values()) {
                     int type = property.getType();
                     String propertyType = datatypesManager.getTypeName(type);
-...
                 this.baseElementPath = findBaseElementPath(xmlinfo);
                 this.geometryElementPaths = findGeometryElementPaths(xmlinfo);
                 this.geometryElementSrss = findGeometryElementSrss(xmlinfo,this.geometryElementPaths);
                 removeBaseInGeometryPaths();
-...
                             } else if(StringUtils.equals(localName, "GeometryElementPath")){
                                 String value = this.chars.toString();
                                 addGeometryElementPath(value);
                             } else if(StringUtils.equals(localName, "GeometryElementSrs")){
                                 String value = this.chars.toString();
                                 addGeometryElementSrs(value);
+                            }
+                        }

             SimpleReader reader = new GMLReader(in, parameters);
             return reader;
+        }
         @Override
         protected String[] getHeaders(SimpleReader reader) throws RuntimeException, IOException {
             String[] headers = super.getHeaders(reader);
             if(headers == null){
                 headers = ((GMLReader)reader).getHeader();
+            }
             return headers;
+        }
+    }

Application: gvSIG desktop

Revision 47646