Revision 2616 org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.impl/src/main/java/org/gvsig/vectorediting/lib/impl/DefaultEditingManager.java

View differences:

DefaultEditingManager.java
25 25
package org.gvsig.vectorediting.lib.impl;
26 26

  
27 27
import org.gvsig.fmap.dal.exception.DataException;
28
import org.slf4j.Logger;
29
import org.slf4j.LoggerFactory;
30

  
31 28
import org.gvsig.fmap.dal.feature.FeatureStore;
32 29
import org.gvsig.fmap.mapcontext.MapContext;
30
import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend;
33 31
import org.gvsig.tools.dynobject.DynObject;
34 32
import org.gvsig.tools.service.AbstractManager;
35 33
import org.gvsig.tools.service.Service;
......
42 40
import org.gvsig.vectorediting.lib.spi.EditingProviderFactory;
43 41
import org.gvsig.vectorediting.lib.spi.EditingProviderLocator;
44 42
import org.gvsig.vectorediting.lib.spi.EditingProviderServices;
43
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
45 45

  
46 46
public class DefaultEditingManager extends AbstractManager implements
47 47
EditingManager {
......
55 55

  
56 56
    public Service getService(DynObject arg0) throws ServiceException {
57 57
        EditingProviderServices editingProviderServices = new DefaultEditingProviderServices();
58
        EditingProvider provider = (EditingProvider) EditingProviderLocator.getProviderManager()
59
            .createProvider(arg0, editingProviderServices);
60
        FeatureStore store = (FeatureStore) arg0.getDynValue(EditingProviderFactory.FEATURE_STORE_FIELD);
61
        try {
62
            editingProviderServices.setDefaultFeatureValues(store.createNewFeature());
63
        } catch (DataException ex) {
64
        }
65
        return new DefaultEditingService(provider, arg0);
58
        DefaultEditingService service = new DefaultEditingService(arg0, editingProviderServices);
59
        
60
//        DefaultEditingProviderServices editingProviderServices = new DefaultEditingProviderServices();
61
//        EditingProvider provider = (EditingProvider) EditingProviderLocator.getProviderManager()
62
//            .createProvider(arg0, editingProviderServices);
63
//        FeatureStore store = (FeatureStore) arg0.getDynValue(EditingProviderFactory.FEATURE_STORE_FIELD);
64
//        try {
65
//            editingProviderServices.setDefaultFeatureValues(store.createNewFeature());
66
//        } catch (DataException ex) {
67
//        }
68
//        DefaultEditingService service = new DefaultEditingService(provider, arg0);
69
//        editingProviderServices.setService(service);
70
        return service;
66 71
    }
67 72

  
68 73
    public EditingServiceInfo getServiceInfo(String serviceName)
......
73 78

  
74 79
    @Override
75 80
    public EditingService getEditingService(String name,
76
        FeatureStore featureStore, MapContext mapContext) {
81
        FeatureStore featureStore, MapContext mapContext, IVectorLegend legend) {
77 82
        try {
78 83
            DynObject params = this.createServiceParameters(name);
79 84
            params.setDynValue(EditingProviderFactory.FEATURE_STORE_FIELD,
80 85
                featureStore);
81 86
            params.setDynValue(EditingProviderFactory.MAPCONTEXT_FIELD, mapContext);
87
            if(legend != null && params.getDynClass().getDynField(EditingProviderFactory.LEGEND_FIELD)!=null){
88
                params.setDynValue(EditingProviderFactory.LEGEND_FIELD, legend);
89
            }
82 90
            return (EditingService) this.getService(params);
83 91
        } catch (ServiceException e) {
84 92
            String msg =
......
91 99

  
92 100
        return null;
93 101
    }
102

  
103
    @Override
104
    public EditingService getEditingService(String name, FeatureStore featureStore, MapContext mapContext) {
105
        return getEditingService(name, featureStore, mapContext, null);
106
    }
94 107
    
108
    
109
    
95 110
}

Also available in: Unified diff