/ - Diff - Application: gvSIG desktop - gvSIG

Revision 4473

     	private JPanel jPanel4 = null;
     	private JTextField jTxtNomCapa = null;
     	private LayerList lstSelectedLayers = null;
     	private ArrayList selectedPaths = new ArrayList();
     	private javax.swing.JList lstSRSs = null;
     	private LayerTree treeLayers = null;
     	private javax.swing.JList lstFormats = null;
-...
     		if (jTabbedPane == null) {
     			jTabbedPane = new JTabbedPane();
     			jTabbedPane.setBounds(3, 3, 475, 415);
     //            InfoPanel ip = getTabInfo();
     //            ip.addFocusListener(new FocusListener(){
     //                public void focusGained(FocusEvent e) {
     //                    refreshInfo();
     //                }
     //                public void focusLost(FocusEvent e) {
     //                }
     //            });
                 StylesPanel sp = getTabStyle();
                 DimensionPanel dp = getTabDimensions();
     			//jTabbedPane.addTab(PluginServices.getText(this, "info"), null, ip, null);
     			jTabbedPane.addTab(PluginServices.getText(this, "capas"), null, getTabLayers(), null);
     			jTabbedPane.addTab(PluginServices.getText(this, "estilos"), null, sp, null);
                 stylesTabIndex = jTabbedPane.getTabCount()-1;
-...
     		if (selecciones == null)
     			return;
     		for (int i = 0; i < selecciones.length; i++) {
     			selectedPaths.add(selecciones[i]);
     			WMSLayerNode nodo = (WMSLayerNode) selecciones[i].getLastPathComponent();
     			if (nodo.getName() == null || nodo.getName().equals(""))
     				// no es un node que es puga demanar
-...
     		sizeFixed = sz;
+    	}
     	public ArrayList getSelectedPaths(){
     		return selectedPaths;
+    	}
     	/**
     	 * This method initializes chkDisagregate
+    	 *

     import javax.swing.JLabel;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import javax.swing.tree.DefaultTreeModel;
     import javax.swing.tree.TreePath;
     import org.apache.log4j.Logger;
-...
     		return wmsParamsPanel.getLayerName();
+    	}
     	public void initWizard() {
     		dataSource = new WMSWizardData();
+    	}
-...
+    		}
+    	}
     //	private Object[] getFullPath(String name){
     //		Vector path = new Vector();
     //		WMSLayerNode layerNode;
     //		WMSLayerNode parent;
     //		for (int i = 0; i <wmsParamsPanel.getLstSelectedLayers().getModel().getSize(); i++) {
     //			layerNode = (WMSLayerNode)wmsParamsPanel.getLstSelectedLayers().getModel().getElementAt(i);
     //			if(layerNode.getName().compareTo( name ) == 0 ){
     //				path.add(layerNode);
     //				parent = (WMSLayerNode)layerNode.getParent().clone();
     //				while ( parent != null){
     //					path.add(parent);
     //					parent = (WMSLayerNode)parent.getParent().clone();
     //				}
     //			}
     //		}
     //		return path.toArray();
     //	}
     	/**
     	 * If user does not select the chekbox Disagregate layers, will get the layer tree in WMS
     	 * @return
     	 */
         private FLayer getLayerTree() {
             //View v = (View) PluginServices.getMDIManager().getActiveView();
             //FLayers l = new FLayers(v.getMapControl().getMapContext(), null);
             //l.setName("composite");
             //String[] layerNames = getLayersQuery().split(",");
             LayerTree layerTree = wmsParamsPanel.getLayerStructure();
     		TreePath[] selection = layerTree.getSelectionPaths();
             String[] layerNames = getLayersQuery().split(",");
             LayerTree layerTree = wmsParamsPanel.getLayerStructure();
     //        try{
     //        	for (int i = 0; i < layerNames.length; i++) {
     //        		TreePath path = new TreePath(getFullPath(layerNames[i]));
     //        		layerTree.addSelectionPath(path);
     //        	}
     //        }catch(Exception e){
     //        	e.printStackTrace();
     //        }
     		TreePath[] selection = (TreePath[])wmsParamsPanel.getSelectedPaths().toArray(new TreePath[0]);//layerTree.getSelectionPaths();
     		if (selection!=null){
     			return getSubTree((WMSLayerNode)layerTree.getModel().getRoot(),  selection);
     			return getSubTree((WMSLayerNode)layerTree.getModel().getRoot(), selection);
+    		}
     		return null;
+        }
         private boolean nodeSelected(TreePath[] selection, Object node){
         private boolean nodeSelected(TreePath[] selection, WMSLayerNode node){
     		for (int i = 0; i < selection.length; i++) {
     			Object[] components = selection[i].getPath();
     			for (int j=0; j < components.length ; j++)
+    			{
     				if (components[j].equals(node)){
     					return true;
     //				if (components[j].equals(node)){
     //					return true;
     //				}
     				if (components[j] instanceof WMSLayerNode){
     					if (((WMSLayerNode)components[j]).getTitle().compareTo(node.getTitle()) == 0){
     						return true;
+    					}
+    				}
     //				if (components[j] instanceof WMSLayerNode){
     //					if (((WMSLayerNode)components[j]).getName().compareTo(name) == 0){
     //						return true;
     //					}
     //				}
     //				else if (components[j] instanceof String){
     //					if (((String)(components[j])).compareTo(name) == 0){
     //						return true;
-...
+    		{
     	        View v = (View) PluginServices.getMDIManager().getActiveView();
     	        FLayers l = new FLayers(v.getMapControl().getMapContext(), null);
     	        l.setName(node.getName());
     	        l.setName(node.getTitle());
     			for(int i = 0; i < node.getChildren().size(); i++ ){
     				if (nodeSelected(selection, (WMSLayerNode)(node.getChildren().get(i))))
+    				{

Also available in: Unified diff