/ - Diff - | gvSIG desktop 1 - gvSIG

     Ajustar_transparencia=Adjust transparency
     Al_leer_la_leyenda=Reading legend
     Albers_Conic_Equal_Area=Albers Conic Equal Area
     All_supported_files=All supported files
     Altura_en_metros=Height in meters
     Altura_fija=Fixed Height
     Altura_fija_de_texto=Fixed text height
-...
     Grid_settings=Grid settings
     Grosor_de_linea=Line width
     GroupByField_not_initialized=GroupByField not initialized
     Group_with_layer=Group with layer
     Guardar=Save
     Guardar_el_zoom_actual=Save current zoom
     Guardar_leyenda=Save legend
-...
     More_control_points_needed_for_the_current_transform=Selected type of transformation requires additional control points.
     Mostrar_Contorno=Show outline
     Mostrar_siempre=Always show
     Move_above_layer=Move above
     Move_below_layer=Move below
     Move_from_view=Move points from view
     Mover_geo=Move georeferenced image
     Muestra_atributos=Show attribute table of active layer
-...
     Parameters=Parameters
     Parametros=Parameters
     Parametros_De_Entrada_Para_La_Correccion=Input data for correction
     Paste_above_layer=Paste above
     Paste_below_layer=Paste below
     Path=Path
     Path_where_create_the_new_layer_files=Directory in which to save new layer files
     Pegado_sobre_el_terreno=Stuck in terrain

trunk/applications/appgvSIG/config/text_en_US.properties
59	59	Ajustar_transparencia=Adjust transparency
60	60	Al_leer_la_leyenda=Reading legend
61	61	Albers_Conic_Equal_Area=Albers Conic Equal Area
	62	All_supported_files=All supported files
62	63	Altura_en_metros=
63	64	Altura_fija=
64	65	Altura_fija_de_texto=Fixed text height

     Ajustar_transparencia=Ajustar transparencia
     Al_leer_la_leyenda=Al leer la leyenda
     Albers_Conic_Equal_Area=C\u00f3nica Iso \u00c1rea de Albers
     All_supported_files=Todos los ficheros soportados
     Altura_en_metros=Altura en metros
     Altura_fija=Altura fija
     Altura_fija_de_texto=Altura fija de texto
-...
     Grid_settings=Propiedades malla
     Grosor_de_linea=Grosor de l\u00ednea
     GroupByField_not_initialized=Campo de agrupaci\u00f3n no inicializado
     Group_with_layer=Agrupar a la capa
     Guardar=Guardar
     Guardar_el_zoom_actual=Guardar el zoom
     Guardar_leyenda=Guardar leyenda
-...
     More_control_points_needed_for_the_current_transform=Se requieren m\u00e1s puntos de control para el tipo de transformaci\u00f3n seleccionado
     Mostrar_Contorno=Mostrar contorno
     Mostrar_siempre=Mostrar siempre
     Move_above_layer=Mover encima de
     Move_below_layer=Mover debajo de
     Move_from_view=Mover puntos desde la vista
     Mover_geo=Mover imagen a georreferenciar
     Muestra_atributos=Muestra los atributos de las capas seleccionadas.
-...
     Parameters=Par\u00e1metros
     Parametros=Par\u00e1metros
     Parametros_De_Entrada_Para_La_Correccion=Parametros de entrada para la correcci\u00f3n
     Paste_above_layer=Pegar encima de
     Paste_below_layer=Pegar debajo de
     Path=Ruta
     Path_where_create_the_new_layer_files=Ruta donde crear los ficheros de la nueva capa.
     Pegado_sobre_el_terreno=Pegado sobre el terreno

     	 * Lista de manejadores de ficheros (extensiones)
     	 */
     	private ArrayList<IFileOpen> listFileOpen = new ArrayList<IFileOpen>();
     	private class FileFilterAll extends FileFilter {
     		private ArrayList<FileFilter> all = null;
     		public void setAllFileFilters(ArrayList<FileFilter> all) {
     			this.all = all;
+    		}
     		public String getDescription() {
     			return PluginServices.getText(null, "All_supported_files");
+    		}
     		public boolean accept(File f) {
     			for (int j = 0; j < all.size(); j++) {
     				FileFilter fileFilter = all.get(j);
     				if (fileFilter.accept(f)) {
     					return true;
+    				}
+    			}
     			return false;
+    		}
     	};
     	/**
     	 * Construye un FileOpenWizard usando la extension por defecto
     	 * 'FileExtendingOpenDialog'
-...
     		fileChooser.setMultiSelectionEnabled(true);
     		fileChooser.setAcceptAllFileFilterUsed(false);
     		FileFilterAll allFileFilter = new FileFilterAll();
     		boolean finded = false;
     		FileFilter auxFilter=null;
     		FileFilter auxFilter=null;
     		ArrayList<FileFilter> allFileFilters = new ArrayList<FileFilter>();
     		for (int i = 0; i < listFileOpen.size(); i++) {
     			IFileOpen fileOpen = listFileOpen.get(i);
     			fileOpen.pre();
-...
     			for (int j = 0; j < aux.size(); j++) {
     				FileFilter fileFilter = aux.get(j);
     				fileChooser.addChoosableFileFilter(fileFilter);
     				allFileFilters.add(fileFilter);
     				if (lastFileFilter!=null && lastFileFilter.getDescription().equals(fileFilter.getDescription())){
     					auxFilter=fileFilter;
     					finded = true;
+    				}
+    			}
+    		}
     		allFileFilter.setAllFileFilters(allFileFilters);
     		fileChooser.addChoosableFileFilter(allFileFilter);
     		if (finded && (lastFileFilter != null))
     			fileChooser.setFileFilter(auxFilter);
-...
     			lastPath = fileChooser.getCurrentDirectory().getAbsolutePath();
     			lastFileFilter = (FileFilter) fileChooser.getFileFilter();
     			newFiles = fileChooser.getSelectedFiles();
     			FileFilter selectedFileFilter = fileChooser.getFileFilter();
     			if (selectedFileFilter == allFileFilter) {
+    			}
     			IFileOpen lastFileOpen = null;
     			// Para cada fichero, queremos saber su fileFilter para llamar al post correspondiente
     			for (int i = 0; i < listFileOpen.size(); i++) {
     				IFileOpen fileOpen = listFileOpen.get(i);
     				ArrayList<FileFilter> aux = fileOpen.getFileFilter();
     				for (int j = 0; j < aux.size(); j++) {
     					if (fileChooser.getFileFilter() == aux.get(j)) {
     					//if (fileChooser.getFileFilter() == aux.get(j)) {
     						for (int iFile = 0; iFile < newFiles.length; iFile++) {
     							try {
     								newFiles[iFile] = fileOpen.post(newFiles[iFile]);
     								File f = newFiles[iFile];
     								if (aux.get(j).accept(f)) {
     									newFiles[iFile] = fileOpen.post(f);
     									String driverName = aux.get(j).getDescription();
     									toAdd.add(new MyFile(f, driverName, fileOpen));
+    								}
     							} catch (LoadLayerException e) {
     								newFiles[iFile] = null;
+    							}
+    						}
     						lastFileOpen = fileOpen;
     						break;
+    					}
     //						break;
     //					}
+    				}
+    			}
     			for (int ind = 0; ind < newFiles.length; ind++) {
     				if (newFiles[ind] == null)
     					continue;
     				String driverName = ((FileFilter) fileChooser.getFileFilter()).getDescription();
     				toAdd.add(new MyFile(newFiles[ind], driverName, lastFileOpen));
+    			}
     //			for (int ind = 0; ind < newFiles.length; ind++) {
     //				if (newFiles[ind] == null)
     //					continue;
     //				String driverName = ((FileFilter) fileChooser.getFileFilter()).getDescription();
     //				toAdd.add(new MyFile(newFiles[ind], driverName, lastFileOpen));
     //			}
     			return toAdd.toArray();
     		} else

| gvSIG desktop 1

Revision 37944