Revision 3451 org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/java/org/gvsig/vcsgis/app/addlayer/AbstractWizardVCSGis.java
| AbstractWizardVCSGis.java | ||
|---|---|---|
| 584 | 584 |
if (notInSwingThreadInvokeLater(this::doChangeWorkspace)) {
|
| 585 | 585 |
return; |
| 586 | 586 |
} |
| 587 |
|
|
| 588 |
this.lwcTables.clearSelection(); |
|
| 587 | 589 |
|
| 588 | 590 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
| 589 | 591 |
VCSGisWorkspace workspace = workspacePicker.get(); |
| ... | ... | |
| 594 | 596 |
|
| 595 | 597 |
this.view.txtRepositoryInfo.setText(workspace.getRepository().getLabel()); |
| 596 | 598 |
|
| 599 |
reloadEntities(workspace, i18n); |
|
| 600 |
} |
|
| 601 |
|
|
| 602 |
private void reloadEntities(VCSGisWorkspace workspace, I18nManager i18n) {
|
|
| 597 | 603 |
this.tablesInfo = new HashMap<>(); |
| 598 | 604 |
|
| 599 | 605 |
//Rellenamos la lista de entidades |
| ... | ... | |
| 665 | 671 |
if( notInSwingThreadInvokeLater(() -> {doChangeTableSelected();}) ) {
|
| 666 | 672 |
return; |
| 667 | 673 |
} |
| 674 |
boolean updatedTableInfo = false; |
|
| 668 | 675 |
|
| 669 | 676 |
VCSGisEntity rEntity = getRemoteEntity(); |
| 670 |
VCSGisWorkspaceEntity lEntity; |
|
| 671 |
lEntity = getWorkspace().getWorkspaceEntity(rEntity.getEntityName()); |
|
| 672 |
if (lEntity == null) {
|
|
| 677 |
if(rEntity != null){
|
|
| 678 |
VCSGisWorkspaceEntity lEntity; |
|
| 679 |
lEntity = getWorkspace().getWorkspaceEntity(rEntity.getEntityName()); |
|
| 680 |
if(lEntity != null){
|
|
| 681 |
TableInfo tableInfo = tablesInfo.get(rEntity.getEntityName()); |
|
| 682 |
this.updateTableInfoFromUI(); |
|
| 683 |
this.put(tableInfo); |
|
| 684 |
updatedTableInfo = true; |
|
| 685 |
} else {
|
|
| 686 |
int index = this.lwcTables.getSelectedIndex(); |
|
| 687 |
this.lwcTables.getCheckedModel().removeIndexInterval(index, index); |
|
| 688 |
} |
|
| 689 |
} |
|
| 690 |
|
|
| 691 |
if(!updatedTableInfo){
|
|
| 673 | 692 |
this.clearTableConfig(); |
| 674 |
int index = this.lwcTables.getSelectedIndex(); |
|
| 675 |
this.lwcTables.getCheckedModel().removeIndexInterval(index, index); |
|
| 676 |
} else {
|
|
| 677 |
TableInfo tableInfo = tablesInfo.get(rEntity.getEntityName()); |
|
| 678 |
this.updateTableInfoFromUI(); |
|
| 679 |
this.put(tableInfo); |
|
| 680 | 693 |
} |
| 694 |
|
|
| 681 | 695 |
showMessage("");
|
| 682 | 696 |
doUpdateComponents(); |
| 683 | 697 |
} |
| ... | ... | |
| 959 | 973 |
); |
| 960 | 974 |
} finally {
|
| 961 | 975 |
processing = false; |
| 976 |
doChangeWorkspace(); |
|
| 977 |
// VCSGisWorkspaceEntity localEntity = workspace.getWorkspaceEntity(rEntity.getEntityName()); |
|
| 978 |
// if (localEntity != null) {
|
|
| 979 |
// lwcTables.setSelectedValue(localEntity, true); |
|
| 980 |
// } |
|
| 962 | 981 |
doUpdateComponents(); |
| 963 | 982 |
} |
| 964 | 983 |
}, "VCSGisAddTableCheckout"); |
Also available in: Unified diff