Revision 25920
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/MapContextLibrary.java | ||
---|---|---|
60 | 60 |
if (fLayerDynClass == null) { |
61 | 61 |
fLayerDynClass = dynManager.add(FLayer.DYNCLASS_NAME); |
62 | 62 |
|
63 |
field = fLayerDynClass.addDynField("name"); |
|
64 |
field.setType(DataTypes.STRING); |
|
65 |
|
|
63 | 66 |
field = fLayerDynClass.addDynField("SRS"); |
64 | 67 |
field.setType(DataTypes.OBJECT); |
65 |
|
|
66 |
field = fLayerDynClass.addDynField("Envelope"); |
|
67 |
field.setType(DataTypes.OBJECT); |
|
68 | 68 |
} |
69 | 69 |
|
70 | 70 |
|
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLyrDefault.java | ||
---|---|---|
64 | 64 |
import org.gvsig.fmap.mapcontext.layers.operations.ComposedLayer; |
65 | 65 |
import org.gvsig.fmap.mapcontext.rendering.legend.events.LegendChangedEvent; |
66 | 66 |
import org.gvsig.fmap.mapcontext.rendering.legend.events.listeners.LegendListener; |
67 |
import org.gvsig.tools.ToolsLocator; |
|
67 | 68 |
import org.gvsig.tools.dynobject.DelegatedDynObject; |
68 | 69 |
import org.gvsig.tools.dynobject.DynClass; |
69 | 70 |
import org.gvsig.tools.dynobject.DynObject; |
... | ... | |
132 | 133 |
|
133 | 134 |
/** |
134 | 135 |
* Projection for this layer. |
135 |
* |
|
136 |
*
|
|
136 | 137 |
* @see #getProjection() |
137 | 138 |
* @see #setProjection(IProjection) |
139 |
* |
|
140 |
* @deprecated value stored en delegatedDynObject |
|
138 | 141 |
*/ |
139 |
private IProjection projection; |
|
142 |
private IProjection projectionx;
|
|
140 | 143 |
|
141 | 144 |
/** |
142 | 145 |
* Transparency level of this layer in the range 0-255. By default 255. |
... | ... | |
237 | 240 |
private Image tocStatusImage; |
238 | 241 |
|
239 | 242 |
protected DelegatedDynObject delegatedDynObject; |
243 |
|
|
244 |
public FLyrDefault() { |
|
245 |
this.delegatedDynObject = (DelegatedDynObject) ToolsLocator |
|
246 |
.getDynObjectManager() |
|
247 |
.createDynObject(FLayer.DYNCLASS_NAME); |
|
248 |
} |
|
249 |
|
|
250 |
|
|
240 | 251 |
/* |
241 | 252 |
* (non-Javadoc) |
242 | 253 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperty(java.lang.Object) |
... | ... | |
281 | 292 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#setName(java.lang.String) |
282 | 293 |
*/ |
283 | 294 |
public void setName(String name) { |
284 |
namex = name; //FIXME |
|
285 |
// this.delegatedDynObject.setDynValue("name", name); |
|
295 |
this.delegatedDynObject.setDynValue("name", name); |
|
286 | 296 |
callNameChanged(LayerEvent.createNameChangedEvent(this, "name")); |
287 | 297 |
} |
288 | 298 |
|
... | ... | |
291 | 301 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getName() |
292 | 302 |
*/ |
293 | 303 |
public String getName() { |
294 |
return namex; //FIXME |
|
295 |
// return (String) this.delegatedDynObject.getDynValue("name"); |
|
304 |
return (String) this.delegatedDynObject.getDynValue("name"); |
|
296 | 305 |
} |
297 | 306 |
|
298 | 307 |
/* |
... | ... | |
355 | 364 |
* @see #reProject(MapControl) |
356 | 365 |
*/ |
357 | 366 |
public void setProjection(IProjection proj) { |
358 |
projection = proj;
|
|
367 |
this.delegatedDynObject.setDynValue("SRS", proj);
|
|
359 | 368 |
// Comprobar que la proyecci?n es la misma que la de FMap |
360 | 369 |
// Si no lo es, es una capa que est? reproyectada al vuelo |
361 | 370 |
if ((proj != null) && (getMapContext() != null)) { |
... | ... | |
374 | 383 |
* @see org.cresques.geo.Projected#getProjection() |
375 | 384 |
*/ |
376 | 385 |
public IProjection getProjection() { |
377 |
return projection;
|
|
386 |
return (IProjection) this.delegatedDynObject.getDynValue("SRS");
|
|
378 | 387 |
} |
379 | 388 |
|
380 | 389 |
/** |
... | ... | |
472 | 481 |
xml.putProperty("maxScale", maxScale); |
473 | 482 |
|
474 | 483 |
xml.putProperty("visible", status.visible); |
484 |
IProjection projection = this.getProjection(); |
|
475 | 485 |
if (projection != null) { |
476 | 486 |
xml.putProperty("proj", projection.getFullCode()); |
477 | 487 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLayer.java | ||
---|---|---|
62 | 62 |
import org.gvsig.fmap.mapcontext.exceptions.ReloadLayerException; |
63 | 63 |
import org.gvsig.fmap.mapcontext.exceptions.StartEditionLayerException; |
64 | 64 |
import org.gvsig.fmap.mapcontext.layers.operations.ComposedLayer; |
65 |
import org.gvsig.metadata.Metadata; |
|
65 | 66 |
import org.gvsig.tools.exception.BaseException; |
66 | 67 |
import org.gvsig.tools.exception.DriverException; |
67 | 68 |
import org.gvsig.tools.task.Cancellable; |
... | ... | |
83 | 84 |
* |
84 | 85 |
* @see Projected |
85 | 86 |
*/ |
86 |
public interface FLayer extends Projected, IPersistence//, Metadata
|
|
87 |
public interface FLayer extends Projected, IPersistence, Metadata |
|
87 | 88 |
{ |
88 | 89 |
public final String DYNCLASS_NAME = "Layer"; |
89 | 90 |
|
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLayers.java | ||
---|---|---|
48 | 48 |
import java.util.Collections; |
49 | 49 |
import java.util.Iterator; |
50 | 50 |
import java.util.List; |
51 |
import java.util.Set; |
|
52 |
import java.util.TreeSet; |
|
51 | 53 |
import java.util.Vector; |
52 | 54 |
|
53 | 55 |
import javax.print.attribute.PrintRequestAttributeSet; |
... | ... | |
1529 | 1531 |
} |
1530 | 1532 |
} |
1531 | 1533 |
|
1534 |
/* |
|
1535 |
* (non-Javadoc) |
|
1536 |
* |
|
1537 |
* @see org.gvsig.metadata.Metadata#getMetadataID() |
|
1538 |
*/ |
|
1532 | 1539 |
public Object getMetadataID() { |
1533 |
// FIXME |
|
1534 |
return "FLayers:" + this.getName(); |
|
1540 |
StringBuilder strb = new StringBuilder(); |
|
1541 |
strb.append("Layers("); |
|
1542 |
strb.append(this.getName()); |
|
1543 |
strb.append("):{"); |
|
1544 |
Iterator iter = this.layers.iterator(); |
|
1545 |
while (iter.hasNext()) { |
|
1546 |
strb.append(((FLayer) iter.next()).getMetadataID()); |
|
1547 |
strb.append(","); |
|
1548 |
} |
|
1549 |
strb.append("}"); |
|
1550 |
return strb.toString(); |
|
1551 |
|
|
1535 | 1552 |
} |
1536 | 1553 |
|
1554 |
/* |
|
1555 |
* (non-Javadoc) |
|
1556 |
* |
|
1557 |
* @see org.gvsig.metadata.Metadata#getMetadataChildren() |
|
1558 |
*/ |
|
1559 |
public Set getMetadataChildren() { |
|
1560 |
Set ret = new TreeSet(); |
|
1561 |
Iterator iter = this.layers.iterator(); |
|
1562 |
while (iter.hasNext()) { |
|
1563 |
ret.add(iter.next()); |
|
1564 |
} |
|
1565 |
return ret; |
|
1566 |
} |
|
1537 | 1567 |
|
1568 |
/* |
|
1569 |
* (non-Javadoc) |
|
1570 |
* |
|
1571 |
* @see org.gvsig.metadata.Metadata#getMetadataName() |
|
1572 |
*/ |
|
1573 |
public String getMetadataName() { |
|
1574 |
StringBuilder strb = new StringBuilder(); |
|
1575 |
strb.append("Layer Group '"); |
|
1576 |
strb.append(this.getName()); |
|
1577 |
strb.append("': {"); |
|
1578 |
Iterator iter = this.layers.iterator(); |
|
1579 |
while (iter.hasNext()) { |
|
1580 |
strb.append(((FLayer) iter.next()).getMetadataName()); |
|
1581 |
strb.append(","); |
|
1582 |
} |
|
1583 |
strb.append("}"); |
|
1584 |
return strb.toString(); |
|
1585 |
} |
|
1586 |
|
|
1587 |
|
|
1538 | 1588 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/FLyrVect.java | ||
---|---|---|
46 | 46 |
import java.awt.geom.Point2D; |
47 | 47 |
import java.awt.image.BufferedImage; |
48 | 48 |
import java.net.URI; |
49 |
import java.util.ArrayList; |
|
50 | 49 |
import java.util.Iterator; |
50 |
import java.util.Set; |
|
51 |
import java.util.TreeSet; |
|
51 | 52 |
|
52 | 53 |
import javax.print.attribute.PrintRequestAttributeSet; |
53 | 54 |
import javax.print.attribute.standard.PrintQuality; |
... | ... | |
1533 | 1534 |
} |
1534 | 1535 |
|
1535 | 1536 |
} |
1537 |
|
|
1538 |
/* |
|
1539 |
* (non-Javadoc) |
|
1540 |
* |
|
1541 |
* @see org.gvsig.metadata.Metadata#getMetadataChildren() |
|
1542 |
*/ |
|
1543 |
public Set getMetadataChildren() { |
|
1544 |
Set ret = new TreeSet(); |
|
1545 |
ret.add(this.featureStore); |
|
1546 |
return ret; |
|
1547 |
} |
|
1548 |
|
|
1549 |
/* |
|
1550 |
* (non-Javadoc) |
|
1551 |
* |
|
1552 |
* @see org.gvsig.metadata.Metadata#getMetadataID() |
|
1553 |
*/ |
|
1554 |
public Object getMetadataID() { |
|
1555 |
return "Layer(" + this.getName() + "):" |
|
1556 |
+ this.featureStore.getMetadataID(); |
|
1557 |
} |
|
1558 |
|
|
1559 |
/* |
|
1560 |
* (non-Javadoc) |
|
1561 |
* |
|
1562 |
* @see org.gvsig.metadata.Metadata#getMetadataName() |
|
1563 |
*/ |
|
1564 |
public String getMetadataName() { |
|
1565 |
return "Layer '" + this.getName() + "':" |
|
1566 |
+ this.featureStore.getMetadataName(); |
|
1567 |
} |
|
1568 |
|
|
1536 | 1569 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/GraphicLayer.java | ||
---|---|---|
48 | 48 |
import java.awt.image.BufferedImage; |
49 | 49 |
import java.util.ArrayList; |
50 | 50 |
import java.util.Collection; |
51 |
import java.util.Set; |
|
51 | 52 |
|
52 | 53 |
import javax.print.attribute.PrintRequestAttributeSet; |
53 | 54 |
|
... | ... | |
500 | 501 |
} |
501 | 502 |
return -1; |
502 | 503 |
} |
504 |
|
|
505 |
/* |
|
506 |
* (non-Javadoc) |
|
507 |
* |
|
508 |
* @see org.gvsig.metadata.Metadata#getMetadataChildren() |
|
509 |
*/ |
|
510 |
public Set getMetadataChildren() { |
|
511 |
return null; |
|
512 |
} |
|
513 |
|
|
514 |
/* |
|
515 |
* (non-Javadoc) |
|
516 |
* |
|
517 |
* @see org.gvsig.metadata.Metadata#getMetadataID() |
|
518 |
*/ |
|
519 |
public Object getMetadataID() { |
|
520 |
if (this.getName() != null) { |
|
521 |
return "GraphicLayer(" + this.getName() + ")"; |
|
522 |
} else { |
|
523 |
return "GraphicLayer"; |
|
524 |
} |
|
525 |
} |
|
526 |
|
|
527 |
/* |
|
528 |
* (non-Javadoc) |
|
529 |
* |
|
530 |
* @see org.gvsig.metadata.Metadata#getMetadataName() |
|
531 |
*/ |
|
532 |
public String getMetadataName() { |
|
533 |
if (this.getName() != null) { |
|
534 |
return "Graphic Layer '" + this.getName() + "'"; |
|
535 |
} else { |
|
536 |
return "Graphic Layer"; |
|
537 |
} |
|
538 |
} |
|
503 | 539 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLyrText.java | ||
---|---|---|
47 | 47 |
import java.awt.Graphics2D; |
48 | 48 |
import java.awt.image.BufferedImage; |
49 | 49 |
import java.util.ArrayList; |
50 |
import java.util.Set; |
|
50 | 51 |
|
51 | 52 |
import javax.print.attribute.PrintRequestAttributeSet; |
52 | 53 |
|
... | ... | |
89 | 90 |
* @throws com.hardcode.gdbms.engine.data.driver.DriverException |
90 | 91 |
*/ |
91 | 92 |
public FLyrText() { |
93 |
super(); |
|
92 | 94 |
} |
93 | 95 |
|
94 | 96 |
// /** |
... | ... | |
444 | 446 |
return Geometry.TYPES.TEXT; |
445 | 447 |
} |
446 | 448 |
|
449 |
/* |
|
450 |
* (non-Javadoc) |
|
451 |
* |
|
452 |
* @see org.gvsig.metadata.Metadata#getMetadataChildren() |
|
453 |
*/ |
|
454 |
public Set getMetadataChildren() { |
|
455 |
// TODO Auto-generated method stub |
|
456 |
return null; |
|
457 |
} |
|
458 |
|
|
459 |
/* |
|
460 |
* (non-Javadoc) |
|
461 |
* |
|
462 |
* @see org.gvsig.metadata.Metadata#getMetadataID() |
|
463 |
*/ |
|
464 |
public Object getMetadataID() { |
|
465 |
// TODO Auto-generated method stub |
|
466 |
return null; |
|
467 |
} |
|
468 |
|
|
469 |
/* |
|
470 |
* (non-Javadoc) |
|
471 |
* |
|
472 |
* @see org.gvsig.metadata.Metadata#getMetadataName() |
|
473 |
*/ |
|
474 |
public String getMetadataName() { |
|
475 |
// TODO Auto-generated method stub |
|
476 |
return null; |
|
477 |
} |
|
478 |
|
|
447 | 479 |
/** |
448 | 480 |
* Devuelve un ArrayList con los textos de la capa. |
449 | 481 |
* |
Also available in: Unified diff