Revision 3951
| org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/workspace/VCSGisWorkspaceImpl.java | ||
|---|---|---|
| 49 | 49 |
import org.gvsig.json.Json; |
| 50 | 50 |
import org.gvsig.tools.ToolsLocator; |
| 51 | 51 |
import org.gvsig.tools.dataTypes.DataTypes; |
| 52 |
import org.gvsig.tools.dispose.Disposable; |
|
| 53 | 52 |
import org.gvsig.tools.dispose.DisposableIterable; |
| 54 | 53 |
import org.gvsig.tools.dispose.DisposeUtils; |
| 55 | 54 |
import org.gvsig.tools.dispose.impl.AbstractDisposable; |
| ... | ... | |
| 136 | 135 |
import org.gvsig.vcsgis.lib.workspace.tables.EntitiesTable.EntityRow; |
| 137 | 136 |
import org.gvsig.vcsgis.lib.workspace.tables.LocalRevisionsTable; |
| 138 | 137 |
import org.gvsig.vcsgis.lib.workspace.tables.LocalRevisionsTable.LocalRevisionRow; |
| 139 |
import static org.gvsig.vcsgis.lib.workspace.tables.LocalRevisionsTable.TABLE_NAME; |
|
| 140 | 138 |
import org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable; |
| 141 | 139 |
import static org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable.COD_ENTITY; |
| 142 | 140 |
import org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable.RemoteChangeRow; |
| ... | ... | |
| 150 | 148 |
|
| 151 | 149 |
/** |
| 152 | 150 |
* |
| 153 |
* @author gvSIG Teammerge
|
|
| 151 |
* @author gvSIG Team |
|
| 154 | 152 |
*/ |
| 155 | 153 |
@SuppressWarnings({"UseSpecificCatch", "UnusedAssignment"})
|
| 156 | 154 |
public class VCSGisWorkspaceImpl extends AbstractDisposable implements VCSGisWorkspace {
|
| ... | ... | |
| 254 | 252 |
} |
| 255 | 253 |
|
| 256 | 254 |
private String getMessageLabel() {
|
| 257 |
return this.wsexplorer.getParameters().getUrl(); |
|
| 255 |
try {
|
|
| 256 |
return this.wsexplorer.getParameters().getUrl(); |
|
| 257 |
} catch (Exception ex) {
|
|
| 258 |
return "unknown"; |
|
| 259 |
} |
|
| 258 | 260 |
} |
| 259 | 261 |
|
| 260 | 262 |
@Override |
| ... | ... | |
| 342 | 344 |
// return entity; |
| 343 | 345 |
// } |
| 344 | 346 |
@Override |
| 345 |
public void reloadWorkspaceEntities() {
|
|
| 347 |
public final void reloadWorkspaceEntities() {
|
|
| 346 | 348 |
FeatureStore store = null; |
| 347 | 349 |
FeatureSet featureSet = null; |
| 348 | 350 |
try {
|
| ... | ... | |
| 653 | 655 |
} |
| 654 | 656 |
|
| 655 | 657 |
@Override |
| 656 |
public String createUniqueCode() {
|
|
| 658 |
public final String createUniqueCode() {
|
|
| 657 | 659 |
return this.codeGenerator.generateCode(); |
| 658 | 660 |
} |
| 659 | 661 |
|
| ... | ... | |
| 1433 | 1435 |
return Timestamp.from(LocalDateTime.now().toInstant(ZoneOffset.UTC)); |
| 1434 | 1436 |
} |
| 1435 | 1437 |
|
| 1438 |
@Override |
|
| 1436 | 1439 |
public List<VCSGisEntity> getEntitiesOfLocalChanges() {
|
| 1437 | 1440 |
WorkspaceChangesTable changesTable = new WorkspaceChangesTable(); |
| 1438 | 1441 |
List<VCSGisEntity> entities = new ArrayList<>(); |
| ... | ... | |
| 1871 | 1874 |
} |
| 1872 | 1875 |
} |
| 1873 | 1876 |
|
| 1877 |
@Override |
|
| 1874 | 1878 |
public void updateTopologyPlansFromRepository(SimpleTaskStatus status) {
|
| 1875 | 1879 |
FeatureStore topologyPlanStore = null; |
| 1876 | 1880 |
VCSGisTopologyPlansRequest request = null; |
| ... | ... | |
| 3198 | 3202 |
} |
| 3199 | 3203 |
} |
| 3200 | 3204 |
|
| 3205 |
@Override |
|
| 3201 | 3206 |
public int authenticate(String userId, String password, SimpleTaskStatus status) {
|
| 3202 | 3207 |
int errcode = ERR_OK; |
| 3203 | 3208 |
if (status == null) {
|
| ... | ... | |
| 3405 | 3410 |
DisposeUtils.disposeQuietly(target); |
| 3406 | 3411 |
} |
| 3407 | 3412 |
} |
| 3413 |
@Override |
|
| 3408 | 3414 |
public int revert(String nameOrCode) {
|
| 3409 | 3415 |
return revert(nameOrCode, null); |
| 3410 | 3416 |
} |
Also available in: Unified diff