Revision 27905 branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/address/AddressComposedPanel.java
| AddressComposedPanel.java | ||
|---|---|---|
| 50 | 50 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 51 | 51 |
import org.gvsig.fmap.dal.feature.FeatureSet; |
| 52 | 52 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 53 |
import org.gvsig.geocoding.Address; |
|
| 54 |
import org.gvsig.geocoding.AddressComponent; |
|
| 55 |
import org.gvsig.geocoding.ComposedAddress; |
|
| 56 |
import org.gvsig.geocoding.Literal; |
|
| 57 |
import org.gvsig.geocoding.RelationsComponent; |
|
| 53 |
import org.gvsig.geocoding.address.Address; |
|
| 54 |
import org.gvsig.geocoding.address.ComposedAddress; |
|
| 55 |
import org.gvsig.geocoding.address.Literal; |
|
| 56 |
import org.gvsig.geocoding.address.RelationsComponent; |
|
| 57 |
import org.gvsig.geocoding.address.impl.DefaultAddressComponent; |
|
| 58 |
import org.gvsig.geocoding.address.impl.DefaultComposedAddress; |
|
| 59 |
import org.gvsig.geocoding.address.impl.DefaultLiteral; |
|
| 58 | 60 |
import org.gvsig.geocoding.extension.GeocodingController; |
| 59 | 61 |
import org.gvsig.geocoding.utils.ComboFieldDescName; |
| 60 | 62 |
import org.slf4j.Logger; |
| ... | ... | |
| 515 | 517 |
model = (DefaultTableModel) jTableAddressBetween.getModel(); |
| 516 | 518 |
} |
| 517 | 519 |
|
| 518 |
ComposedAddress address = new ComposedAddress(); |
|
| 519 |
Literal mainLiteral = new Literal(); |
|
| 520 |
Literal literal2 = new Literal(); |
|
| 521 |
Literal literal3 = new Literal(); |
|
| 520 |
ComposedAddress address = new DefaultComposedAddress();
|
|
| 521 |
Literal mainLiteral = new DefaultLiteral();
|
|
| 522 |
Literal literal2 = new DefaultLiteral();
|
|
| 523 |
Literal literal3 = new DefaultLiteral();
|
|
| 522 | 524 |
List<Literal> intersectionLiterals = new ArrayList<Literal>(); |
| 523 | 525 |
Vector vec = model.getDataVector(); |
| 524 | 526 |
// get main and secon address |
| ... | ... | |
| 527 | 529 |
String key = (String) vecc.elementAt(0); |
| 528 | 530 |
String value = (String) vecc.elementAt(1); |
| 529 | 531 |
String value2 = (String) vecc.elementAt(2); |
| 530 |
mainLiteral.add(new AddressComponent(key, value)); |
|
| 531 |
literal2.add(new AddressComponent(key, value2)); |
|
| 532 |
mainLiteral.add(new DefaultAddressComponent(key, value));
|
|
| 533 |
literal2.add(new DefaultAddressComponent(key, value2));
|
|
| 532 | 534 |
} |
| 533 | 535 |
address.setMainLiteral(mainLiteral); |
| 534 | 536 |
intersectionLiterals.add(literal2); |
| ... | ... | |
| 539 | 541 |
Vector vecc = (Vector) vec.elementAt(i); |
| 540 | 542 |
String key = (String) vecc.elementAt(0); |
| 541 | 543 |
String value3 = (String) vecc.elementAt(3); |
| 542 |
literal3.add(new AddressComponent(key, value3)); |
|
| 544 |
literal3.add(new DefaultAddressComponent(key, value3));
|
|
| 543 | 545 |
} |
| 544 | 546 |
intersectionLiterals.add(literal3); |
| 545 | 547 |
} |
| ... | ... | |
| 588 | 590 |
} |
| 589 | 591 |
|
| 590 | 592 |
// Create the address |
| 591 |
ComposedAddress address = new ComposedAddress(); |
|
| 592 |
Literal mainLiteral = new Literal(); |
|
| 593 |
Literal literal2 = new Literal(); |
|
| 594 |
Literal literal3 = new Literal(); |
|
| 593 |
ComposedAddress address = new DefaultComposedAddress();
|
|
| 594 |
Literal mainLiteral = new DefaultLiteral();
|
|
| 595 |
Literal literal2 = new DefaultLiteral();
|
|
| 596 |
Literal literal3 = new DefaultLiteral();
|
|
| 595 | 597 |
List<Literal> intersectionLiterals = new ArrayList<Literal>(); |
| 596 | 598 |
Vector vec = model.getDataVector(); |
| 597 | 599 |
|
| ... | ... | |
| 608 | 610 |
Object obj2 = feature.get(fieldName2); |
| 609 | 611 |
String value1 = obj1.toString(); |
| 610 | 612 |
String value2 = obj2.toString(); |
| 611 |
mainLiteral.add(new AddressComponent(key, value1)); |
|
| 612 |
literal2.add(new AddressComponent(key, value2)); |
|
| 613 |
mainLiteral.add(new DefaultAddressComponent(key, value1));
|
|
| 614 |
literal2.add(new DefaultAddressComponent(key, value2));
|
|
| 613 | 615 |
} |
| 614 | 616 |
|
| 615 | 617 |
address.setMainLiteral(mainLiteral); |
| ... | ... | |
| 626 | 628 |
String fieldName3 = desc3.getName(); |
| 627 | 629 |
Object obj3 = feature.get(fieldName3); |
| 628 | 630 |
String value3 = obj3.toString(); |
| 629 |
literal3.add(new AddressComponent(key, value3)); |
|
| 631 |
literal3.add(new DefaultAddressComponent(key, value3));
|
|
| 630 | 632 |
} |
| 631 | 633 |
intersectionLiterals.add(literal3); |
| 632 | 634 |
} |
Also available in: Unified diff