Revision 24962 branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/ProjectMapFactory.java

View differences:

ProjectMapFactory.java
12 12 
import javax.swing.JOptionPane;
13 13 

  		




  14
  14
  
    
import org.gvsig.fmap.mapcontrol.MapControl;


  		




  
  15
  
    
import org.gvsig.project.document.table.FeatureTableDocumentFactory;


  		




  15
  16
  
    

  		




  16
  
  
    
import sun.security.jca.GetInstance;


  		




  17
  
  
    

  		




  18
  17
  
    
import com.iver.andami.PluginServices;


  		




  19
  18
  
    
import com.iver.cit.gvsig.AddLayer;


  		




  20
  19
  
    
import com.iver.cit.gvsig.project.Project;


  		




  ......




  24
  23
  
    
import com.iver.cit.gvsig.project.documents.contextMenu.actions.CutDocumentContextMenuAction;


  		




  25
  24
  
    
import com.iver.cit.gvsig.project.documents.contextMenu.actions.PasteDocumentContextMenuAction;


  		




  26
  25
  
    
import com.iver.cit.gvsig.project.documents.layout.gui.Layout;


  		




  27
  
  
    
import com.iver.cit.gvsig.project.documents.layout.tools.LayoutAddViewListenerImpl;


  		




  28
  
  
    
import com.iver.cit.gvsig.project.documents.table.ProjectTableFactory;


  		




  29
  26
  
    
import com.iver.cit.gvsig.project.documents.view.ProjectViewFactory;


  		




  30
  27
  
    
import com.iver.utiles.XMLEntity;


  		




  31
  28
  
    

  		




  ......




  351
  348
  
    
	public boolean resolveImportXMLConflicts(XMLEntity root, Project project, Hashtable conflicts) {


  		




  352
  349
  
    
		XMLEntity xmlMaps = root.firstChild("type",this.getRegisterName());


  		




  353
  350
  
    
		XMLEntity xmlViews = root.firstChild("type",ProjectViewFactory.registerName);


  		




  354
  
  
    
		XMLEntity xmlTables = root.firstChild("type",ProjectTableFactory.registerName);


  		




  
  351
  
    
		XMLEntity xmlTables = root.firstChild("type",FeatureTableDocumentFactory.registerName);


  		




  355
  352
  
    

  		




  356
  353
  
    
		Hashtable mapsConflits = (Hashtable)conflicts.get(ProjectMapFactory.registerName);


  		




  357
  354
  
    

  		




  358
  355
  
    
		Hashtable viewsConflits = (Hashtable)conflicts.get(ProjectViewFactory.registerName);


  		




  359
  356
  
    

  		




  360
  
  
    
		Hashtable tablesConflits = (Hashtable)conflicts.get(ProjectTableFactory.registerName);


  		




  
  357
  
    
		Hashtable tablesConflits = (Hashtable)conflicts.get(FeatureTableDocumentFactory.registerName);


  		




  361
  358
  
    

  		




  362
  359
  
    

  		




  363
  360
  
    
		if (mapsConflits != null && mapsConflits.size() > 0) {


  		












Also available in:  Unified diff