Revision 26248

View differences:

trunk/extensions/extNormalization/config/config.xml
21 21
			description="Extension that normalize a file with strings."
22 22
			active="true">
23 23
			<menu text="Tabla/normalizefile" tooltip="normalizefile"
24
				action-command="NORMALIZE_FILE" icon="images/icons16/normalizefileicon.png"
25
				position="9997" />
24
				action-command="NORMALIZE_FILE"
25
				icon="images/icons16/normalizefileicon.png" position="9997" />
26
			<tool-bar name="field_toolbar">
27
				<action-tool
28
					icon="images/icons16/normalizefileicon.png"
29
					action-command="NORMALIZE_FILE" tooltip="normalizefile"
30
					position="9997" />
31
			</tool-bar>
26 32
		</extension>
27 33
		<extension
28 34
			class-name="org.gvsig.normalization.extensions.NormalizationTableExtension"
......
32 38
				action-command="NORMALIZE_TABLE"
33 39
				icon="images/icons16/normalizetableicon.png" position="9998" />
34 40
			<tool-bar name="field_toolbar">
35
				<action-tool icon="images/icons16/normalizetableicon.png"
41
				<action-tool
42
					icon="images/icons16/normalizetableicon.png"
36 43
					action-command="NORMALIZE_TABLE" tooltip="normalizetable"
37 44
					position="9998" />
38 45
			</tool-bar>
trunk/extensions/extNormalization/src/org/gvsig/normalization/gui/INormPanelModel.java
36 36
import org.gvsig.normalization.patterns.Fieldseparator;
37 37
import org.gvsig.normalization.patterns.Patternnormalization;
38 38

  
39

  
40 39
import com.iver.cit.gvsig.project.documents.table.gui.Table;
41 40

  
42 41
/**
trunk/extensions/extNormalization/src/org/gvsig/normalization/gui/NormalizationPanel.java
82 82

  
83 83
	private static final Logger log = PluginServices.getLogger();
84 84

  
85
	private INormPanelModel npm;
85
	private INormPanelModel model;
86 86

  
87 87
	private boolean isFile;
88 88

  
89 89
	private boolean isEdit;
90 90

  
91
	private PluginServices pServ;
91
	private PluginServices ps;
92 92

  
93 93
	private boolean dirty = false;
94 94

  
......
235 235
	/**
236 236
	 * Creates new form NormalizationPanel to normalize table
237 237
	 * 
238
	 * @param _npm
238
	 * @param _model
239 239
	 * @return panel
240 240
	 */
241
	public NormalizationPanel(INormPanelModel _npm) {
242
		this.npm = _npm;
241
	public NormalizationPanel(INormPanelModel _model) {
242
		this.model = _model;
243 243
		init();
244 244
	}
245 245

  
......
251 251
	 * @param _isEdit
252 252
	 * @return panel
253 253
	 */
254
	public NormalizationPanel(INormPanelModel _npm, boolean _isFile,
254
	public NormalizationPanel(INormPanelModel _model, boolean _isFile,
255 255
			boolean _isEdit) {
256
		this.npm = _npm;
257

  
258
		isFile = _isFile;
259
		isEdit = _isEdit;
256
		this.model = _model;
257
		this.isFile = _isFile;
258
		this.isEdit = _isEdit;
260 259
		init();
261 260
	}
262 261

  
263 262
	/**
264
	 * This method sets the PluginServices and update the string and images
263
	 * This method sets the PluginServices and update the string and icons
265 264
	 * 
266 265
	 * @param ps
267 266
	 *            PluginServices
268 267
	 */
269 268
	public void setPs(PluginServices ps) {
270
		this.pServ = ps;
271

  
272
		setMessages();
273
		setImages();
269
		this.ps = ps;
270
		if (ps != null) {
271
			setMessages();
272
			setImages();
273
		}
274 274
	}
275 275

  
276 276
	/**
......
295 295
	 * @param e
296 296
	 */
297 297
	public void stateChanged(ChangeEvent e) {
298
		// this.jTextAreaConsole.append(e.getSource().toString() + "\n");
299 298
		this.jTextAreaConsole.append(parseInfo(e.getSource().toString()));
300 299
	}
301 300

  
......
356 355
			jRadioNewTable.setSelected(true);
357 356
			jListOriginalFields.setEnabled(true);
358 357
			jListOriginalFields.setSelectedIndex(0);
359
			npm.setInNewTable(true);
358
			model.setInNewTable(true);
360 359
		}
361 360
	}
362 361

  
......
520 519
		jTextNumberRows.setMaximumSize(new java.awt.Dimension(30, 18));
521 520
		jTextNumberRows.setMinimumSize(new java.awt.Dimension(30, 18));
522 521
		jTextNumberRows.setPreferredSize(new java.awt.Dimension(30, 18));
523
		jTextNumberRows.addFocusListener(new java.awt.event.FocusAdapter() {
524
			public void focusLost(java.awt.event.FocusEvent evt) {
525
				firstRowsFocusLost(evt);
522

  
523
		// jTextNumberRows.addFocusListener(new java.awt.event.FocusAdapter() {
524
		// public void focusLost(java.awt.event.FocusEvent evt) {
525
		// firstRowsvalueChange();
526
		// }
527
		// });
528

  
529
		jTextNumberRows.addKeyListener(new java.awt.event.KeyAdapter() {
530
			public void keyReleased(java.awt.event.KeyEvent evt) {
531
				firstRowsvalueChange();
526 532
			}
527 533
		});
528 534
		gridBagConstraints = new java.awt.GridBagConstraints();
......
815 821
		jPanFieldSeparators.add(jChkOther, gridBagConstraints);
816 822

  
817 823
		jTextOther.setEditable(false);
818
		jTextOther.setMinimumSize(new java.awt.Dimension(20, 20));
819
		jTextOther.setPreferredSize(new java.awt.Dimension(20, 20));
824
		jTextOther.setMinimumSize(new java.awt.Dimension(30, 20));
825
		jTextOther.setPreferredSize(new java.awt.Dimension(30, 20));
820 826
		jTextOther.addActionListener(new java.awt.event.ActionListener() {
821 827
			public void actionPerformed(java.awt.event.ActionEvent evt) {
822 828
				ActionTextOther(evt);
......
1238 1244
		if (jCheckFirstRow.isSelected()) {
1239 1245
			jTextNumberRows.setText("1");
1240 1246
			jTextNumberRows.setEditable(true);
1241
			npm.setFirstRows(Integer.parseInt(jTextNumberRows.getText()));
1247
			model.setFirstRows(Integer.parseInt(jTextNumberRows.getText()));
1242 1248
			this.jTextNumberRows.requestFocus();
1243
			npm.getSamplesFromFile(npm.getFirstRows());
1249
			model.getSamplesFromFile(model.getFirstRows());
1244 1250
			jTableSource.setModel(getSourceData());
1245 1251
		}
1246 1252
		/* Normalize the first rows */
1247 1253
		else {
1248 1254
			jTextNumberRows.setText("0");
1249 1255
			jTextNumberRows.setEditable(false);
1250
			npm.setFirstRows(0);
1251
			npm.getSamplesFromFile(npm.getFirstRows());
1256
			model.setFirstRows(0);
1257
			model.getSamplesFromFile(model.getFirstRows());
1252 1258
			jTableSource.setModel(getSourceData());
1253 1259
		}
1254 1260
	}
......
1256 1262
	/**
1257 1263
	 * This method runs when textField is modify
1258 1264
	 * 
1259
	 * @param evt
1260 1265
	 */
1261
	private void firstRowsFocusLost(java.awt.event.FocusEvent evt) {
1266
	private void firstRowsvalueChange() {
1262 1267
		int val;
1263 1268
		try {
1264 1269
			val = Integer.parseInt(jTextNumberRows.getText());
1265
			npm.setFirstRows(val);
1266
			npm.getSamplesFromFile(npm.getFirstRows());
1270
			model.setFirstRows(val);
1271
			model.getSamplesFromFile(model.getFirstRows());
1267 1272
			jTableSource.setModel(getSourceData());
1268 1273
			jTableSource.validate();
1269 1274
		} catch (Exception e) {
......
1378 1383
	 */
1379 1384
	private void ActionFieldName(java.awt.event.FocusEvent evt) {
1380 1385

  
1381
		int pos = npm.getSelectedFieldInList();
1386
		int pos = this.model.getSelectedFieldInList();
1382 1387
		updateFieldSettingsModel();
1383 1388
		updateGUI();
1384 1389
		setDirty(false);
......
1458 1463
			updateFieldSettingsModel();
1459 1464
		}
1460 1465
		/* Normalize */
1461
		Object[][] data = this.npm.normalizeSamples();
1462
		String[] nam = this.npm.getNewFieldNames();
1466
		Object[][] data = this.model.normalizeSamples();
1467
		String[] nam = this.model.getNewFieldNames();
1463 1468
		jTableResult.setModel(new DefaultTableModel(data, nam));
1464 1469
	}
1465 1470

  
......
1495 1500
			/* select all fields */
1496 1501
			if (jListOriginalFields.getSelectedIndex() == 1) {
1497 1502

  
1498
				nam = npm.getFieldNamesMainTable();
1503
				nam = this.model.getFieldNamesMainTable();
1499 1504
			}
1500 1505
			/* fields selected */
1501 1506
			if (jListOriginalFields.getSelectedIndex() != 0
......
1506 1511
					nam[i] = (String) names[i];
1507 1512
				}
1508 1513
			}
1509
			npm.setNameRelateFields(nam);
1514
			this.model.setNameRelateFields(nam);
1510 1515
		}
1511 1516

  
1512 1517
		/* RUN */
1513
		this.npm.runModel(this);
1514
		jTextAreaConsole.setText(npm.getInfo());
1518
		this.model.runModel(this);
1519
		jTextAreaConsole.setText(this.model.getInfo());
1515 1520

  
1516 1521
	}
1517 1522

  
......
1554 1559
		updateFieldSettingsModel();
1555 1560
		setDirty(false);
1556 1561
		int pos = jListFieldList.getSelectedIndex();
1557
		npm.fieldUp(pos);
1558
		DefaultListModel dlm = npm.updateListModel();
1562
		this.model.fieldUp(pos);
1563
		DefaultListModel dlm = model.updateListModel();
1559 1564
		jListFieldList.removeAll();
1560 1565
		jListFieldList.setModel(dlm);
1561 1566
		jListFieldList.setSelectedIndex(pos);
1562 1567
		if (pos > 0 && dlm.getSize() > 1) {
1563 1568
			jListFieldList.setSelectedIndex(pos - 1);
1564
			npm.setSelectedFieldInList(pos - 1);
1569
			model.setSelectedFieldInList(pos - 1);
1565 1570
		} else {
1566 1571
			jListFieldList.setSelectedIndex(pos);
1567
			npm.setSelectedFieldInList(pos);
1572
			model.setSelectedFieldInList(pos);
1568 1573
		}
1569 1574
	}
1570 1575

  
......
1576 1581
	private void ActionButtonAdd(java.awt.event.ActionEvent evt) {
1577 1582
		updateFieldSettingsModel();
1578 1583
		setDirty(false);
1579
		npm.addField();
1580
		DefaultListModel dlm = npm.updateListModel();
1584
		model.addField();
1585
		DefaultListModel dlm = model.updateListModel();
1581 1586
		jListFieldList.setModel(dlm);
1582 1587
		int si = dlm.size();
1583
		npm.setSelectedFieldInList(si - 1);
1584
		jListFieldList.setSelectedIndex(npm.getSelectedFieldInList());
1588
		model.setSelectedFieldInList(si - 1);
1589
		jListFieldList.setSelectedIndex(model.getSelectedFieldInList());
1585 1590
		jTextOther.setEditable(false);
1586 1591
	}
1587 1592

  
......
1592 1597
	 */
1593 1598
	private void ActionButtonRemove(java.awt.event.ActionEvent evt) {
1594 1599
		int pos = jListFieldList.getSelectedIndex();
1595
		updateFieldSettingsModel();
1596
		setDirty(false);
1597
		npm.deleteField(pos);
1598
		DefaultListModel dlm = npm.updateListModel();
1599
		jListFieldList.setModel(dlm);
1600 1600
		if (pos > 0) {
1601
			jListFieldList.setSelectedIndex(pos - 1);
1602
			npm.setSelectedFieldInList(pos - 1);
1603
		} else {
1604
			jListFieldList.setSelectedIndex(pos);
1605
			npm.setSelectedFieldInList(pos);
1601
			updateFieldSettingsModel();
1602
			setDirty(false);
1603
			model.deleteField(pos);
1604
			DefaultListModel dlm = model.updateListModel();
1605
			jListFieldList.setModel(dlm);
1606
			if (pos > 0) {
1607
				jListFieldList.setSelectedIndex(pos - 1);
1608
				model.setSelectedFieldInList(pos - 1);
1609
			} else {
1610
				jListFieldList.setSelectedIndex(pos);
1611
				model.setSelectedFieldInList(pos);
1612
			}
1606 1613
		}
1607 1614
	}
1608 1615

  
......
1615 1622
		int pos = jListFieldList.getSelectedIndex();
1616 1623
		updateFieldSettingsModel();
1617 1624
		setDirty(false);
1618
		npm.fieldDown(pos);
1619
		DefaultListModel dlm = npm.updateListModel();
1625
		model.fieldDown(pos);
1626
		DefaultListModel dlm = model.updateListModel();
1620 1627
		jListFieldList.removeAll();
1621 1628
		jListFieldList.setModel(dlm);
1622 1629
		jListFieldList.setSelectedIndex(pos);
......
1624 1631

  
1625 1632
		if (pos < can - 1 && can > 1) {
1626 1633
			jListFieldList.setSelectedIndex(pos + 1);
1627
			npm.setSelectedFieldInList(pos + 1);
1634
			model.setSelectedFieldInList(pos + 1);
1628 1635
		} else {
1629 1636
			jListFieldList.setSelectedIndex(pos);
1630
			npm.setSelectedFieldInList(pos);
1637
			model.setSelectedFieldInList(pos);
1631 1638
		}
1632 1639
	}
1633 1640

  
......
1638 1645
	 */
1639 1646
	private void ActionAlterTable(java.awt.event.ActionEvent evt) {
1640 1647
		this.jListOriginalFields.setEnabled(false);
1641
		npm.setInNewTable(false);
1648
		model.setInNewTable(false);
1642 1649

  
1643 1650
	}
1644 1651

  
......
1652 1659
			this.jListOriginalFields.setEnabled(true);
1653 1660
		}
1654 1661
		jListOriginalFields.setSelectedIndex(0);
1655
		npm.setInNewTable(true);
1662
		model.setInNewTable(true);
1656 1663
	}
1657 1664

  
1658 1665
	/**
......
1666 1673
		setDirty(false);
1667 1674

  
1668 1675
		/* load the model from xml file */
1669
		Patternnormalization pat = npm.loadPatternXML();
1676
		Patternnormalization pat = model.loadPatternXML();
1670 1677

  
1671 1678
		/* update the panel */
1672 1679
		if (pat != null) {
1673 1680
			/* save pattern in the model */
1674
			npm.setPattern(pat);
1681
			model.setPattern(pat);
1675 1682

  
1676
			DefaultListModel dlm = npm.updateListModel();
1683
			DefaultListModel dlm = model.updateListModel();
1677 1684
			jListFieldList.setModel(dlm);
1678 1685
			jListFieldList.setSelectedIndex(0);
1679
			jCheckFirstRow.setSelected(npm.getFirstRows() != 0);
1686
			jCheckFirstRow.setSelected(model.getFirstRows() != 0);
1680 1687
			if (jCheckFirstRow.isSelected()) {
1681 1688
				jTextNumberRows.setEditable(true);
1682
				jTextNumberRows.setText(npm.getFirstRows() + "");
1683
				npm.getSamplesFromFile(npm.getFirstRows());
1689
				jTextNumberRows.setText(model.getFirstRows() + "");
1690
				model.getSamplesFromFile(model.getFirstRows());
1684 1691
				jTableSource.setModel(getSourceData());
1685 1692
			}
1686 1693
			setDirty(false);
1687 1694

  
1688
			jTextAreaConsole.setText(npm.getInfo());
1695
			jTextAreaConsole.setText(model.getInfo());
1689 1696

  
1690 1697
		} else {
1691
			jTextAreaConsole.setText(npm.getInfo());
1698
			jTextAreaConsole.setText(model.getInfo());
1692 1699
		}
1693

  
1694 1700
	}
1695 1701

  
1696 1702
	/**
......
1704 1710

  
1705 1711
		if (isDirty()) {
1706 1712
			updateFieldSettingsModel();
1707
			jListFieldList.setModel(npm.updateListModel());
1713
			jListFieldList.setModel(model.updateListModel());
1708 1714
		}
1709 1715
		int pos = (int) jListFieldList.getSelectedIndex();
1710 1716
		if (pos != -1 && !evt.getValueIsAdjusting()) {
1711
			npm.setSelectedFieldInList(pos);
1717
			model.setSelectedFieldInList(pos);
1712 1718
			updateFieldSettingsValuesGUI(pos);
1713 1719
		}
1714 1720
		setDirty(false);
......
1726 1732
				PluginServices.getMDIManager().closeWindow(iws[i]);
1727 1733
			}
1728 1734
		}
1729
		npm.initPattern();
1730
		npm.clearConsole();
1735
		model.initPattern();
1736
		model.clearConsole();
1731 1737
		jTextAreaConsole.removeAll();
1732 1738
	}
1733 1739

  
......
1737 1743
	 * @param evt
1738 1744
	 */
1739 1745
	private void jButSaveActionPerformed(java.awt.event.ActionEvent evt) {
1740
		npm.setFirstRows(Integer.parseInt(jTextNumberRows.getText()));
1746
		model.setFirstRows(Integer.parseInt(jTextNumberRows.getText()));
1741 1747
		updateFieldSettingsModel();
1742 1748
		setDirty(false);
1743 1749
		/* save the pattern */
1744
		npm.savePatternXML();
1750
		model.savePatternXML();
1745 1751
		/* Show info in console */
1746
		jTextAreaConsole.setText(npm.getInfo());
1752
		jTextAreaConsole.setText(model.getInfo().trim());
1747 1753
	}
1748 1754

  
1749 1755
	/* FIN ACTION */
......
1756 1762
	 */
1757 1763
	private void updateFieldSettingsValuesGUI(int id) {
1758 1764

  
1759
		Element elem = this.npm.getElement(id);
1765
		Element elem = this.model.getElement(id);
1760 1766

  
1761 1767
		/* name */
1762 1768
		this.jTextFieldName.setText(elem.getFieldname());
......
1802 1808
		/* Update field separator */
1803 1809
		Fieldseparator seps = elem.getFieldseparator();
1804 1810
		if (seps == null) {
1805
			npm.getDefaultFieldseparators();
1811
			model.getDefaultFieldseparators();
1806 1812
		}
1807 1813

  
1808 1814
		this.jTextFieldWidth.setText(Integer.toString(elem.getFieldwidth()));
......
1858 1864
	 */
1859 1865
	private void updateFieldSettingsModel() {
1860 1866
		log.debug("Updating field in the model");
1861
		int pos = npm.getSelectedFieldInList();
1862
		Element elem = this.npm.getElement(pos);
1867
		int pos = model.getSelectedFieldInList();
1868
		Element elem = this.model.getElement(pos);
1863 1869

  
1864 1870
		/* name */
1865 1871
		elem.setFieldname(this.jTextFieldName.getText());
......
1945 1951
	 */
1946 1952
	private DefaultTableModel getSourceData() {
1947 1953
		log.debug("getting data");
1948
		if (this.npm == null) {
1954
		if (this.model == null) {
1949 1955
			return null;
1950 1956
		}
1951 1957
		String[] samples = null;
1952 1958
		if (isFile) {
1953
			samples = this.npm.getSamplesFile();
1959
			samples = this.model.getSamplesFile();
1954 1960
		} else {
1955
			samples = this.npm.getSamplesTable();
1961
			samples = this.model.getSamplesTable();
1956 1962
		}
1957 1963
		int size = samples.length;
1958 1964

  
......
1963 1969
		}
1964 1970
		DefaultTableModel dtm1 = null;
1965 1971
		if (!isFile) {
1966
			dtm1 = new DefaultTableModel(data, new String[] { this.npm
1972
			dtm1 = new DefaultTableModel(data, new String[] { this.model
1967 1973
					.getFieldToNormalize() }) {
1968 1974

  
1969 1975
				/**
......
1977 1983
				}
1978 1984
			};
1979 1985
		} else {
1980
			Object[] names = { npm.getFileName() };
1986
			Object[] names = { model.getFileName() };
1981 1987
			dtm1 = new DefaultTableModel(data, names);
1982 1988
		}
1983 1989

  
......
1994 2000
		jTableSource.setModel(getSourceData());
1995 2001

  
1996 2002
		/* Fields List */
1997
		jListFieldList.setModel(npm.updateListModel());
2003
		jListFieldList.setModel(model.updateListModel());
1998 2004
		jListFieldList.setSelectedIndex(0);
1999 2005

  
2000 2006
		/* Fields List in Original Table */
2001 2007
		if (!isFile) {
2002
			DefaultListModel dlmot = npm.getAllOriginalFields();
2008
			DefaultListModel dlmot = model.getAllOriginalFields();
2003 2009
			jListOriginalFields.setModel(dlmot);
2004 2010
			jListOriginalFields.setSelectedIndex(0);
2005 2011
		}
2006 2012
		/* Disable any controls */
2007 2013
		if (isFile) {
2008
			jTableSource.setName(npm.getFileName());
2014
			jTableSource.setName(model.getFileName());
2009 2015
			jCheckFirstRow.setEnabled(true);
2010 2016
			jLabelNumberRows.setEnabled(true);
2011
			jCheckFirstRow.setSelected(npm.getFirstRows() != 0);
2012
			jTextNumberRows.setText(npm.getFirstRows() + "");
2017
			jCheckFirstRow.setSelected(model.getFirstRows() != 0);
2018
			jTextNumberRows.setText(model.getFirstRows() + "");
2013 2019
			jRadioAlterTable.setEnabled(false);
2014 2020
			jListOriginalFields.removeAll();
2015 2021
			jRadioNewTable.setSelected(true);
2016
			npm.setInNewTable(true);
2022
			model.setInNewTable(true);
2017 2023
			jListOriginalFields.setEnabled(false);
2018 2024

  
2019 2025
		}
......
2076 2082
	 */
2077 2083
	private void setMessages() {
2078 2084

  
2079
		if (this.pServ == null)
2085
		if (this.ps == null)
2080 2086
			return;
2081 2087

  
2082
		this.setName(pServ.getText("normtitle"));
2083
		jPanSource.setBorder(BorderFactory.createTitledBorder(pServ
2088
		this.setName(ps.getText("normtitle"));
2089
		jPanSource.setBorder(BorderFactory.createTitledBorder(ps
2084 2090
				.getText("normsource")));
2085
		jCheckFirstRow.setText(pServ.getText("normfirstrows"));
2086
		jLabelNumberRows.setText(pServ.getText("normfirstnumberrows"));
2091
		jCheckFirstRow.setText(ps.getText("normfirstrows"));
2092
		jLabelNumberRows.setText(ps.getText("normfirstnumberrows"));
2087 2093

  
2088
		jPanFieldList.setBorder(BorderFactory.createTitledBorder(pServ
2094
		jPanFieldList.setBorder(BorderFactory.createTitledBorder(ps
2089 2095
				.getText("normfields")));
2090 2096

  
2091
		jPanFieldSettings.setBorder(BorderFactory.createTitledBorder(pServ
2097
		jPanFieldSettings.setBorder(BorderFactory.createTitledBorder(ps
2092 2098
				.getText("normfieldsettings")));
2093
		jLabFieldName.setText(pServ.getText("normfieldname"));
2094
		jChkDontImport.setText(pServ.getText("normdontimport"));
2099
		jLabFieldName.setText(ps.getText("normfieldname"));
2100
		jChkDontImport.setText(ps.getText("normdontimport"));
2095 2101

  
2096
		jPanFieldType.setBorder(BorderFactory.createTitledBorder(pServ
2102
		jPanFieldType.setBorder(BorderFactory.createTitledBorder(ps
2097 2103
				.getText("normfieldtype")));
2098
		jRadioString.setText(pServ.getText("normfieldstring"));
2099
		jRadioInteger.setText(pServ.getText("normfieldinteger"));
2100
		jRadioDecimal.setText(pServ.getText("normfielddecimal"));
2101
		jRadioDate.setText(pServ.getText("normfielddate"));
2104
		jRadioString.setText(ps.getText("normfieldstring"));
2105
		jRadioInteger.setText(ps.getText("normfieldinteger"));
2106
		jRadioDecimal.setText(ps.getText("normfielddecimal"));
2107
		jRadioDate.setText(ps.getText("normfielddate"));
2102 2108

  
2103
		jPanSeparators.setBorder(BorderFactory.createTitledBorder(pServ
2109
		jPanSeparators.setBorder(BorderFactory.createTitledBorder(ps
2104 2110
				.getText("normdelimetersnext")));
2105
		jRadioCharacter.setText(pServ.getText("normcharacter"));
2106
		jRadioFixed.setText(pServ.getText("normfixedwidth"));
2111
		jRadioCharacter.setText(ps.getText("normcharacter"));
2112
		jRadioFixed.setText(ps.getText("normfixedwidth"));
2107 2113

  
2108
		jPanFieldSeparators.setBorder(BorderFactory.createTitledBorder(pServ
2114
		jPanFieldSeparators.setBorder(BorderFactory.createTitledBorder(ps
2109 2115
				.getText("normfieldseparators")));
2110
		jChkTab.setText(pServ.getText("normtab"));
2111
		jChkSpace.setText(pServ.getText("normspace"));
2112
		jChkColon.setText(pServ.getText("normcolon"));
2113
		jChkSemicolon.setText(pServ.getText("normsemicolon"));
2114
		jChkOther.setText(pServ.getText("normother"));
2115
		jChkJoin.setText(pServ.getText("normjoin"));
2116
		jChkTab.setText(ps.getText("normtab"));
2117
		jChkSpace.setText(ps.getText("normspace"));
2118
		jChkColon.setText(ps.getText("normcolon"));
2119
		jChkSemicolon.setText(ps.getText("normsemicolon"));
2120
		jChkOther.setText(ps.getText("normother"));
2121
		jChkJoin.setText(ps.getText("normjoin"));
2116 2122

  
2117
		jPanInField.setBorder(BorderFactory.createTitledBorder(pServ
2123
		jPanInField.setBorder(BorderFactory.createTitledBorder(ps
2118 2124
				.getText("norminfieldseparators")));
2119
		jLabDecimal.setText(pServ.getText("normdecimal"));
2120
		jLabThousand.setText(pServ.getText("normthousand"));
2121
		jLabTextDel.setText(pServ.getText("normtextdelimiter"));
2125
		jLabDecimal.setText(ps.getText("normdecimal"));
2126
		jLabThousand.setText(ps.getText("normthousand"));
2127
		jLabTextDel.setText(ps.getText("normtextdelimiter"));
2122 2128

  
2123
		jButTest.setText(pServ.getText("normtest"));
2129
		jButTest.setText(ps.getText("normtest"));
2124 2130

  
2125
		jPanSampleOutput.setBorder(BorderFactory.createTitledBorder(pServ
2131
		jPanSampleOutput.setBorder(BorderFactory.createTitledBorder(ps
2126 2132
				.getText("normsampleout")));
2127 2133

  
2128
		jPanOutputOpt.setBorder(BorderFactory.createTitledBorder(pServ
2134
		jPanOutputOpt.setBorder(BorderFactory.createTitledBorder(ps
2129 2135
				.getText("normoutputopt")));
2130
		jRadioAlterTable.setText(pServ.getText("normaltertable"));
2131
		jRadioNewTable.setText(pServ.getText("normnewtable"));
2132
		jLabelSelFields.setText(pServ.getText("normjoinfield"));
2136
		jRadioAlterTable.setText(ps.getText("normaltertable"));
2137
		jRadioNewTable.setText(ps.getText("normnewtable"));
2138
		jLabelSelFields.setText(ps.getText("normjoinfield"));
2133 2139

  
2134
		jPanConsole.setBorder(BorderFactory.createTitledBorder(pServ
2140
		jPanConsole.setBorder(BorderFactory.createTitledBorder(ps
2135 2141
				.getText("normconsole")));
2136 2142

  
2137
		jButLoad.setText(pServ.getText("normload"));
2138
		jButSave.setText(pServ.getText("normsave"));
2139
		jButRun.setText(pServ.getText("normrun"));
2140
		jButCancel.setText(pServ.getText("normcancel"));
2143
		jButLoad.setText(ps.getText("normload"));
2144
		jButSave.setText(ps.getText("normsave"));
2145
		jButRun.setText(ps.getText("normrun"));
2146
		jButCancel.setText(ps.getText("normcancel"));
2141 2147
	}
2142 2148

  
2143 2149
	/**
......
2165 2171
	 */
2166 2172
	private void setImages() {
2167 2173

  
2168
		if (this.pServ == null)
2174
		if (this.ps == null)
2169 2175
			return;
2170 2176

  
2171
		String bDir = pServ.getClassLoader().getBaseDir();
2177
		String bDir = ps.getClassLoader().getBaseDir();
2172 2178

  
2173 2179
		jButFieldsUp.setIcon(new ImageIcon(bDir + File.separator + "images"
2174 2180
				+ File.separator + "icons16" + File.separator + "go-up.png"));
......
2207 2213
	}
2208 2214

  
2209 2215
	public Object getWindowProfile() {
2210
		// TODO Auto-generated method stub
2211 2216
		return null;
2212 2217
	}
2213 2218
}
trunk/extensions/extNormalization/src/org/gvsig/normalization/gui/NormPanelModel.java
37 37
import java.util.List;
38 38
import java.util.Locale;
39 39

  
40

  
41 40
import javax.swing.DefaultListModel;
42 41
import javax.swing.JFileChooser;
43 42
import javax.swing.JOptionPane;
......
143 142
		return uniqueInstance;
144 143
	}
145 144

  
146
	/* BUILDERS */
147

  
145
	/**
146
	 * Constructor
147
	 */
148 148
	private NormPanelModel() {
149 149
		initPattern();
150 150
	}
151 151

  
152
	// Constructors prior to the singleton pattern adoption
153

  
154
	// private NormPanelModel(Table tab2) {
155
	// this();
156
	// isFile = false;
157
	// /* Table */
158
	// this.tab = tab2;
159
	// }
160
	//
161
	// private NormPanelModel(ArrayList<String> arr, String _nameFile) {
162
	// this();
163
	// isFile = true;
164
	// /* all strings from file */
165
	// fileChains = arr;
166
	// /* file name */
167
	// nameFile = _nameFile;
168
	// /* Samples of strings */
169
	// getSamplesFromFile();
170
	// }
171

  
172 152
	/* METHODS */
173 153

  
174 154
	/**
......
270 250
		if (normAction instanceof NormalizationNewTable) {
271 251
			NormalizationNewTable normTable = (NormalizationNewTable) normAction;
272 252
			this.loadTable(normTable);
253
			addInfo(INFO + PluginServices.getText(null, "endnormalizing")
254
					+ " \n");
273 255
		}
274 256

  
275 257
		return true;

Also available in: Unified diff