Revision 322
| 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 | ||
|---|---|---|
| 28 | 28 |
import org.slf4j.LoggerFactory; |
| 29 | 29 |
|
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 31 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 31 | 32 |
import org.gvsig.tools.dynobject.DynObject; |
| 32 | 33 |
import org.gvsig.tools.service.AbstractManager; |
| 33 | 34 |
import org.gvsig.tools.service.Service; |
| ... | ... | |
| 64 | 65 |
} |
| 65 | 66 |
|
| 66 | 67 |
public EditingService getEditingService(String name, |
| 67 |
FeatureStore featureStore) {
|
|
| 68 |
FeatureStore featureStore, MapContext mapContext) {
|
|
| 68 | 69 |
try {
|
| 69 | 70 |
DynObject params = this.createServiceParameters(name); |
| 70 | 71 |
params.setDynValue(EditingProviderFactory.FEATURE_STORE_FIELD, |
| 71 | 72 |
featureStore); |
| 73 |
params.setDynValue(EditingProviderFactory.MAPCONTEXT_FIELD, mapContext); |
|
| 72 | 74 |
return (EditingService) this.getService(params); |
| 73 | 75 |
} catch (ServiceException e) {
|
| 74 | 76 |
String msg = |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.autopolygon/src/main/java/org/gvsig/vectorediting/lib/prov/autopolygon/AutopolygonEditingProviderFactory.java | ||
|---|---|---|
| 73 | 73 |
|
| 74 | 74 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 75 | 75 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 76 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 76 | 77 |
|
| 77 | 78 |
return dynclass; |
| 78 | 79 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.internalpolygon/src/main/java/org/gvsig/vectorediting/lib/prov/internalpolygon/InternalPolygonEditingProviderFactory.java | ||
|---|---|---|
| 73 | 73 |
|
| 74 | 74 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 75 | 75 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 76 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 76 | 77 |
|
| 77 | 78 |
return dynclass; |
| 78 | 79 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circlecr/src/test/java/org/gvsig/vectorediting/lib/prov/circlecr/CircleCrTest.java | ||
|---|---|---|
| 40 | 40 |
import org.gvsig.fmap.geom.primitive.Circle; |
| 41 | 41 |
import org.gvsig.fmap.geom.primitive.Point; |
| 42 | 42 |
import org.gvsig.fmap.geom.primitive.Surface; |
| 43 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 44 |
import org.gvsig.fmap.mapcontext.ViewPort; |
|
| 43 | 45 |
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
| 44 | 46 |
import org.gvsig.vectorediting.lib.api.DrawingStatus; |
| 45 | 47 |
import org.gvsig.vectorediting.lib.api.EditingManager; |
| ... | ... | |
| 66 | 68 |
EditingManager editingManager; |
| 67 | 69 |
EditingService service; |
| 68 | 70 |
FeatureStore featureStoreTest; |
| 71 |
MapContext mapContextTest; |
|
| 69 | 72 |
|
| 70 | 73 |
@Override |
| 71 | 74 |
protected void doSetUp() throws Exception {
|
| ... | ... | |
| 81 | 84 |
+ e.getMessage()); |
| 82 | 85 |
} |
| 83 | 86 |
|
| 87 |
mapContextTest = |
|
| 88 |
new MapContext(new ViewPort(featureStoreTest |
|
| 89 |
.getDefaultFeatureType().getDefaultSRS())); |
|
| 90 |
|
|
| 84 | 91 |
service = |
| 85 | 92 |
editingManager.getEditingService( |
| 86 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 93 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 94 |
mapContextTest); |
|
| 87 | 95 |
|
| 88 | 96 |
service.start(); |
| 89 | 97 |
|
| ... | ... | |
| 156 | 164 |
|
| 157 | 165 |
service = |
| 158 | 166 |
editingManager.getEditingService( |
| 159 |
CircleCREditingProviderFactory.PROVIDER_NAME, null); |
|
| 167 |
CircleCREditingProviderFactory.PROVIDER_NAME, null, |
|
| 168 |
mapContextTest); |
|
| 160 | 169 |
|
| 161 | 170 |
service.start(); |
| 162 | 171 |
|
| ... | ... | |
| 214 | 223 |
|
| 215 | 224 |
service = |
| 216 | 225 |
editingManager.getEditingService( |
| 217 |
CircleCREditingProviderFactory.PROVIDER_NAME, null); |
|
| 226 |
CircleCREditingProviderFactory.PROVIDER_NAME, null, |
|
| 227 |
mapContextTest); |
|
| 218 | 228 |
|
| 219 | 229 |
service.start(); |
| 220 | 230 |
|
| ... | ... | |
| 239 | 249 |
service = |
| 240 | 250 |
editingManager.getEditingService( |
| 241 | 251 |
CircleCREditingProviderFactory.PROVIDER_NAME, |
| 242 |
featureStoreTest); |
|
| 252 |
featureStoreTest, mapContextTest);
|
|
| 243 | 253 |
|
| 244 | 254 |
service.start(); |
| 245 | 255 |
|
| ... | ... | |
| 446 | 456 |
public void testStart() {
|
| 447 | 457 |
service = |
| 448 | 458 |
editingManager.getEditingService( |
| 449 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 459 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 460 |
mapContextTest); |
|
| 450 | 461 |
|
| 451 | 462 |
try {
|
| 452 | 463 |
service.start(); |
| ... | ... | |
| 458 | 469 |
public void testStop() {
|
| 459 | 470 |
service = |
| 460 | 471 |
editingManager.getEditingService( |
| 461 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 472 |
CircleCREditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 473 |
mapContextTest); |
|
| 462 | 474 |
|
| 463 | 475 |
try {
|
| 464 | 476 |
service.start(); |
| 465 | 477 |
service.stop(); |
| 466 | 478 |
} catch (VectorEditingException e) {
|
| 467 |
fail("Unexpected exception starting or stopping service: " + e.getMessage());
|
|
| 468 |
} |
|
| 479 |
fail("Unexpected exception starting or stopping service: "
|
|
| 480 |
+ e.getMessage()); |
|
| 481 |
} |
|
| 469 | 482 |
} |
| 470 | 483 |
|
| 471 | 484 |
private FeatureStore openFeatureStoretest(String resourceName) |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circlecr/src/test/java/org/gvsig/vectorediting/lib/prov/circlecr/CircumferenceCRTest.java | ||
|---|---|---|
| 38 | 38 |
import org.gvsig.fmap.geom.aggregate.MultiCurve; |
| 39 | 39 |
import org.gvsig.fmap.geom.primitive.Arc; |
| 40 | 40 |
import org.gvsig.fmap.geom.primitive.Point; |
| 41 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 42 |
import org.gvsig.fmap.mapcontext.ViewPort; |
|
| 41 | 43 |
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
| 42 | 44 |
import org.gvsig.vectorediting.lib.api.EditingManager; |
| 43 | 45 |
import org.gvsig.vectorediting.lib.api.EditingService; |
| ... | ... | |
| 59 | 61 |
EditingManager editingManager; |
| 60 | 62 |
EditingService service; |
| 61 | 63 |
FeatureStore featureStoreTest; |
| 64 |
MapContext mapContextTest; |
|
| 62 | 65 |
|
| 63 | 66 |
@Override |
| 64 | 67 |
protected void doSetUp() throws Exception {
|
| ... | ... | |
| 73 | 76 |
fail("Unexpected exception" + e.getMessage());
|
| 74 | 77 |
} |
| 75 | 78 |
|
| 79 |
mapContextTest = |
|
| 80 |
new MapContext(new ViewPort(featureStoreTest |
|
| 81 |
.getDefaultFeatureType().getDefaultSRS())); |
|
| 82 |
|
|
| 76 | 83 |
service = |
| 77 | 84 |
editingManager.getEditingService( |
| 78 | 85 |
CircumferenceCREditingProviderFactory.PROVIDER_NAME, |
| 79 |
featureStoreTest); |
|
| 86 |
featureStoreTest, mapContextTest);
|
|
| 80 | 87 |
|
| 81 | 88 |
service.start(); |
| 82 | 89 |
} |
| ... | ... | |
| 151 | 158 |
|
| 152 | 159 |
service = |
| 153 | 160 |
editingManager.getEditingService( |
| 154 |
CircumferenceCREditingProviderFactory.PROVIDER_NAME, null); |
|
| 161 |
CircumferenceCREditingProviderFactory.PROVIDER_NAME, null, |
|
| 162 |
mapContextTest); |
|
| 155 | 163 |
|
| 156 | 164 |
service.start(); |
| 157 | 165 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circlecr/src/main/java/org/gvsig/vectorediting/lib/prov/circlecr/CircleCREditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
return dynclass; |
| 83 | 84 |
|
| 84 | 85 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circlecr/src/main/java/org/gvsig/vectorediting/lib/prov/circlecr/CircumferenceCREditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 79 |
return dynclass; |
| 79 | 80 |
|
| 80 | 81 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.scale/src/main/java/org/gvsig/vectorediting/lib/prov/scale/ScaleEditingProviderFactory.java | ||
|---|---|---|
| 77 | 77 |
|
| 78 | 78 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 79 | 79 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 80 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 80 | 81 |
|
| 81 | 82 |
return dynclass; |
| 82 | 83 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.line/src/main/java/org/gvsig/vectorediting/lib/prov/line/LineEditingProviderFactory.java | ||
|---|---|---|
| 100 | 100 |
|
| 101 | 101 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 102 | 102 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 103 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 103 | 104 |
|
| 104 | 105 |
return dynclass; |
| 105 | 106 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.point/src/test/java/org/gvsig/vectorediting/lib/prov/point/PointTest.java | ||
|---|---|---|
| 36 | 36 |
import org.gvsig.fmap.geom.GeometryLocator; |
| 37 | 37 |
import org.gvsig.fmap.geom.GeometryManager; |
| 38 | 38 |
import org.gvsig.fmap.geom.primitive.Point; |
| 39 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 40 |
import org.gvsig.fmap.mapcontext.ViewPort; |
|
| 39 | 41 |
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
| 40 | 42 |
import org.gvsig.vectorediting.lib.api.DrawingStatus; |
| 41 | 43 |
import org.gvsig.vectorediting.lib.api.EditingManager; |
| ... | ... | |
| 63 | 65 |
EditingManager editingManager; |
| 64 | 66 |
EditingService service; |
| 65 | 67 |
FeatureStore featureStoreTest; |
| 68 |
MapContext mapContextTest; |
|
| 66 | 69 |
|
| 67 | 70 |
@Override |
| 68 | 71 |
protected void doSetUp() throws Exception {
|
| ... | ... | |
| 78 | 81 |
+ e.getMessage()); |
| 79 | 82 |
} |
| 80 | 83 |
|
| 84 |
mapContextTest = |
|
| 85 |
new MapContext(new ViewPort(featureStoreTest |
|
| 86 |
.getDefaultFeatureType().getDefaultSRS())); |
|
| 87 |
|
|
| 81 | 88 |
service = |
| 82 | 89 |
editingManager.getEditingService( |
| 83 |
PointEditingProviderFactory.PROVIDER_NAME, |
|
| 84 |
featureStoreTest);
|
|
| 90 |
PointEditingProviderFactory.PROVIDER_NAME, featureStoreTest,
|
|
| 91 |
mapContextTest);
|
|
| 85 | 92 |
|
| 86 | 93 |
service.start(); |
| 87 | 94 |
} |
| ... | ... | |
| 127 | 134 |
|
| 128 | 135 |
service = |
| 129 | 136 |
editingManager.getEditingService( |
| 130 |
PointEditingProviderFactory.PROVIDER_NAME, null); |
|
| 137 |
PointEditingProviderFactory.PROVIDER_NAME, null, |
|
| 138 |
mapContextTest); |
|
| 131 | 139 |
|
| 132 | 140 |
service.start(); |
| 133 | 141 |
|
| ... | ... | |
| 177 | 185 |
|
| 178 | 186 |
service = |
| 179 | 187 |
editingManager.getEditingService( |
| 180 |
PointEditingProviderFactory.PROVIDER_NAME, null); |
|
| 188 |
PointEditingProviderFactory.PROVIDER_NAME, null, |
|
| 189 |
mapContextTest); |
|
| 181 | 190 |
|
| 182 | 191 |
point = geoManager.createPoint(0, 0, Geometry.SUBTYPES.GEOM2D); |
| 183 | 192 |
service.setValue(point); |
| ... | ... | |
| 288 | 297 |
public void testStart() {
|
| 289 | 298 |
service = |
| 290 | 299 |
editingManager.getEditingService( |
| 291 |
PointEditingProviderFactory.PROVIDER_NAME, |
|
| 292 |
featureStoreTest);
|
|
| 300 |
PointEditingProviderFactory.PROVIDER_NAME, featureStoreTest,
|
|
| 301 |
mapContextTest);
|
|
| 293 | 302 |
|
| 294 | 303 |
try {
|
| 295 | 304 |
service.start(); |
| ... | ... | |
| 301 | 310 |
public void testStop() {
|
| 302 | 311 |
service = |
| 303 | 312 |
editingManager.getEditingService( |
| 304 |
PointEditingProviderFactory.PROVIDER_NAME, |
|
| 305 |
featureStoreTest);
|
|
| 313 |
PointEditingProviderFactory.PROVIDER_NAME, featureStoreTest,
|
|
| 314 |
mapContextTest);
|
|
| 306 | 315 |
|
| 307 | 316 |
try {
|
| 308 | 317 |
service.start(); |
| 309 | 318 |
service.stop(); |
| 310 | 319 |
} catch (VectorEditingException e) {
|
| 311 |
fail("Unexpected exception starting or stopping service: " + e.getMessage());
|
|
| 312 |
} |
|
| 320 |
fail("Unexpected exception starting or stopping service: "
|
|
| 321 |
+ e.getMessage()); |
|
| 322 |
} |
|
| 313 | 323 |
} |
| 314 | 324 |
|
| 315 | 325 |
private FeatureStore openTestFeatureStore() throws Exception {
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.point/src/main/java/org/gvsig/vectorediting/lib/prov/point/PointEditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 79 |
|
| 79 | 80 |
return dynclass; |
| 80 | 81 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.spline/src/main/java/org/gvsig/vectorediting/lib/prov/spline/FilledSplineEditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
|
|
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 79 | 79 |
return dynclass; |
| 80 | 80 |
} |
| 81 | 81 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.spline/src/main/java/org/gvsig/vectorediting/lib/prov/spline/SplineEditingProviderFactory.java | ||
|---|---|---|
| 71 | 71 |
|
| 72 | 72 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 73 | 73 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 74 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 74 | 75 |
|
| 75 | 76 |
return dynclass; |
| 76 | 77 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.polyline/src/main/java/org/gvsig/vectorediting/lib/prov/polyline/PolygonEditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
|
| 83 | 84 |
return dynclass; |
| 84 | 85 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.polyline/src/main/java/org/gvsig/vectorediting/lib/prov/polyline/PolylineEditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 79 |
|
| 79 | 80 |
return dynclass; |
| 80 | 81 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.polyline/src/test/java/org/gvsig/vectorediting/lib/prov/polyline/PolylineTest.java | ||
|---|---|---|
| 40 | 40 |
import org.gvsig.fmap.geom.primitive.Curve; |
| 41 | 41 |
import org.gvsig.fmap.geom.primitive.Line; |
| 42 | 42 |
import org.gvsig.fmap.geom.primitive.Point; |
| 43 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 44 |
import org.gvsig.fmap.mapcontext.ViewPort; |
|
| 43 | 45 |
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
| 44 | 46 |
import org.gvsig.vectorediting.lib.api.DrawingStatus; |
| 45 | 47 |
import org.gvsig.vectorediting.lib.api.EditingService; |
| ... | ... | |
| 64 | 66 |
FeatureStore featureStoreTest; |
| 65 | 67 |
EditingService service; |
| 66 | 68 |
DataManager dataManager; |
| 69 |
MapContext mapContextTest; |
|
| 67 | 70 |
|
| 68 | 71 |
@Override |
| 69 | 72 |
protected void doSetUp() throws Exception {
|
| ... | ... | |
| 78 | 81 |
+ e.getMessage()); |
| 79 | 82 |
} |
| 80 | 83 |
|
| 84 |
mapContextTest = |
|
| 85 |
new MapContext(new ViewPort(featureStoreTest |
|
| 86 |
.getDefaultFeatureType().getDefaultSRS())); |
|
| 87 |
|
|
| 81 | 88 |
service = |
| 82 | 89 |
editingManager.getEditingService( |
| 83 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 90 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 91 |
mapContextTest); |
|
| 84 | 92 |
|
| 85 | 93 |
service.start(); |
| 86 | 94 |
|
| ... | ... | |
| 392 | 400 |
public void testStart() {
|
| 393 | 401 |
service = |
| 394 | 402 |
editingManager.getEditingService( |
| 395 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 403 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 404 |
mapContextTest); |
|
| 396 | 405 |
|
| 397 | 406 |
try {
|
| 398 | 407 |
service.start(); |
| ... | ... | |
| 404 | 413 |
public void testStop() {
|
| 405 | 414 |
service = |
| 406 | 415 |
editingManager.getEditingService( |
| 407 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest); |
|
| 416 |
PolylineEditingProviderFactory.PROVIDER_NAME, featureStoreTest, |
|
| 417 |
mapContextTest); |
|
| 408 | 418 |
|
| 409 | 419 |
try {
|
| 410 | 420 |
service.start(); |
| 411 | 421 |
service.stop(); |
| 412 | 422 |
} catch (VectorEditingException e) {
|
| 413 | 423 |
fail("Unexpected exception stopping service: " + e.getMessage());
|
| 414 |
}
|
|
| 424 |
} |
|
| 415 | 425 |
} |
| 416 | 426 |
|
| 417 | 427 |
private FeatureStore openTestFeatureStore() throws Exception {
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.simplify/src/main/java/org/gvsig/vectorediting/lib/prov/simplify/SimplifyEditingProviderFactory.java | ||
|---|---|---|
| 80 | 80 |
|
| 81 | 81 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 82 | 82 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 83 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 83 | 84 |
|
| 84 | 85 |
return dynclass; |
| 85 | 86 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.ellipse/src/main/java/org/gvsig/vectorediting/lib/prov/ellipse/EllipseEditingProviderFactory.java | ||
|---|---|---|
| 76 | 76 |
|
| 77 | 77 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 78 | 78 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 79 |
|
|
| 79 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 80 | 80 |
return dynclass; |
| 81 | 81 |
} |
| 82 | 82 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.ellipse/src/main/java/org/gvsig/vectorediting/lib/prov/ellipse/FilledEllipseEditingProviderFactory.java | ||
|---|---|---|
| 76 | 76 |
|
| 77 | 77 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 78 | 78 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 79 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 79 | 80 |
|
| 80 | 81 |
return dynclass; |
| 81 | 82 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.rotate/src/main/java/org/gvsig/vectorediting/lib/prov/rotate/RotateEditingProviderFactory.java | ||
|---|---|---|
| 77 | 77 |
|
| 78 | 78 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 79 | 79 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 80 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 80 | 81 |
|
| 81 | 82 |
return dynclass; |
| 82 | 83 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.join/src/main/java/org/gvsig/vectorediting/lib/prov/join/JoinEditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
|
| 83 | 84 |
return dynclass; |
| 84 | 85 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.explode/src/main/java/org/gvsig/vectorediting/lib/prov/explode/ExplodeEditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
return dynclass; |
| 83 | 84 |
} |
| 84 | 85 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.splitline/src/main/java/org/gvsig/vectorediting/lib/prov/splitline/SplitLineEditingProviderFactory.java | ||
|---|---|---|
| 72 | 72 |
|
| 73 | 73 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 74 | 74 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 75 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 75 | 76 |
|
| 76 | 77 |
return dynclass; |
| 77 | 78 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.rectangle/src/main/java/org/gvsig/vectorediting/lib/prov/rectangle/FilledRectangleEditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 79 |
|
| 79 | 80 |
return dynclass; |
| 80 | 81 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.rectangle/src/main/java/org/gvsig/vectorediting/lib/prov/rectangle/RectangleEditingProviderFactory.java | ||
|---|---|---|
| 83 | 83 |
|
| 84 | 84 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 85 | 85 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 86 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 86 | 87 |
|
| 87 | 88 |
return dynclass; |
| 88 | 89 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.multipoint/src/main/java/org/gvsig/vectorediting/lib/prov/multipoint/MultipointEditingProviderFactory.java | ||
|---|---|---|
| 71 | 71 |
|
| 72 | 72 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 73 | 73 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 74 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 74 | 75 |
|
| 75 | 76 |
return dynclass; |
| 76 | 77 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circle3p/src/main/java/org/gvsig/vectorediting/lib/prov/circle3p/Circumference3PEditingProviderFactory.java | ||
|---|---|---|
| 75 | 75 |
|
| 76 | 76 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 77 | 77 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 78 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 79 |
return dynclass; |
| 79 | 80 |
|
| 80 | 81 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.circle3p/src/main/java/org/gvsig/vectorediting/lib/prov/circle3p/Circle3PEditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
return dynclass; |
| 83 | 84 |
|
| 84 | 85 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.arc/src/main/java/org/gvsig/vectorediting/lib/prov/arc/ArcEditingProviderFactory.java | ||
|---|---|---|
| 22 | 22 |
* at info AT gvsig.com, or visit our website www.gvsig.com. |
| 23 | 23 |
*/ |
| 24 | 24 |
|
| 25 |
/* gvSIG. Desktop Geographic Information System. |
|
| 26 |
* |
|
| 27 |
* Copyright ? 2007-2014 gvSIG Association |
|
| 28 |
* |
|
| 29 |
* This program is free software; you can redistribute it and/or |
|
| 30 |
* modify it under the terms of the GNU General Public License |
|
| 31 |
* as published by the Free Software Foundation; either version 2 |
|
| 32 |
* of the License, or (at your option) any later version. |
|
| 33 |
* |
|
| 34 |
* This program is distributed in the hope that it will be useful, |
|
| 35 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 36 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 37 |
* GNU General Public License for more details. |
|
| 38 |
* |
|
| 39 |
* You should have received a copy of the GNU General Public License |
|
| 40 |
* along with this program; if not, write to the Free Software |
|
| 41 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
| 42 |
* MA 02110-1301, USA. |
|
| 43 |
* |
|
| 44 |
* For any additional information, do not hesitate to contact us |
|
| 45 |
* at info AT gvsig.com, or visit our website www.gvsig.com. |
|
| 46 |
*/ |
|
| 47 | 25 |
package org.gvsig.vectorediting.lib.prov.arc; |
| 48 | 26 |
|
| 49 | 27 |
import org.gvsig.fmap.geom.Geometry; |
| ... | ... | |
| 100 | 78 |
|
| 101 | 79 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 102 | 80 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 81 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 103 | 82 |
return dynclass; |
| 104 | 83 |
} |
| 105 | 84 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.move/src/main/java/org/gvsig/vectorediting/lib/prov/move/MoveEditingProviderFactory.java | ||
|---|---|---|
| 80 | 80 |
|
| 81 | 81 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 82 | 82 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 83 |
|
|
| 83 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 84 | 84 |
return dynclass; |
| 85 | 85 |
} |
| 86 | 86 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.regularpolygon/src/main/java/org/gvsig/vectorediting/lib/prov/regularpolygon/FilledRegularPolygonEditingProviderFactory.java | ||
|---|---|---|
| 96 | 96 |
|
| 97 | 97 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 98 | 98 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 99 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 99 | 100 |
|
| 100 | 101 |
return dynclass; |
| 101 | 102 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.regularpolygon/src/main/java/org/gvsig/vectorediting/lib/prov/regularpolygon/RegularPolygonEditingProviderFactory.java | ||
|---|---|---|
| 74 | 74 |
|
| 75 | 75 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 76 | 76 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 77 |
|
|
| 77 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 78 | 78 |
return dynclass; |
| 79 | 79 |
} |
| 80 | 80 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.duplicate/src/main/java/org/gvsig/vectorediting/lib/prov/duplicate/DuplicateEditingProviderFactory.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 81 | 81 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 82 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 82 | 83 |
return dynclass; |
| 83 | 84 |
} |
| 84 | 85 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.stretch/src/main/java/org/gvsig/vectorediting/lib/prov/stretch/StretchEditingProviderFactory.java | ||
|---|---|---|
| 55 | 55 |
|
| 56 | 56 |
dynclass.addDynFieldString(PROVIDER_NAME_FIELD); |
| 57 | 57 |
dynclass.addDynFieldObject(FEATURE_STORE_FIELD); |
| 58 |
dynclass.addDynFieldObject(MAPCONTEXT_FIELD); |
|
| 58 | 59 |
|
| 59 | 60 |
return dynclass; |
| 60 | 61 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.api/src/main/java/org/gvsig/vectorediting/lib/api/EditingManager.java | ||
|---|---|---|
| 25 | 25 |
package org.gvsig.vectorediting.lib.api; |
| 26 | 26 |
|
| 27 | 27 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 28 |
import org.gvsig.fmap.mapcontext.MapContext; |
|
| 28 | 29 |
import org.gvsig.tools.service.Manager; |
| 29 | 30 |
import org.gvsig.vectorediting.lib.api.exceptions.ServiceInformationException; |
| 30 | 31 |
|
| ... | ... | |
| 62 | 63 |
* @param featureStore |
| 63 | 64 |
* FeatureStore associated with this service necessary to |
| 64 | 65 |
* create, update and remove geometries. |
| 66 |
* @param mapContext |
|
| 67 |
* of layer in editing mode |
|
| 65 | 68 |
* @return An <code> EditingService </code> object. See |
| 66 | 69 |
* {@link EditingService} .
|
| 67 | 70 |
*/ |
| 68 | 71 |
public EditingService getEditingService(String name, |
| 69 |
FeatureStore featureStore); |
|
| 72 |
FeatureStore featureStore, MapContext mapContext);
|
|
| 70 | 73 |
} |
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.spi/src/main/java/org/gvsig/vectorediting/lib/spi/DefaultEditingServiceinfo.java | ||
|---|---|---|
| 89 | 89 |
if (this.parameters == null) {
|
| 90 | 90 |
EditingManager manager = EditingLocator.getManager(); |
| 91 | 91 |
EditingService editingService = |
| 92 |
manager.getEditingService(this.name, null); |
|
| 92 |
manager.getEditingService(this.name, null, null);
|
|
| 93 | 93 |
this.parameters = editingService.getParameters(); |
| 94 | 94 |
} |
| 95 | 95 |
|
| org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.spi/src/main/java/org/gvsig/vectorediting/lib/spi/EditingProviderFactory.java | ||
|---|---|---|
| 45 | 45 |
* Name of provider name field |
| 46 | 46 |
*/ |
| 47 | 47 |
public static final String PROVIDER_NAME_FIELD = "providerName"; |
| 48 |
|
|
| 49 |
/** |
|
| 50 |
* Name of MapContext field |
|
| 51 |
*/ |
|
| 52 |
public static final String MAPCONTEXT_FIELD = "mapContext"; |
|
| 48 | 53 |
|
| 49 | 54 |
/** |
| 50 | 55 |
* Gets read only information about a service such as if creates new |
Also available in: Unified diff