/trunk/libraries/libTopology/src/org/gvsig/topology/Topology.java - Diff - Application: gvSIG desktop - gvSIG

Revision 16396 trunk/libraries/libTopology/src/org/gvsig/topology/Topology.java

     import java.util.List;
     import java.util.Map;
     import org.apache.log4j.Logger;
     import org.cresques.cts.IProjection;
     import org.gvsig.topology.topologyrules.MustBeLargerThanClusterTolerance;
-...
     public class Topology extends FLayers implements ITopologyStatus, ITopologyErrorContainer {
     	private static Logger logger = Logger.getLogger(Topology.class.getName());
     	/**
     	 * cluster tolerance of the topology
     	 */
-...
     	 */
     	private ITopologyErrorContainer errorContainer;
     	/**
     	 * List of error fids that has been marked as exceptions
+    	 *
     	 * This allows to have a track of the exceptions.
     	 */
     //	private List<String> topologyErrorExceptions;
     	/**
     	 * Map that relates a FLyrVect of the Topology with its rank (weight when we
-...
     	 * Numerical identifier for rules of a topology
     	 */
     	private int ruleId = 0;
     	/**
     	 * Default constructor for a topology as a FLayers
+    	 *
-...
     		layerRanks = new HashMap<FLyrVect, XYZLayerRank>();
+    	}
     	/**
     	 * Constructor
+    	 *
     	 * @param clusterTolerance
     	 * @param maxNumberOfErrors
     	 * private default constructor. Only used by static method
     	 * create from xml
     	 */
     	public Topology(double clusterTolerance, int maxNumberOfErrors, ITopologyErrorContainer errorContainer) {
     		this(null, null, clusterTolerance, maxNumberOfErrors, errorContainer);
     	private Topology(MapContext mapContext, FLayers layers){
     		this(mapContext, layers, 0d, 1000, new SimpleTopologyErrorContainer());
+    	}
     	/**
     	 * Creates a topology from its XML representation
     	 * @param xmlEntity
     	 * @return
     	 */
     	public static Topology createFromXML(MapContext mapContext, XMLEntity xmlEntity){
     		FLayers rootLyr = mapContext.getLayers();
     		Topology solution = new Topology(mapContext, rootLyr);
     		try {
     			solution.setXMLEntity(xmlEntity);
     		} catch (XMLException e) {
     			logger.error("Error al reconstruir la topologia desde fichero xml", e);
+    		}
     		return solution;
+    	}
     	/**
     	 * Changes the cluster tolerance of the topology
-...
     			this.xyRank = xyRank;
     			this.zRank = zRank;
+    		}
     		XYZLayerRank(){}
     		public String getClassName() {
     			return this.getClass().getName();
-...
     		xml.putProperty("status", status);
     		xml.putProperty("maxNumberOfErrors", maxNumberOfErrors);
     		/*
     		 * podemos tener problemas si los child de Topology no se agrupan l?gicamente.
     		 * (si se cambia el orden de los items en el xml, se perder?a la l?gica).
     		 * FIXME Crear clases internas RuleCollection, ClusterRuleCollection, DirtyZonesCollection
+    		 *
     		 * */
     		int numberOfTopologyRules = rules.size();
     		xml.putProperty("numberOfTopologyRules", numberOfTopologyRules);
     		for(int i = 0; i < numberOfTopologyRules; i++){
-...
     		super.setXMLEntity(xml);
     		//FIXME Cambiar el uso de childrenCount por el empleo de propiedades
     		int childrenCount = 0;
     		int numLayers = this.getLayersCount();
     		int numProperties = this.getExtendedProperties().size();
     		int childrenCount = numLayers + numProperties;
     		if(xml.contains("clusterTolerance"))
+    		{
     			this.clusterTolerance = xml.getDoubleProperty("clusterTolerance");
-...
+    		{
     			int numberOfTopologyRules =   xml.getIntProperty("numberOfTopologyRules");
     			for(int i = 0; i < numberOfTopologyRules; i++){
     				XMLEntity ruleXML = xml.getChild(childrenCount);
     				childrenCount++;
     				XMLEntity ruleXML = xml.getChild(childrenCount++);
     				ITopologyRule rule = TopologyRuleFactory.createFromXML(this, ruleXML);
     				this.rules.add(rule);
+    			}
-...
     		if(xml.contains("numberOfClusterRules")){
     			int numberOfClusterRules = xml.getIntProperty("numberOfClusterRules");
     			for(int i = 0; i < numberOfClusterRules; i++){
     				XMLEntity ruleXML = xml.getChild(childrenCount);
     				childrenCount++;
     				XMLEntity ruleXML = xml.getChild(childrenCount++);
     				MustBeLargerThanClusterTolerance rule = (MustBeLargerThanClusterTolerance)TopologyRuleFactory.createFromXML(this, ruleXML);
     				this.clusterToleranceRules.add(rule);
+    			}
-...
     		if(xml.contains("numberOfDirtyZones")){
     			int numberOfDirtyZones = xml.getIntProperty("numberOfDirtyZones");
     			for(int i = 0; i < numberOfDirtyZones; i++){
     				XMLEntity dirtyZoneXml = xml.getChild(childrenCount);
     				childrenCount++;
     				XMLEntity dirtyZoneXml = xml.getChild(childrenCount++);
     				double x = dirtyZoneXml.getDoubleProperty("extent"+i+"X");
     				double y = dirtyZoneXml.getDoubleProperty("extent"+i+"Y");
     				double w = dirtyZoneXml.getDoubleProperty("extent"+i+"W");
-...
     		XMLEntity errorContainerXML = xml.getChild(childrenCount);
     		XMLEntity errorContainerXML = xml.getChild(childrenCount++);
     		if(errorContainerXML != null)
+    		{
     			this.errorContainer = TopologyPersister.createErrorContainerFromXML(errorContainerXML);
+    		}
     		childrenCount++;
     		Iterator<XYZLayerRank> xyzRankIterator = layerRanks.values().iterator();
     		while(xyzRankIterator.hasNext()){
     			XYZLayerRank layerRank = xyzRankIterator.next();
     			XMLEntity entity = layerRank.getXMLEntity();
     			xml.addChild(entity);
+    		}
     		if(xml.contains("numberOfRanks")){
     			int numberOfRanks = xml.getIntProperty("numberOfRanks");
     			for(int i = 0; i < numberOfRanks; i++){
     				XMLEntity xmlRank = xml.getChild(childrenCount++);
     				XYZLayerRank rank = new XYZLayerRank();
     				rank.setXMLEntity(xmlRank);
+    			}
+    		}
+    	}
     	public int getNumberOfExceptions() {

Also available in: Unified diff