Revision 27465 branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/address/AddressComposedPanel.java

View differences:

AddressComposedPanel.java
27 27

  
28 28
package org.gvsig.geocoding.gui.address;
29 29

  
30

  
31

  
32 30
import java.awt.Color;
31
import java.awt.event.KeyEvent;
32
import java.awt.event.KeyListener;
33 33
import java.io.File;
34 34
import java.util.ArrayList;
35 35
import java.util.Iterator;
......
55 55
import org.gvsig.geocoding.AddressComponent;
56 56
import org.gvsig.geocoding.ComposeAddress;
57 57
import org.gvsig.geocoding.Literal;
58
import org.gvsig.geocoding.NumberAddress;
59 58
import org.gvsig.geocoding.RelationsComponent;
60 59
import org.gvsig.geocoding.extension.GeocoController;
61 60
import org.gvsig.geocoding.gui.newpattern.ComboDesc;
......
75 74

  
76 75
	private static final long serialVersionUID = 1L;
77 76
	private Logger log = LoggerFactory.getLogger(AddressComposedPanel.class);
78
	
77

  
79 78
	private GeocoController control = null;
80 79

  
81 80
	private JLabel jLabTypeBetween;
......
205 204
				return canEdit[columnIndex];
206 205
			}
207 206
		});
207
		
208 208
		jScrollAddressCross.setViewportView(jTableAddressCross);
209 209

  
210 210
		gridBagConstraints = new java.awt.GridBagConstraints();
......
256 256
						return canEdit[columnIndex];
257 257
					}
258 258
				});
259
		
259 260
		jScrollAddressBetween.setViewportView(jTableAddressBetween);
260 261

  
261 262
		gridBagConstraints = new java.awt.GridBagConstraints();
......
417 418
	 * @return
418 419
	 */
419 420
	public Address getSimpleAddress() {
421
		
422
		jTableAddressCross.validate();
423
		jTableAddressBetween.validate();
424
		jTableAddressCross.setRowSelectionInterval(0, 0);
425
		jTableAddressBetween.setRowSelectionInterval(0, 0);
420 426
		int n = jTabbedComposed.getSelectedIndex();
421 427
		DefaultTableModel model = null;
422
		if(n == 0){
428
		if (n == 0) {
423 429
			jTableAddressCross.setRowSelectionInterval(0, 0);
424
			model = (DefaultTableModel)jTableAddressCross.getModel();
430
			model = (DefaultTableModel) jTableAddressCross.getModel();
425 431
		}
426
		if(n == 1){
432
		if (n == 1) {
427 433
			jTableAddressBetween.setRowSelectionInterval(0, 0);
428
			model = (DefaultTableModel)jTableAddressBetween.getModel();
434
			model = (DefaultTableModel) jTableAddressBetween.getModel();
429 435
		}
430
		
436

  
431 437
		ComposeAddress address = new ComposeAddress();
432 438
		Literal mainLiteral = new Literal();
433 439
		Literal literal2 = new Literal();
......
470 476
	 * @return
471 477
	 */
472 478
	public Address getTableAddress(DefaultTableModel model, int row) {
479
		
480
		jTableAddressCross.validate();
481
		jTableAddressCross.setRowSelectionInterval(0, 0);
482
		jTableAddressBetween.validate();
483
		jTableAddressBetween.setRowSelectionInterval(0, 0);
473 484
		// Get store from Gmodel and the feature
474 485
		FeatureStore store = control.getGmodel().getSelectedTableStore();
475 486
		FeatureSet features = null;
......
506 517
			mainLiteral.add(new AddressComponent(key, value1));
507 518
			literal2.add(new AddressComponent(key, value2));
508 519
		}
509
		
520

  
510 521
		address.setMainLiteral(mainLiteral);
511 522
		intersectionLiterals.add(literal2);
512
		
523

  
513 524
		// get third address if exist
514 525
		int num = ((Vector) vec.elementAt(0)).size();
515 526
		if (num == 4) {
......
525 536
			}
526 537
			intersectionLiterals.add(literal3);
527 538
		}
528
		address.setIntersectionLiteral(intersectionLiterals);		
539
		address.setIntersectionLiteral(intersectionLiterals);
529 540

  
530 541
		return address;
531 542
	}
532 543

  
544

  
545

  
533 546
}

Also available in: Unified diff