partial_revert_38386.patch

Francisco Puga, 06/12/2012 05:40 PM

Download (3.13 KB)

View differences:

applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/LegendManager.java (working copy)
121 121 
	private boolean isTreeListenerDisabled;
122 122 
	private JButton btnSaveLegend;
123 123 
	private JButton btnLoadLegend;
124 
	private Hashtable<FLayer, ? extends ILegend> table = null;
124 
	private Hashtable<FLayer, ILegend> table = null;
125 125 
	private boolean empty = true;
126 126 
	private JLabel iconLabel;
127 127 

  		




  ......




  789
  789
  
    
		}

  		




  790
  790
  
    
	}

  		




  791
  791
  
    

  		




  792
  
  
    
	private void applyRestOfLegends(

  		




  793
  
  
    
			Hashtable<FLayer, ? extends ILegend> table2, FLayers layers) {

  		




  
  792
  
    
	private void applyRestOfLegends(Hashtable<FLayer, ILegend> table2,FLayers layers) {

  		




  794
  793
  
    

  		




  795
  794
  
    
		for(int i = 0; i < layers.getLayersCount(); i++) {

  		




  796
  795
  
    
			FLayer my_layer= layers.getLayer(i);

  		












  

    
      libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/gvl/FMapGVLDriver.java	(working copy)
    
  





  53
  53
  
    
		return FILE_EXTENSION;


  		




  54
  54
  
    
	}


  		




  55
  55
  
    

  		




  56
  
  
    
	public Hashtable<FLayer, IVectorLegend> read(FLayers layers,


  		




  57
  
  
    
			FLayer layer, File file) throws LegendDriverException {


  		




  
  56
  
    
	public Hashtable read(FLayers layers,FLayer layer, File file) throws LegendDriverException {


  		




  58
  57
  
    

  		




  59
  
  
    
		Hashtable<FLayer, IVectorLegend> table = new Hashtable<FLayer, IVectorLegend>();


  		




  
  58
  
    
		Hashtable table = new Hashtable();


  		




  60
  59
  
    
		File xmlFile = new File(file.getAbsolutePath());


  		




  61
  60
  
    
		FileReader reader = null;


  		




  62
  61
  
    

  		




  ......




  64
  63
  
    
			reader = new FileReader(xmlFile);


  		




  65
  64
  
    

  		




  66
  65
  
    
			XmlTag tag = (XmlTag) XmlTag.unmarshal(reader);


  		




  67
  
  
    
			IVectorLegend myLegend = LegendFactory.createFromXML(new XMLEntity(


  		




  68
  
  
    
					tag));


  		




  
  66
  
    
			ILegend myLegend = LegendFactory.createFromXML(new XMLEntity(tag));


  		




  69
  67
  
    

  		




  70
  68
  
    
			if(myLegend != null ) {


  		




  71
  69
  
    
				//CAPA DE LINEAS


  		












  

    
      libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/legend/IFMapLegendDriver.java	(working copy)
    
  





  24
  24
  
    
	


  		




  25
  25
  
    
	void write(FLayers layers, FLayer layer, ILegend legend, File file, String version) throws LegendDriverException;


  		




  26
  26
  
    
	


  		




  27
  
  
    
	Hashtable<FLayer, ? extends ILegend> read(FLayers layers, FLayer layer,


  		




  28
  
  
    
			File file) throws LegendDriverException;


  		




  
  27
  
    
	Hashtable<FLayer, ILegend> read(FLayers layers, FLayer layer, File file) throws LegendDriverException;


  		




  29
  28
  
    
}