/ - Diff - Application: gvSIG desktop - gvSIG

Revision 14885

     import com.iver.cit.gvsig.graph.core.GraphException;
     import com.iver.cit.gvsig.graph.core.GvFlag;
     import com.iver.cit.gvsig.graph.core.Network;
     import com.iver.cit.gvsig.graph.solvers.Route;
     import com.iver.cit.gvsig.project.documents.view.gui.View;
     import com.iver.utiles.GenericFileFilter;
-...
+    	}
     	public GvFlag getSelectedEvent(){
     		if(this.tableEvents.getSelectedRowCount()>0)
     		if(this.tableEvents.getSelectedRowCount()>0 && this.tableEvents.getRowCount()>0)
     		 return this.cfc.getEvent(Integer.parseInt(String.valueOf(this.events.getValueAt(this.tableEvents.getSelectedRow(), 0))));
     		else
     			return null;
-...
+    				}
+    			}
     			else if(source==this.buttonEventsRemove){
     				if(this.tableEvents.getSelectedRowCount()>0){
     				if(this.tableEvents.getSelectedRowCount()>0 && this.tableEvents.getRowCount()>0){
     					GvFlag flag=this.getSelectedEvent();
     					if(flag!=null){
     						this.cfc.removeEvent(flag);
-...
     			// TODO Auto-generated method stub
     			switch(columnIndex){
     			case 0:
     				GvFlag flag=this.cfc.getEvent(Integer.parseInt(String.valueOf(this.getValueAt(rowIndex, columnIndex))));
     				if(flag!=null){
+    				}
     				break;
     			case 1:
     				this.cfc.getEvent(Integer.parseInt(String.valueOf(this.getValueAt(rowIndex, columnIndex)))).setDescription(String.valueOf(aValue));
     				this.cfc.getEvent(Integer.parseInt(String.valueOf(this.getValueAt(rowIndex, 0)))).setDescription(String.valueOf(aValue));
     				break;
+    			}
+    		}
-...
     		public Object getValueAt(int rowIndex, int columnIndex) {
     			// TODO Auto-generated method stub
     			try{
     				GvFlag flag = this.cfc.getSolvedFacility(rowIndex);
     			try{
     				switch(columnIndex){
     					case 0:
     						return Integer.valueOf(flag.getIdFlag());
     						GvFlag flag1 = this.cfc.getSolvedFacility(rowIndex);
     						return Integer.valueOf(flag1.getIdFlag());
     					case 1:
     						return flag.getDescription();
     						GvFlag flag2 = this.cfc.getSolvedFacility(rowIndex);
     						return flag2.getDescription();
     					case 2:
     						return Double.valueOf(flag.getCost());
     						Route route=this.cfc.getSolvedRoute(rowIndex);
     						return Double.valueOf(route.getCost());
     					default:
     						return null;
+    				}

     	private ArrayList closestFacilitiesListeners;
     	private FLyrVect layerFacilities;
     	private boolean onlySelectedFacilities;
     	private GvFlag[] events;
     	public ClosestFacilityController(Network network, MapControl mpCtrl){
     		this.network=network;
-...
     		this.maxFacilitiesNumber=0;
     		this.toolMaxFacilitiesNumber=15;
     		this.toEvent=true;
     		this.solvedFacilities=new ArrayList();
     		this.solvedFacilities=new ArrayList(this.toolMaxFacilitiesNumber);
     		this.solvedRoutes=new ArrayList();
     		this.closestFacilitiesListeners=new ArrayList();
     		this.layerFacilities=null;
-...
     		GvFlag flag=null;
     		int rejectedFacilities=0;
     		int incrementIdFlag=0;
     		int fieldDescriptionIndex=-1;
     		if(this.getSourceEvent()!=null){
     			incrementIdFlag=this.getSourceEvent().getIdFlag()+1;
+    		}
     		double realTol = this.mpCtrl.getViewPort().toMapDistance(FlagListener.pixelTolerance);
     		SelectableDataSource ds=layerFacilities.getRecordset();
     		FieldDescription[] fieldDesc=ds.getFieldsDescription();
     		if(fieldDesc!=null){
     			for (int i = 0; i < fieldDesc.length && fieldDescriptionIndex == -1; i++) {
     				if(fieldDesc[i].getFieldName().equalsIgnoreCase("descript") && fieldDesc[i].getFieldType()==Types.VARCHAR){
     					fieldDescriptionIndex=i;
+    				}
+    			}
+    		}
     		if(onlySelectedFacilities){
     			BitSet selection=layerFacilities.getRecordset().getSelection();
     			for(int i=selection.nextSetBit(0), j=0; i>=0; i=selection.nextSetBit(i+1), j++) {
     				flag=this.createFlagFromGeometry(layerFacilities.getSource().getShape(i).toJTSGeometry(), realTol);
     				if(flag==null) rejectedFacilities++;
     				else{
     					if(fieldDescriptionIndex>=0 && fieldDescriptionIndex<fieldDesc.length){
     						Value[] values=ds.getRow(i);
     						if(values[fieldDescriptionIndex] instanceof StringValue){
     							flag.setDescription(((StringValue)values[fieldDescriptionIndex]).toString());
+    						}
+    					}
     					flag.setIdFlag(i+incrementIdFlag);
     					this.addFacility(flag);
+    				}
-...
     				flag=this.createFlagFromGeometry(layerFacilities.getSource().getShape(i).toJTSGeometry(), realTol);
     				if(flag==null) rejectedFacilities++;
     				else{
     					if(fieldDescriptionIndex>=0 && fieldDescriptionIndex<fieldDesc.length){
     						Value[] values=ds.getRow(i);
     						if(values[fieldDescriptionIndex] instanceof StringValue){
     							flag.setDescription(((StringValue)values[fieldDescriptionIndex]).toString());
+    						}
+    					}
     					flag.setIdFlag(i+incrementIdFlag);
     					this.addFacility(flag);
+    				}
-...
     		if(!added){
     			this.solvedRoutes.add(this.solvedRoutes.size(), route);
     			this.solvedFacilities.add(this.solvedFacilities.size(), flag);
     			this.addSolvedFacility(this.solvedFacilities.size(), flag);
+    		}
+    	}
     	private void addSolvedFacility(int index, GvFlag flag){
     		if(this.solvedFacilities.get(flag.getIdFlag())==null){
     			this.solvedFacilities.add(index, flag);
     			this.informListeners(SOLVEDFACILITY_ADDED, flag, null);
+    		}
     		this.solvedFacilities.add(index, flag);
     		this.informListeners(SOLVEDFACILITY_ADDED, flag, null);
+    	}
     	public GvFlag getSolvedFacility(int index){
-...
+    		}
+    	}
     	private GvFlag[] getNetworkEvents(Network network) {
     		return network.getFlags();
+    	}
     	private void restoreNetworkEvents(Network network, GvFlag[] events){
     		for (int i = 0; i < events.length; i++) {
     			network.addFlag(events[i]);
+    		}
+    	}
     	public void solve() throws GraphException, ReadDriverException{
     		this.network.removeFlagListener(this);
     		this.events=this.getNetworkEvents(this.network);
     		this.network.removeFlags();
     		this.removeSolvedFacilities();
     		int rejectedFacilities=this.loadFacilitiesFromLayer(layerFacilities, this.getOnlySelectedFacilities());
-...
+    				}
+    			}
+    		}
     		this.network.removeFlags();
     		this.restoreNetworkEvents(this.network, this.events);
     		this.network.addFlagListener(this);
+    	}
+    }

Also available in: Unified diff