Revision 14948

View differences:

import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/ProjectView3DFactory.java
196 196 
    public int getPriority() {
197 197 
        return 2;
198 198 
    }
199
200 
    /**
201 
     * Returns the priority of the Document in the ProjectWindow list.
202 
     *
203 
     * @return Priority.
204 
     */
205 
    public int getListPriority() {
206 
        return 1; // so the 3D View appears before other document types
207 
    }
199 208 

  		




  200
  209
  
    
	public boolean resolveImportXMLConflicts(XMLEntity root, Project project, Hashtable conflicts) {


  		




  201
  210
  
    
		Hashtable viewsConflits = (Hashtable)conflicts.get(this.getRegisterName());


  		












Also available in:  Unified diff