/branches/v10/extensions/extNormalization/src/org/gvsig/normalization/gui/NormPanelModel.java - Diff - Application: gvSIG desktop - gvSIG

Revision 28183 branches/v10/extensions/extNormalization/src/org/gvsig/normalization/gui/NormPanelModel.java

     public class NormPanelModel implements INormPanelModel {
     	private static final Logger log = PluginServices.getLogger();
     	private List listeners = new ArrayList();
     	private String fieldToNormalize;
     	private String[] samples;
     	private Patternnormalization pattern;
     	private Table tab;
     	private boolean inNewTable;
     	private int selectedFieldInList = 0;
     	private int contador = 1;
     	private String[] relateNames;
     	private List fileChains;
-...
     	 */
     	private NormPanelModel() {
     		initPattern();
+    	}
+    	}
     	/**
     	 * This method fills the GUI sample table with the samples
-...
+    	}
     	/**
     	 * This method updates the model of the names FieldList
+    	 *
     	 * @return list model
     	 */
     	public DefaultListModel updateListModel() {
     		DefaultListModel dlmodel = new DefaultListModel();
     		Element[] adr = this.pattern.getArrayElements();
     		String name = "";
     		for (int i = 0; i < adr.length; i++) {
     			name = adr[i].getFieldname();
     			dlmodel.add(i, name);
+    		}
     		return dlmodel;
+    	}
     	/**
     	 * Run the process of normalization
+    	 *
     	 * @return process ok
-...
     			int index = tab.getSelectedFieldIndices().nextSetBit(0);
     			if (!this.inNewTable) {
     				// ONE TABLEE
     				log.debug("New fields in the original table");
     				// ONE TABLE
     				normAction = new TableNormalization(source, index, pattern);
     			} else {
     				// JOINED TABLE
-...
     		contador++;
     		int tam = pattern.getElements().size();
     		Element elem = new Element();
     		Element eleme = new Element();
     		Fieldseparator fsep = new Fieldseparator();
     		fsep.setSemicolonsep(true);
-...
     		} while (!isOkName);
     		// validate the new field name
     		elem.setFieldname(validateFieldName(nam));
     		elem.setFieldseparator(fsep);
     		elem.setInfieldseparators(getDefaultInfieldseparators());
     		elem.setFieldtype(getDefaultNewFieldType());
     		elem.setFieldwidth(0);
     		elem.setImportfield(true);
     		String vname = validateFieldName(nam);
     		eleme.setFieldname(vname);
     		eleme.setFieldseparator(fsep);
     		eleme.setInfieldseparators(getDefaultInfieldseparators());
     		eleme.setFieldtype(getDefaultNewFieldType());
     		eleme.setFieldwidth(0);
     		eleme.setImportfield(true);
     		pattern.getElements().add(tam, elem);
     		List elems = pattern.getElements();
     		elems.add(tam, eleme);
+    	}
     	/**
-...
     						null, "save_norm_pattern"), JOptionPane.YES_NO_OPTION);
     				if (n == JOptionPane.YES_OPTION) {
     					writeSaveFile(thefile);
     					log.debug("overwrite file");
     				} else if (n == JOptionPane.NO_OPTION) {
     					log.debug("Don't save the file");
     					update("INFO.filenotoverwrite");
     				} else {
     					log.debug("Don't save the file");
     					update("INFO.filenotsave");
+    				}
     			} else {
-...
     		if (returnval == JFileChooser.APPROVE_OPTION) {
     			thefile = jfc.getSelectedFile();
     			log.debug("file to open: " + thefile);
     		} else {
     			update("INFO.noload");
     			return null;
-...
     			update("INFO.loadsuccess");
     		} catch (FileNotFoundException e) {
     			pat = null;
     			update("INFO.filenotfound");
     			update("ERROR.filenotfound");
     			log.error("File not found", e);
     		} catch (Exception e) {
     			pat = null;
     			update("INFO.parsingpatternxml");
     			update("ERROR.parsingpatternxml");
     			update("INFO.noformatok");
     			update("INFO.noload");
     			log.error("ERROR Parsing xml", e);
+    		}
-...
+    	}
     	/**
     	 * This method gets the position of the selected element in the List of
     	 * names
+    	 *
     	 * @return position in the list
     	 */
     	public int getSelectedFieldInList() {
     		return selectedFieldInList;
+    	}
     	/**
     	 * This method set the position of the selected element in the List
+    	 *
     	 * @param selectedFieldInList
     	 */
     	public void setSelectedFieldInList(int selectedFieldInList) {
     		this.selectedFieldInList = selectedFieldInList;
+    	}
     	/**
     	 * This method returns the fields names of the original table
+    	 *
     	 * @return list model
-...
     	 * @param file
     	 */
     	private void writeSaveFile(File thefile) {
     		pattern.setPatternname(thefile.getName());
     		FileWriter writer;
-...
     		try {
     			storage = new StorageXML();
     			pattern.getstate(storage);
     			writer = new FileWriter(thefile);
     			writer = new FileWriter(thefile);
     			storage.dump(writer);
     			update("INFO.savesuccess");
     			writer.close();
-...
     		update(evt);
+    	}
     	/**
     	 * @return the pattern
     	 */
     	public Patternnormalization getPattern() {
     		return pattern;
+    	}
+    }

Also available in: Unified diff