/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 6865

     	public void initialize() {
     		ExtensionPoints extensionPoints = ExtensionPointsSingleton.getInstance();
     		// TOC
     		MyTocMenuEntry copy = new CopyTocMenuEntry();
     		MyTocMenuEntry cut = new CutTocMenuEntry();
-...
         	FPopupMenu.addEntry(cut);
         	FPopupMenu.addEntry(paste);
     		*/
         	// ProjectWindow
         	// ProjectWindow
     		CopyProjectElement copyProjectElement = new CopyProjectElement();
     		CutProjectElement cutProjectElement = new CutProjectElement();
     		PasteProjectElement pasteProjectElementView = new PasteProjectElement();
     		PasteProjectElement pasteProjectElementTable = new PasteProjectElement();
     		PasteProjectElement pasteProjectElementMap = new PasteProjectElement();
     		copyProjectElement.setUtiles(utiles);
     		cutProjectElement.setUtiles(utiles);
     		pasteProjectElementView.setUtiles(utiles);
     		pasteProjectElementTable.setUtiles(utiles);
     		pasteProjectElementMap.setUtiles(utiles);
     		pasteProjectElementView.setType("views");
     		pasteProjectElementTable.setType("tables");
     		pasteProjectElementMap.setType("maps");
     		extensionPoints.add("DocumentActions_View","Copy","Copy selectes documento to system clipboard",copyProjectElement);
     		extensionPoints.add("DocumentActions_View","Cut","Cut selectes documento to system clipboard", cutProjectElement);
     		extensionPoints.add("DocumentActions_View","Paste","Paste views from system clipboard",pasteProjectElementView);
-...
     	public void execute(String actionCommand) {
     		// TODO Auto-generated method stub
+    	}
     	public boolean isEnabled() {
-...
     	public void setUtiles(Utiles utiles) {
     		this.utiles = utiles;
+    	}
     	public String getGroup() {
     		return "ClipboardActions";
+    	}
-...
     	public Object create(Map args) {
     		// TODO Auto-generated method stub
     		return this;
+    	}
     		return this;
+    	}
+    }
-...
     		//return PluginServices.getText(this,"tooltip_copiar_al_portapapeles");
     		return null;
+    	}
     	public int getOrder() {
     		return 0;
+    	}
     	public boolean isVisible(ProjectElement item, ProjectElement[] selectedItems) {
     		return true;
+    	}
     	public boolean isEnabled(ProjectElement item, ProjectElement[] selectedItems) {
     		return selectedItems.length > 0;
+    	}
-...
     					);
     			return;
+    		}
     		String data = this.utiles.marshallXMLEntity(xml);
     		if (data == null) {
     			JOptionPane.showMessageDialog(
-...
     					);
     			return;
+    		}
     		this.utiles.putInClipboard(data);
     		this.utiles.putInClipboard(data);
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "copiar");
+    	}
+    }
     class CutProjectElement extends MyDocumentAction {
-...
     	public int getOrder() {
     		return 1;
+    	}
     	public boolean isVisible(ProjectElement item, ProjectElement[] selectedItems) {
     		return true;
+    	}
     	public boolean isEnabled(ProjectElement item, ProjectElement[] selectedItems) {
     		return selectedItems.length > 0;
+    	}
-...
     					);
     			return;
+    		}
     		String data = this.utiles.marshallXMLEntity(xml);
     		if (data == null) {
     			JOptionPane.showMessageDialog(
-...
     					JOptionPane.ERROR_MESSAGE
     					);
     			return;
+    		}
+    		}
     		this.utiles.putInClipboard(data);
         	int option=JOptionPane.showConfirmDialog((Component)PluginServices.getMainFrame(),PluginServices.getText(this,"desea_borrar_el_documento"));
         	if (option!=JOptionPane.OK_OPTION) {
         		return;
+        	}
     		this.utiles.removeDocuments(selectedItems);
+        	}
     		this.utiles.removeDocuments(selectedItems);
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "cortar");
+    	}
+    }
     class PasteProjectElement extends MyDocumentAction {
     	private String type;
     	public String getDescription() {
     		//FIXME: Falta claves
     		//return PluginServices.getText(this,"tooltip_pegar_desde_el_portapapeles");
-...
     	public int getOrder() {
     		return 2;
+    	}
     	public void setType(String type) {
     		this.type = type;
+    	}
     	public String getType(String type) {
     		return this.type;
+    	}
     	public boolean isVisible(ProjectElement item, ProjectElement[] selectedItems) {
     		return true;
+    	}
     	public boolean isEnabled(ProjectElement item, ProjectElement[] selectedItems) {
     		String sourceString = this.utiles.getFromClipboard();
     		if (sourceString == null) return false;
     		XMLEntity xml = this.utiles.unMarshallXMLEntity(sourceString);
     		if (xml == null) return false;
     		if (!this.utiles.checkXMLRootNode(xml)) return false;
     		if (this.utiles.getXMLEntityChildOfType(xml,this.type) == null) return false;
     		return true;
+    	}
-...
     	public void execute(ProjectElement item, ProjectElement[] selectedItems) {
     		String sourceString = this.utiles.getFromClipboard();
     		if (sourceString == null) return;
     		XMLEntity xml = this.utiles.unMarshallXMLEntity(sourceString);
     		if (xml == null) return;
     		if (!this.utiles.checkXMLRootNode(xml)) return;
     		if (this.type.equals("views")) {
     			this.utiles.loadViewsFromXML(xml);
     		} else if (this.type.equals("tables")) {
     			this.utiles.loadTablesFromXML(xml);
     			this.utiles.loadTablesFromXML(xml);
     		} else if (this.type.equals("maps")) {
     			this.utiles.loadMapsFromXML(xml);
     		} else {
     			//TODO que hacer aqui??
     			return;
+    		}
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "pegar");
+    	}
+    }
     abstract class  MyTocMenuEntry extends AbstractTocContextMenuAction {
     abstract class  MyTocMenuEntry extends AbstractTocContextMenuAction {
     	protected Utiles utiles;
     	public void setUtiles(Utiles utiles) {
     		this.utiles = utiles;
+    	}
-...
     	public int getGroupOrder() {
     		return 60;
+    	}
+    }
     class CopyTocMenuEntry extends MyTocMenuEntry{
     	public int getOrder() {
     		return 0;
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "copiar");
     		return PluginServices.getText(this, "copiar");
+    	}
     	public boolean isEnabled(ITocItem item, FLayer[] selectedItems) {
     		return selectedItems.length >= 1 && isTocItemBranch(item);
     		return selectedItems.length >= 1 && isTocItemBranch(item);
+    	}
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     		XMLEntity xml = this.utiles.generateXMLCopyLayers(selectedItems);
     		if (xml == null) {
     			JOptionPane.showMessageDialog(
-...
     					);
     			return;
+    		}
     		String data = this.utiles.marshallXMLEntity(xml);
     		if (data == null) {
     			JOptionPane.showMessageDialog(
-...
     					);
     			return;
+    		}
     		this.utiles.putInClipboard(data);
     		this.utiles.putInClipboard(data);
+    	}
-...
     	public int getOrder() {
     		return 1;
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "cortar");
     		return PluginServices.getText(this, "cortar");
+    	}
     	public boolean isEnabled(ITocItem item, FLayer[] selectedItems) {
     		return selectedItems.length >= 1 && isTocItemBranch(item);
     		return selectedItems.length >= 1 && isTocItemBranch(item);
+    	}
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     		XMLEntity xml = this.utiles.generateXMLCopyLayers(selectedItems);
     		if (xml == null) {
     			JOptionPane.showMessageDialog(
-...
     					);
     			return;
+    		}
     		String data = this.utiles.marshallXMLEntity(xml);
     		if (data == null) {
     			JOptionPane.showMessageDialog(
-...
     			return;
+    		}
     		this.utiles.putInClipboard(data);
         	int option=JOptionPane.showConfirmDialog((Component)PluginServices.getMainFrame(),PluginServices.getText(this,"desea_borrar_la_capa"));
         	if (option!=JOptionPane.OK_OPTION) {
         		return;
+        	}
     		getMapContext().beginAtomicEvent();
     		boolean isOK =this.utiles.removeLayers(selectedItems);
     		boolean isOK =this.utiles.removeLayers(selectedItems);
     		getMapContext().endAtomicEvent();
     		if (isOK) {
     			getMapContext().invalidate();
     			if (getMapContext().getLayers().getLayersCount()==0) {
-...
     class PasteTocMenuEntry extends MyTocMenuEntry{
     	private XMLEntity xml=null;
     	public int getOrder() {
     		return 2;
+    	}
     	public String getText() {
     		return PluginServices.getText(this, "pegar");
     		return PluginServices.getText(this, "pegar");
+    	}
     	public boolean isEnabled(ITocItem item, FLayer[] selectedItems) {
     		if (isTocItemBranch(item)) {
     			FLayer lyr = getNodeLayer(item);
     			if (lyr instanceof FLayers) {
     				this.xml = this.getCheckedXMLFromClipboard();
     				return true;
     				return true;
+    			}
     		} else if (!isTocItemLeaf(item)) {
     			if (getNodeLayer(item) == null) {
     				this.xml = this.getCheckedXMLFromClipboard();
     				return this.xml != null;
+    			}
+    		}
+    			}
+    		}
     		return false;
+    	}
     	private XMLEntity getCheckedXMLFromClipboard() {
     		String sourceString = this.utiles.getFromClipboard();
     		if (sourceString == null) return null;
     		XMLEntity xml = this.utiles.unMarshallXMLEntity(sourceString);
     		if (xml == null) return null;
     		if (!this.utiles.checkXMLRootNode(xml)) return null;
     		if (this.utiles.getXMLEntityChildOfType(xml,"layers") == null) return null;
     		return  xml;
+    	}
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     	public void execute(ITocItem item, FLayer[] selectedItems) {
     		FLayers root;
     		if (this.xml == null) return;
     		if (isTocItemBranch(item)) {
     			root = (FLayers)getNodeLayer(item);
     		} else if (getNodeLayer(item) == null){
-...
     			return;
+    		}
     		getMapContext().beginAtomicEvent();
     		boolean isOK = this.utiles.loadLayersFromXML(this.xml,root);
     		getMapContext().endAtomicEvent();
     		if (isOK) getMapContext().invalidate();
+    	}
+    }
     class Utiles {
     	/*
+    	 *
     ======================================
      Comportamiento del Pegar documentos:
     ======================================
     ?Pegar vista.
     	Si ya existe una vista en el proyecto con el mismo nombre.
 . Abortar
 . Pedir nuevo nombre.
     			Que hacemos con las tablas asociadas.
     				No se pegan
     	Si alguna de las tablas a pegar de las que van en
     	Si alguna de las tablas a pegar de las que van en
     	el portapapeles ya existen en el proyecto.
 . abortamos
 . Informamos al usuario y no se pegan las tablas.
     Pegar tabla.
     	Si alguna de las tablas existe.
     		Se pega igualmente (apareceran tablas duplicadas)
     Pegar mapa.
     	Si el mapa ya existe en el proyecto.
 . Abortar
-...
 . Abortar
 . Usar la vista que ya existe en el proyecto y no
     		   pegar la nueva vista.
     	Si alguna de las tablas a pegar de las que van en
     		el portapapeles ya existen en el proyecto.
     	Si alguna de las tablas a pegar de las que van en
     		el portapapeles ya existen en el proyecto.
 . abortamos
 . Informamos al usuario y no se pegan las tablas.
     	 */
     	/*
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
     	 * Funciones Publicas para generar XML (copiar)
+    	 *
+    	 *
+    	 *
+    	 *
     	*/
     	/**
     	 * Genera un XMLEntity con la informacion necesaria
     	 * para copiar los elementos de selectedItems en
-...
     	 */
     	public XMLEntity generateXMLCopyDocuments(ProjectElement[] selectedItems) {
     		if (selectedItems.length == 0) return null;
     		if (selectedItems[0] instanceof ProjectView) {
     			ProjectView[] views = new ProjectView[selectedItems.length];
     			System.arraycopy(selectedItems,0,views,0,selectedItems.length);
     			return this.generateXMLCopyViews(views);
     			return this.generateXMLCopyViews(views);
     		} else if (selectedItems[0] instanceof ProjectMap) {
     			ProjectMap[] maps = new ProjectMap[selectedItems.length];
     			System.arraycopy(selectedItems,0,maps,0,selectedItems.length);
-...
     		} else if (selectedItems[0] instanceof ProjectTable) {
     			ProjectTable[] tables = new ProjectTable[selectedItems.length];
     			System.arraycopy(selectedItems,0,tables,0,selectedItems.length);
     			return this.generateXMLCopyTables(tables);
     			return this.generateXMLCopyTables(tables);
     		} else {
     			//FIXME:????
     			return null;
+    		}
+    	}
     	public XMLEntity generateXMLCopyViews(ProjectView[] selectedItems) {
     		XMLEntity xml = this.newRootNode();
     		XMLEntity xmlTables = this.newTablesNode();
     		XMLEntity xmlDataSources = this.newDataSourcesNode();
     		XMLEntity xmlViews = this.newViewsNode();
     		for (int i=0;i < selectedItems.length; i++) {
     			if (!this.addToXMLView(selectedItems[i],xmlViews,xmlTables,xmlDataSources)) return null;
+    		}
     		if (xmlDataSources.getNumChild() > 0) {
     		if (xmlDataSources.getChildrenCount() > 0) {
     			xml.addChild(xmlDataSources);
+    		}
     		if (xmlViews.getNumChild() > 0) {
+    		}
     		if (xmlViews.getChildrenCount() > 0) {
     			xml.addChild(xmlViews);
+    		}
     		if (xmlTables.getNumChild() > 0) {
     		if (xmlTables.getChildrenCount() > 0) {
     			xml.addChild(xmlTables);
+    		}
     		return xml;
+    	}
     	public XMLEntity generateXMLCopyMaps(ProjectMap[] selectedItems) {
     		XMLEntity xml = this.newRootNode();
     		XMLEntity xmlTables = this.newTablesNode();
     		XMLEntity xmlDataSources = this.newDataSourcesNode();
     		XMLEntity xmlViews = this.newViewsNode();
-...
     		for (int i=0;i < selectedItems.length; i++) {
     			if (!this.addToXMLMap(selectedItems[i],xmlMaps,xmlViews,xmlTables,xmlDataSources)) return null;
+    		}
     		if (xmlDataSources.getNumChild() > 0) {
     		if (xmlDataSources.getChildrenCount() > 0) {
     			xml.addChild(xmlDataSources);
+    		}
     		if (xmlViews.getNumChild() > 0) {
+    		}
     		if (xmlViews.getChildrenCount() > 0) {
     			xml.addChild(xmlViews);
+    		}
     		if (xmlTables.getNumChild() > 0) {
     		if (xmlTables.getChildrenCount() > 0) {
     			xml.addChild(xmlTables);
+    		}
     		if (xmlMaps.getNumChild() > 0) {
     		if (xmlMaps.getChildrenCount() > 0) {
     			xml.addChild(xmlMaps);
+    		}
     		return xml;
     		return xml;
+    	}
     	public XMLEntity generateXMLCopyTables(ProjectTable[] selectedItems) {
     		XMLEntity xml = this.newRootNode();
     		XMLEntity xmlTables = this.newTablesNode();
     		XMLEntity xmlDataSources = this.newDataSourcesNode();
     		for (int i=0;i < selectedItems.length; i++) {
     			if (!this.addToXMLTable(selectedItems[i],xmlTables,xmlDataSources,null)) return null;
+    		}
     		if (xmlDataSources.getNumChild() > 0) {
     		if (xmlDataSources.getChildrenCount() > 0) {
     			xml.addChild(xmlDataSources);
+    		}
     		if (xmlTables.getNumChild() > 0) {
+    		}
     		if (xmlTables.getChildrenCount() > 0) {
     			xml.addChild(xmlTables);
+    		}
     		return xml;
     		return xml;
+    	}
     	public XMLEntity generateXMLCopyLayers(FLayer[] actives) {
     		XMLEntity xml = this.newRootNode();
     		XMLEntity xmlLayers = this.newLayersNode();
     		XMLEntity xmlTables = this.newTablesNode();
     		XMLEntity xmlDataSources = this.newDataSourcesNode();
     		for (int i=0;i < actives.length; i++) {
     			if (!this.addToXMLLayer(actives[i],xmlLayers ,xmlTables,xmlDataSources)) return null;
+    		}
     		if (xmlDataSources.getNumChild() > 0) {
     		if (xmlDataSources.getChildrenCount() > 0) {
     			xml.addChild(xmlDataSources);
+    		}
     		if (xmlLayers.getNumChild() > 0) {
+    		}
     		if (xmlLayers.getChildrenCount() > 0) {
     			xml.addChild(xmlLayers);
+    		}
     		if (xmlTables.getNumChild() > 0) {
     		if (xmlTables.getChildrenCount() > 0) {
     			xml.addChild(xmlTables);
+    		}
     		return xml;
+    	}
     	/*
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
     	 * Funciones Publicas de carga de un XML (pegar)
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
+    	 *
     	*/
     	public boolean loadLayersFromXML(XMLEntity xml, FLayers root) {
     		XMLEntity xmlLayers = this.getXMLEntityChildOfType(xml,"layers");
     		XMLEntity xmlTables = this.getXMLEntityChildOfType(xml,"tables");
     		XMLEntity xmlDataSources = this.getXMLEntityChildOfType(xml,"dataSources");
     		if (xmlLayers == null ) return false;
     		// Se pegan las tablas igualmente
     		// Se pegan las tablas igualmente
     		/*
     		Project project = this.getProject();
     		Hashtable tablesConfits = this.getConflicts(xmlTables,project.getTables());
     		*/
     		if (xmlDataSources != null)  {
     			if (!this.registerDataSources(xmlDataSources)) return false;
+    		}
     		if (!this.addLayers(xmlLayers,root)) return false;
     		if (xmlTables != null)  {
     			if (!this.addTables(xmlTables)) return false;
+    		}
     		return true;
+    	}
     	public boolean loadViewsFromXML(XMLEntity xml) {
     		XMLEntity xmlViews = this.getXMLEntityChildOfType(xml,"views");
     		XMLEntity xmlTables = this.getXMLEntityChildOfType(xml,"tables");
     		XMLEntity xmlDataSources = this.getXMLEntityChildOfType(xml,"dataSources");
     		if (xmlViews == null ) return false;
     		Project project = this.getProject();
     		Hashtable viewsConflits = this.getConflicts(xmlViews,project.getViews());
     		Hashtable tablesConflits = this.getConflicts(xmlTables,project.getTables());
     		if (viewsConflits != null && viewsConflits.size() > 0) {
     			int option = JOptionPane.showConfirmDialog(
     					(Component)PluginServices.getMainFrame(),
-...
     					JOptionPane.showMessageDialog(
     							(Component)PluginServices.getMainFrame(),
     							"<html>"+
     								PluginServices.getText(this,"operacion_cancelada") +":<br>" +
     								PluginServices.getText(this,"operacion_cancelada") +":<br>" +
     								PluginServices.getText(this,"nombre_no_valido")+
     							"</html>",//Mensaje
     							PluginServices.getText(this,"pegar_vistas"),//FIXME: getText
-...
     					return false;
+    				}
     				view.setName(newName);
+    			}
+    			}
     			if (xmlTables != null) xmlTables.removeAllChilds();
     			tablesConflits = null;
+    		}
     		if (tablesConflits != null && tablesConflits.size() > 0) {
     			int option = JOptionPane.showConfirmDialog(
     					(Component)PluginServices.getMainFrame(),
-...
     			if (option != JOptionPane.YES_OPTION) {
     				return false;
+    			}
     			xmlTables.removeAllChilds();
     			xmlTables.removeAllChilds();
+    		}
     		if (xmlDataSources != null)  {
     			if (!this.registerDataSources(xmlDataSources)) return false;
+    		}
     		if (!this.addViews(xmlViews)) return false;
     		if (xmlTables != null)  {
     			if (!this.addTables(xmlTables)) return false;
+    		}
-...
     	public boolean loadTablesFromXML(XMLEntity xml) {
     		XMLEntity xmlTables = this.getXMLEntityChildOfType(xml,"tables");
     		XMLEntity xmlDataSources = this.getXMLEntityChildOfType(xml,"dataSources");
     		if (xmlTables == null ) return false;
     		/*
     		Project project = this.getProject();
     		Hashtable tablesConfits = this.getConflicts(xmlTables,project.getTables());
     		*/
     		if (xmlDataSources != null)  {
     			if (!this.registerDataSources(xmlDataSources)) return false;
+    		}
     		return this.addTables(xmlTables);
+    	}
     	public boolean loadMapsFromXML(XMLEntity xml) {
     		XMLEntity xmlMaps = this.getXMLEntityChildOfType(xml,"Maps");
     		XMLEntity xmlViews = this.getXMLEntityChildOfType(xml,"views");
     		XMLEntity xmlTables = this.getXMLEntityChildOfType(xml,"tables");
     		XMLEntity xmlDataSources = this.getXMLEntityChildOfType(xml,"dataSources");
     		if (xmlMaps == null ) return false;
     		Project project = this.getProject();
     		Hashtable mapsConflits = this.getConflicts(xmlMaps,project.getMaps());
     		Hashtable viewsConflits = this.getConflicts(xmlViews,project.getViews());
     		Hashtable tablesConflits = this.getConflicts(xmlTables,project.getTables());
     		if (mapsConflits != null && mapsConflits.size() > 0) {
     			int option = JOptionPane.showConfirmDialog(
     					(Component)PluginServices.getMainFrame(),
-...
     					JOptionPane.showMessageDialog(
     							(Component)PluginServices.getMainFrame(),
     							"<html>"+
     								PluginServices.getText(this,"operacion_cancelada") +":<br>" +
     								PluginServices.getText(this,"operacion_cancelada") +":<br>" +
     								PluginServices.getText(this,"nombre_no_valido")+
     							"</html>",//Mensaje
     							"</html>",//Mensaje
     							PluginServices.getText(this,"pegar_mapas"),//titulo
     							JOptionPane.ERROR_MESSAGE
     							);
     					return false;
+    				}
     				map.setName(newName);
+    			}
+    			}
+    		}
     		if (viewsConflits != null && viewsConflits.size() > 0) {
     			int option = JOptionPane.showConfirmDialog(
     					(Component)PluginServices.getMainFrame(),
     					"<html>"+
     						PluginServices.getText(this,"conflicto_de_nombres_de_vistas_al_pegar") + "<br>" +
     						PluginServices.getText(this,"conflicto_de_nombres_de_vistas_al_pegar") + "<br>" +
     						PluginServices.getText(this,"no_se_pegaran_las_vistas_del_conflicto") + "<br>" +
     						PluginServices.getText(this,"desea_continuar") +
     					"</html>",
-...
     				return false;
+    			}
     			// Eliminamos las vistas del xml que no vamos a importar
     			// Esto me devuelve los indices en orden inverso
     			int[] indexes = this.getIndexOfConflict(viewsConflits);
     			for (int i=0;i < indexes.length;i++) {
     				xmlViews.removeChild(indexes[i]);
+    			}
     			viewsConflits = null;
     			viewsConflits = null;
+    		}
     		if (tablesConflits != null && tablesConflits.size() > 0) {
     			int option = JOptionPane.showConfirmDialog(
     					(Component)PluginServices.getMainFrame(),
-...
     			if (option != JOptionPane.YES_OPTION) {
     				return false;
+    			}
     			xmlTables.removeAllChilds();
     			xmlTables.removeAllChilds();
+    		}
     		if (xmlDataSources != null)  {
     			if (!this.registerDataSources(xmlDataSources)) return false;
+    		}
     		if (xmlViews != null)  {
     			if (!this.addViews(xmlViews)) return false;
+    		}
     		if (xmlTables != null)  {
     			if (!this.addTables(xmlTables)) return false;
+    		}
+    		}
     		return this.addMaps(xmlMaps);
+    	}
     	/**
     	 * Devuelve las claves de conflits ordenados
     	 * en orden inverso. Las claves se esperan que
     	 * sean instancias de Integer
     	 */
     	 */
     	private int[] getIndexOfConflict(Hashtable conflits) {
     		Object[] tmpArray = conflits.keySet().toArray();
     		Arrays.sort(tmpArray,new Comparator() {
-...
     		for (int i = 0;i< tmpArray.length;i++) {
     			indexes[i] = ((Integer)tmpArray[i]).intValue();
+    		}
     		return indexes;
     		return indexes;
+    	}
     	private boolean addToXMLMapDependencies(ProjectMap map, XMLEntity xmlViews,XMLEntity xmlTables, XMLEntity xmlDataSources) {
     		IFFrame[] components = map.getModel().getFFrames();
     		for (int i=0; i < components.length; i++) {
     			if (components[i] instanceof FFrameView) {
     		for (int i=0; i < components.length; i++) {
     			if (components[i] instanceof FFrameView) {
     				ProjectView view = ((FFrameView)components[i]).getView();
     				if (findChildInXML(xmlViews,"name",view.getName())==null) {
     					if (!this.addToXMLView(view,xmlViews,xmlTables,xmlDataSources)) return false;
+    				}
+    			}
+    		}
     		return true;
+    	}
     	private boolean addToXMLMap(ProjectMap map,XMLEntity xmlMaps,XMLEntity xmlViews,XMLEntity xmlTables,XMLEntity xmlDataSources) {
     		try {
     			xmlMaps.addChild(map.getXMLEntity());
     			return this.addToXMLMapDependencies(map,xmlViews,xmlTables,xmlDataSources);
     		} catch (SaveException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     			return false;
+    		}
+    	}
     	private boolean addToXMLView(ProjectView view,XMLEntity xmlViews,XMLEntity xmlTables,XMLEntity xmlDataSources) {
     		try {
     			xmlViews.addChild(view.getXMLEntity());
     			if (!this.addToXMLLayerDependencies(view.getMapContext().getLayers(),xmlTables,xmlDataSources)) return false;
     			if (view.getMapOverViewContext() != null) {
     				return this.addToXMLLayerDependencies(view.getMapOverViewContext().getLayers(),xmlTables,xmlDataSources);
     			} else {
     				return true;
+    			}
     		} catch (SaveException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
-...
     	public boolean checkXMLRootNode(XMLEntity xml) {
     		if (!xml.contains("applicationName")) return false;
     		if (!xml.getStringProperty("applicationName").equalsIgnoreCase("gvSIG")) return false;
     		if (!xml.contains("version")) return false;
     		if (!xml.getStringProperty("version").equalsIgnoreCase(Version.format())) return false;
     		return true;
+    	}
     	private void fillXMLRootNode(XMLEntity xml) {
     		xml.putProperty("applicationName","gvSIG");
     		xml.putProperty("version",Version.format());
     		xml.putProperty("version",Version.format());
+    	}
     	public XMLEntity getXMLEntityChildOfType(XMLEntity xml,String type) {
     		int childCount = xml.getNumChild();
     		int childCount = xml.getChildrenCount();
     		XMLEntity child;
     		for (int i=0; i < childCount; i++  ) {
     			child = xml.getChild(i);
-...
+    			}
+    		}
     		return null;
+    	}
     	private Hashtable getConflicts(XMLEntity xml,ArrayList elements) {
     		if (xml == null || xml.getNumChild() < 1) return null;
     	private Hashtable getConflicts(XMLEntity xml,ArrayList elements) {
     		if (xml == null || xml.getChildrenCount() < 1) return null;
     		Hashtable conflits = new Hashtable();
     		for (int iXML=0;iXML < xml.getNumChild();iXML++) {
     		for (int iXML=0;iXML < xml.getChildrenCount();iXML++) {
     			XMLEntity child = xml.getChild(iXML);
     			Iterator iter = elements.iterator();
     			while (iter.hasNext()) {
-...
     					conflits.put(new Integer(iXML),child);
     					break;
+    				}
+    			}
+    		}
     		return conflits;
-...
     	private boolean registerDataSources(XMLEntity xmlDataSources) {
     		try {
     			int numDataSources = xmlDataSources.getNumChild();
     			int numDataSources = xmlDataSources.getChildrenCount();
     			if (numDataSources == 0) return true;
     			DataSourceFactory dsFactory = LayerFactory.getDataSourceFactory();
     			for (int i = 0; i < numDataSources; i++) {
     				XMLEntity child = xmlDataSources.getChild(i);
     				String name = child.getStringProperty("gdbmsname");
     				if (dsFactory.getDriverInfo(name) == null) {
     					if (child.getStringProperty("type").equals("otherDriverFile")) {
     					if (child.getStringProperty("type").equals("otherDriverFile")) {
     						LayerFactory.getDataSourceFactory().addFileDataSource(
     								child.getStringProperty("driverName"),
     								child.getStringProperty("driverName"),
     								name,
     								child.getStringProperty("file")
     						);
     					} else if (child.getStringProperty("type").equals("sameDriverFile")) {
     						/*                                String layerName = child.getStringProperty("layerName");
     						 ProjectView vista = project.getViewByName(child.getStringProperty(
     						 "viewName"));
     						 FLayer layer = vista.getMapContext().getLayers().getLayer(layerName);
     						 modelo = ((AlphanumericData) layer).getRecordset();
     						 associatedTable = (AlphanumericData) layer;
     						 */
-...
+    					}
+    				}
+    			}
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
+    		}
+    	}
     	private boolean addTables(XMLEntity xmlTables) {
     		try {
     			int numTables = xmlTables.getNumChild();
     			int numTables = xmlTables.getChildrenCount();
     			if (numTables == 0) return true;
     			Project project = this.getProject();
     			for (int i = 0; i < numTables; i++) {
     				try{
     					ProjectTable ptable = (ProjectTable) ProjectTable.createFromXML(xmlTables.getChild(i), project);
-...
     					return false;
+    				}
+    			}
     			project.setLinkTable();
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
+    	}
     	public XMLEntity findChildInXML(XMLEntity xml,String propName,String value) {
     		int num = xml.getNumChild();
     		int num = xml.getChildrenCount();
     		XMLEntity child;
     		for (int i=0;i < num; i++) {
     			child = xml.getChild(i);
-...
+    		}
     		return null;
+    	}
     	private boolean addLayers(XMLEntity xmlLayers,FLayers root) {
     		try {
     			XMLEntity child;
     			int numLayers = xmlLayers.getNumChild();
     			int numLayers = xmlLayers.getChildrenCount();
     			for (int i = 0; i < numLayers; i++) {
     				child = xmlLayers.getChild(i);
     				if (!root.addLayerFromXMLEntity(child,null)) return false;
-...
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
+    	}
     	private boolean addViews(XMLEntity xmlViews) {
     		try {
     			Project project = this.getProject();
     			XMLEntity child;
     			int numLayers = xmlViews.getNumChild();
     			int numLayers = xmlViews.getChildrenCount();
     			for (int i = 0; i < numLayers; i++) {
     				child = xmlViews.getChild(i);
     				ProjectView pv = (ProjectView) ProjectView.createFromXML(child, project);
     				project.addView(pv);
     				project.addView(pv);
+    			}
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
+    	}
     	private boolean addMaps(XMLEntity xmlMaps) {
     		try {
     			Project project = this.getProject();
     			XMLEntity child;
     			int numLayers = xmlMaps.getNumChild();
     			int numLayers = xmlMaps.getChildrenCount();
     			for (int i = 0; i < numLayers; i++) {
     				child = xmlMaps.getChild(i);
     				ProjectMap pm = (ProjectMap) ProjectMap.createFromXML(child, project);
     				project.addMap(pm);
     				project.addMap(pm);
+    			}
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
+    	}
     	private Project getProject() {
     		 return ((ProjectExtension)PluginServices.getExtension(ProjectExtension.class)).getProject();
+    	}
     	private boolean addToXMLDataSource(SourceInfo source,XMLEntity xmlDataSources, Project project) {
     		if (project== null) {
     			project = this.getProject();
+    		}
+    		}
       	  	xmlDataSources.addChild(project.getSourceInfoXMLEntity(source));
       	  	return true;
+    	}
     	private boolean addToXMLTable(ProjectTable pt,XMLEntity xmlTables,XMLEntity xmlDataSources,Project project) {
     	private boolean addToXMLTable(ProjectTable pt,XMLEntity xmlTables,XMLEntity xmlDataSources,Project project) {
     		if (project== null) {
     			project = this.getProject();
+    		}
-...
     		XMLEntity xmlTable = null;
     		try {
     			xmlTable = pt.getXMLEntity();
     			xmlTables.addChild(xmlTable);
     			if (pt.getAssociatedTable() != null) {
     				this.addToXMLDataSource(pt.getAssociatedTable().getRecordset().getSourceInfo(),xmlDataSources,project);
+    			}
     			if (pt.getLinkTable() != null) {
     				if (findChildInXML(xmlTables,"name",pt.getLinkTable()) == null)  {
     					ProjectTable ptLink = project.getTable(pt.getLinkTable());
-...
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     			return false;
+    		}
       	  	return true;
+    		}
       	  	return true;
+    	}
     	private boolean addToXMLLayerDependencies(FLayer lyr,XMLEntity xmlTables,XMLEntity xmlDataSources) {
     		try {
     			Project project = this.getProject();
     			if (lyr instanceof FLayers) {
     				FLayers lyrs = (FLayers)lyr;
     				int count = lyrs.getLayersCount();
-...
     					this.addToXMLLayerDependencies(subLyr,xmlTables,xmlDataSources);
+    				}
     		    } else if (lyr instanceof AlphanumericData){
     		    } else if (lyr instanceof AlphanumericData){
                 	if (!this.addToXMLDataSource(
             			((AlphanumericData)lyr).getRecordset().getSourceInfo(),
             			xmlDataSources,
             			project
                 	)) return false;
                     ProjectTable pt = project.getTable((AlphanumericData) lyr);
                     if (pt != null) {
                     if (pt != null) {
                     	if (!this.addToXMLTable(pt,xmlTables,xmlDataSources,project)) return false;
+                    }
-...
     			return false;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
     		return true;
+    	}
     	private boolean addToXMLLayer(FLayer lyr,XMLEntity xmlLayers,XMLEntity xmlTables,XMLEntity xmlDataSources) {
     	private boolean addToXMLLayer(FLayer lyr,XMLEntity xmlLayers,XMLEntity xmlTables,XMLEntity xmlDataSources) {
     		try {
     			xmlLayers.addChild(lyr.getXMLEntity());
     			return this.addToXMLLayerDependencies(lyr,xmlTables,xmlDataSources);
     		} catch (XMLException e) {
-...
     			return false;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
     			return false;
+    		}
+    	}
     	private XMLEntity newRootNode() {
     		XMLEntity xml = new XMLEntity();
     		fillXMLRootNode(xml);
-...
     		xmlTables.putProperty("type","tables");
     		return xmlTables;
+    	}
     	private XMLEntity newViewsNode() {
     		XMLEntity xmlTables = new XMLEntity();
     		xmlTables.putProperty("type","views");
-...
     	public void putInClipboard(String data) {
     		StringSelection ss = new StringSelection(data);
     		Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss,ss);
     		Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss,ss);
+    	}
     	public String marshallXMLEntity(XMLEntity xml) {
     		StringWriter buffer = new StringWriter();
-...
     			e3.printStackTrace();
     			return null;
+    		}
     		return buffer.toString();
+    	}
     	public XMLEntity unMarshallXMLEntity(String data) {
     		StringReader reader = new StringReader(data);
     		XmlTag tag;
     		try {
     			tag = (XmlTag) XmlTag.unmarshal(reader);
-...
     			return null;
+    		}
     		XMLEntity xml=new XMLEntity(tag);
     		return xml;
+    	}
     	public String getFromClipboard() {
     	public String getFromClipboard() {
     		 try {
     			return (String)Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null).getTransferData(DataFlavor.stringFlavor);
     		} catch (UnsupportedFlavorException e) {
-...
     		} catch (IOException e) {
     			// TODO Auto-generated catch block
     			return null;
+    		}
+    		}
+    	}
     	public boolean removeLayers(FLayer[] actives) {
         	for (int i = actives.length-1; i>=0; i--){
             	try {
-...
+        	}
     		return true;
+    	}
     	public boolean removeDocuments(ProjectElement[] selectedItems) {
     		Project p = this.getProject();
     		ProjectElement element;
     		int index;
     		for (int i=selectedItems.length-1;i>=0;i--) {
     			element = selectedItems[i];

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff