Revision 2616 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/RegularPolygonEditingProvider.java
RegularPolygonEditingProvider.java | ||
---|---|---|
29 | 29 |
import java.util.LinkedHashMap; |
30 | 30 |
import java.util.List; |
31 | 31 |
import java.util.Map; |
32 |
|
|
33 | 32 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
34 | 33 |
import org.gvsig.fmap.geom.Geometry; |
35 | 34 |
import org.gvsig.fmap.geom.Geometry.SUBTYPES; |
... | ... | |
111 | 110 |
"sides_of_regular_polygon", EditingServiceParameter.TYPE.VALUE); |
112 | 111 |
|
113 | 112 |
I18nManager i18nManager = ToolsLocator.getI18nManager(); |
114 |
options = new LinkedHashMap<String, String>();
|
|
113 |
options = new LinkedHashMap<>(); |
|
115 | 114 |
options.put(i18nManager.getTranslation("key_inscribed"), "inscribed"); |
116 | 115 |
options.put(i18nManager.getTranslation("key_circumscribed"), |
117 | 116 |
"circumscribed"); |
... | ... | |
151 | 150 |
return this.defaultValues; |
152 | 151 |
} |
153 | 152 |
|
153 |
@Override |
|
154 | 154 |
public EditingServiceParameter next() { |
155 | 155 |
if (values.get(polygonSides) == null) { |
156 | 156 |
return polygonSides; |
... | ... | |
164 | 164 |
return null; |
165 | 165 |
} |
166 | 166 |
|
167 |
@Override |
|
167 | 168 |
public DrawingStatus getDrawingStatus(Point mousePosition) |
168 | 169 |
throws DrawServiceException { |
169 | 170 |
DefaultDrawingStatus drawingStatus = new DefaultDrawingStatus(); |
... | ... | |
172 | 173 |
ISymbol lineSymbolEditing = editingProviderManager.getSymbol("line-symbol-editing"); |
173 | 174 |
ISymbol auxiliaryLineSymbolEditing = editingProviderManager.getSymbol("auxiliary-line-symbol-editing"); |
174 | 175 |
ISymbol auxiliaryPointSymbolEditing = editingProviderManager.getSymbol("auxiliary-point-symbol-editing"); |
176 |
|
|
177 |
ISymbol previewSymbol = this.getPreviewSymbol(); |
|
178 |
|
|
175 | 179 |
GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
176 | 180 |
|
177 | 181 |
if (values != null) { |
... | ... | |
207 | 211 |
drawingStatus.addStatus(circumference, auxiliaryLineSymbolEditing, ""); |
208 | 212 |
if(polygon!=null){ |
209 | 213 |
drawingStatus.addStatus(polygon, lineSymbolEditing, ""); |
214 |
drawingStatus.addStatus(polygon, previewSymbol, ""); |
|
210 | 215 |
} |
211 | 216 |
drawingStatus.addStatus(centerValue, auxiliaryPointSymbolEditing, ""); |
212 | 217 |
drawingStatus.addStatus(line, auxiliaryLineSymbolEditing, ""); |
... | ... | |
227 | 232 |
* of polygon (inscribed or circumscribed). |
228 | 233 |
* @param centerValue |
229 | 234 |
* of polygon |
230 |
* @param pointOfCircleValue
|
|
235 |
* @param pointOfCircle |
|
231 | 236 |
* of circle that inscribe or circumscribe polygon |
232 | 237 |
* @param sidesValue |
233 | 238 |
* number of sides. |
239 |
* @return |
|
240 |
* @throws org.gvsig.tools.exception.BaseException |
|
234 | 241 |
*/ |
235 | 242 |
protected Curve calculateRegularPolygon(String modeValue, |
236 | 243 |
Point centerValue, Point pointOfCircle, int sidesValue) |
... | ... | |
327 | 334 |
* |
328 | 335 |
* @param geometry |
329 | 336 |
* to be closed. |
337 |
* @return |
|
330 | 338 |
*/ |
331 | 339 |
protected Geometry closeGeometry(Geometry geometry) { |
332 | 340 |
|
... | ... | |
374 | 382 |
return false; |
375 | 383 |
} |
376 | 384 |
|
385 |
@Override |
|
377 | 386 |
public void stop() throws StopServiceException { |
378 | 387 |
if (values != null) { |
379 | 388 |
values.clear(); |
380 | 389 |
} |
381 | 390 |
} |
382 | 391 |
|
392 |
@Override |
|
383 | 393 |
public List<EditingServiceParameter> getParameters() { |
384 | 394 |
List<EditingServiceParameter> parameters = |
385 |
new ArrayList<EditingServiceParameter>();
|
|
395 |
new ArrayList<>(); |
|
386 | 396 |
parameters.add(polygonSides); |
387 | 397 |
parameters.add(mode); |
388 | 398 |
parameters.add(center); |
... | ... | |
396 | 406 |
validateAndInsertValue(parameter, value); |
397 | 407 |
} |
398 | 408 |
|
409 |
@Override |
|
399 | 410 |
public void setValue(Object value) throws InvalidEntryException { |
400 | 411 |
EditingServiceParameter parameter = next(); |
401 | 412 |
validateAndInsertValue(parameter, value); |
... | ... | |
477 | 488 |
throw new InvalidEntryException(null); |
478 | 489 |
} |
479 | 490 |
|
491 |
@Override |
|
480 | 492 |
public Geometry finish() throws FinishServiceException { |
481 | 493 |
|
482 | 494 |
if (values != null) { |
... | ... | |
514 | 526 |
return null; |
515 | 527 |
} |
516 | 528 |
|
529 |
@Override |
|
517 | 530 |
public void finishAndStore() throws FinishServiceException { |
518 | 531 |
try { |
519 | 532 |
Geometry geometry = finish(); |
... | ... | |
529 | 542 |
|
530 | 543 |
} |
531 | 544 |
|
545 |
@Override |
|
532 | 546 |
public void start() throws StartServiceException { |
533 |
values = new HashMap<EditingServiceParameter, Object>();
|
|
547 |
values = new HashMap<>(); |
|
534 | 548 |
} |
535 | 549 |
|
550 |
@Override |
|
536 | 551 |
public String getName() { |
537 | 552 |
return RegularPolygonEditingProviderFactory.PROVIDER_NAME; |
538 | 553 |
} |
Also available in: Unified diff