Revision 752

View differences:

2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/LayerProperties3DPersistenceFactory.java
24 24

  
25 25
package org.gvsig.view3d.lib.impl.layers.persistence;
26 26

  
27
import static org.gvsig.view3d.lib.api.properties.LayerProperties3D.FLAYER;
28

  
27 29
import org.gvsig.fmap.mapcontext.layers.FLayer;
28 30
import org.gvsig.tools.dynobject.DynStruct;
29 31
import org.gvsig.tools.persistence.AbstractSinglePersistenceFactory;
......
32 34
import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
33 35
import org.gvsig.view3d.lib.impl.layers.properties.DefaultLayerProperties3D;
34 36

  
35
import static org.gvsig.view3d.lib.api.properties.LayerProperties3D.*;
36

  
37 37
/**
38 38
 * Persistence for basic layer properties.
39 39
 * 
......
46 46
    private static final String DYNCLASS_DESCRIPTION = "Basic layer 3D properties persistence definition";
47 47

  
48 48
    public LayerProperties3DPersistenceFactory() {
49
        super(LayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
49
        super(DefaultLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
50 50

  
51 51
        DynStruct definition = this.getDefinition();
52 52
        definition.addDynFieldObject(FLAYER);
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/RasterizedVectorLayerProperties3DPersistenceFactory.java
38 38
import org.gvsig.tools.persistence.PersistenceManager;
39 39
import org.gvsig.tools.persistence.PersistentState;
40 40
import org.gvsig.tools.persistence.exception.PersistenceException;
41
import org.gvsig.view3d.lib.api.properties.RasterLayerProperties3D;
42 41
import org.gvsig.view3d.lib.api.properties.RasterizedVectorLayerProperties3D;
42
import org.gvsig.view3d.lib.impl.layers.properties.DefaultRasterLayerProperties3D;
43 43
import org.gvsig.view3d.lib.impl.layers.properties.DefaultRasterizedVectorLayerProperties3D;
44 44

  
45 45
/**
......
54 54
    private static final String DYNCLASS_DESCRIPTION = "Rasterized Vector layer 3D properties persistence definition";
55 55

  
56 56
    public RasterizedVectorLayerProperties3DPersistenceFactory() {
57
        super(RasterizedVectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
57
        super(DefaultRasterizedVectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
58 58

  
59 59
        DynStruct definition = this.getDefinition();
60 60

  
61 61
        PersistenceManager manager = ToolsLocator.getPersistenceManager();
62
        definition.extend(manager.getDefinition(RasterLayerProperties3D.class));
62
        definition.extend(manager.getDefinition(DefaultRasterLayerProperties3D.class));
63 63

  
64 64
    }
65 65

  
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/RasterLayerProperties3DPersistenceFactory.java
38 38
import org.gvsig.tools.persistence.PersistenceManager;
39 39
import org.gvsig.tools.persistence.PersistentState;
40 40
import org.gvsig.tools.persistence.exception.PersistenceException;
41
import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
42 41
import org.gvsig.view3d.lib.api.properties.RasterLayerProperties3D;
42
import org.gvsig.view3d.lib.impl.layers.properties.DefaultLayerProperties3D;
43 43
import org.gvsig.view3d.lib.impl.layers.properties.DefaultRasterLayerProperties3D;
44 44

  
45 45
/**
......
54 54
    private static final String DYNCLASS_DESCRIPTION = "Raster layer 3D properties persistence definition";
55 55

  
56 56
    public RasterLayerProperties3DPersistenceFactory() {
57
        super(RasterLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
57
        super(DefaultRasterLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
58 58

  
59 59
        DynStruct definition = this.getDefinition();
60 60

  
61 61
        PersistenceManager manager = ToolsLocator.getPersistenceManager();
62
        definition.extend(manager.getDefinition(LayerProperties3D.class));
62
        definition.extend(manager.getDefinition(DefaultLayerProperties3D.class));
63 63

  
64 64
        definition.addDynFieldDouble(LEVEL_ZERO_RESOLUTION_MULTIPLIER);
65 65
        definition.addDynFieldInt(MAX_LEVEL);
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/VectorLayerProperties3DPersistenceFactory.java
24 24

  
25 25
package org.gvsig.view3d.lib.impl.layers.persistence;
26 26

  
27
import static org.gvsig.view3d.lib.api.properties.LayerProperties3D.FLAYER;
28
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.CONSTANT_HEIGHT;
29
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.DEFAULT_COLOR;
30
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.ELEVATION_MODE;
31

  
32
import java.awt.Color;
33

  
27 34
import org.gvsig.fmap.mapcontext.layers.FLayer;
28 35
import org.gvsig.tools.ToolsLocator;
29 36
import org.gvsig.tools.dynobject.DynStruct;
......
31 38
import org.gvsig.tools.persistence.PersistenceManager;
32 39
import org.gvsig.tools.persistence.PersistentState;
33 40
import org.gvsig.tools.persistence.exception.PersistenceException;
34
import org.gvsig.view3d.lib.api.properties.LayerProperties3D;
35 41
import org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D;
42
import org.gvsig.view3d.lib.impl.layers.properties.DefaultLayerProperties3D;
36 43
import org.gvsig.view3d.lib.impl.layers.properties.DefaultVectorLayerProperties3D;
37 44

  
38
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.*;
39

  
40
import java.awt.Color;
41

  
42 45
/**
43 46
 * Persistence of vector layer properties.
44 47
 * 
......
51 54
    private static final String DYNCLASS_DESCRIPTION = "Vector layer 3D properties persistence definition";
52 55

  
53 56
    public VectorLayerProperties3DPersistenceFactory() {
54
        super(VectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
57
        super(DefaultVectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
55 58

  
56 59
        DynStruct definition = this.getDefinition();
57 60

  
58 61
        PersistenceManager manager = ToolsLocator.getPersistenceManager();
59
        definition.extend(manager.getDefinition(LayerProperties3D.class));
62
        definition.extend(manager.getDefinition(DefaultLayerProperties3D.class));
60 63
        definition.addDynFieldObject(DEFAULT_COLOR);
61 64
        definition.addDynFieldInt(ELEVATION_MODE);
62 65
        definition.addDynFieldDouble(CONSTANT_HEIGHT);
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/ElevationLayerProperties3DPersistenceFactory.java
41 41
import org.gvsig.tools.persistence.PersistentState;
42 42
import org.gvsig.tools.persistence.exception.PersistenceException;
43 43
import org.gvsig.view3d.lib.api.properties.ElevationLayerProperties3D;
44
import org.gvsig.view3d.lib.api.properties.RasterLayerProperties3D;
45 44
import org.gvsig.view3d.lib.impl.layers.properties.DefaultElevationLayerProperties3D;
45
import org.gvsig.view3d.lib.impl.layers.properties.DefaultRasterLayerProperties3D;
46 46

  
47 47
/**
48 48
 * Elevation layer properties persistence.
......
56 56
    private static final String DYNCLASS_DESCRIPTION = "Elevation layer 3D properties persistence definition";
57 57

  
58 58
    public ElevationLayerProperties3DPersistenceFactory() {
59
        super(ElevationLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
59
        super(DefaultElevationLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
60 60

  
61 61
        DynStruct definition = this.getDefinition();
62 62

  
63 63
        PersistenceManager manager = ToolsLocator.getPersistenceManager();
64
        definition.extend(manager.getDefinition(RasterLayerProperties3D.class));
64
        definition.extend(manager.getDefinition(DefaultRasterLayerProperties3D.class));
65 65

  
66 66
        definition.addDynFieldDouble(NO_DATA_VALUE);
67 67
        definition.addDynFieldString(ELEVATION_UNITS);
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/src/main/java/org/gvsig/view3d/lib/impl/layers/persistence/ExtrudedVectorLayerProperties3DPersistenceFactory.java
24 24

  
25 25
package org.gvsig.view3d.lib.impl.layers.persistence;
26 26

  
27
import static org.gvsig.view3d.lib.api.properties.ExtrudedVectorLayerProperties3D.CONSTANT_HEIGHT;
28 27
import static org.gvsig.view3d.lib.api.properties.ExtrudedVectorLayerProperties3D.EXTRUSION_HEIGHT_FIELD;
29 28
import static org.gvsig.view3d.lib.api.properties.ExtrudedVectorLayerProperties3D.VERTICAL_EXAGGERATION;
30 29
import static org.gvsig.view3d.lib.api.properties.LayerProperties3D.FLAYER;
31
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.*;
30
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.CONSTANT_HEIGHT;
31
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.DEFAULT_COLOR;
32 32
import static org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D.ELEVATION_MODE;
33 33

  
34 34
import java.awt.Color;
......
41 41
import org.gvsig.tools.persistence.PersistentState;
42 42
import org.gvsig.tools.persistence.exception.PersistenceException;
43 43
import org.gvsig.view3d.lib.api.properties.ExtrudedVectorLayerProperties3D;
44
import org.gvsig.view3d.lib.api.properties.VectorLayerProperties3D;
45 44
import org.gvsig.view3d.lib.impl.layers.properties.DefaultExtrudedVectorLayerProperties3D;
45
import org.gvsig.view3d.lib.impl.layers.properties.DefaultVectorLayerProperties3D;
46 46

  
47 47
/**
48 48
 * Persistence of extruded vector layer properties.
......
56 56
    private static final String DYNCLASS_DESCRIPTION = "Extruded Vector layer 3D properties persistence definition";
57 57

  
58 58
    public ExtrudedVectorLayerProperties3DPersistenceFactory() {
59
        super(ExtrudedVectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
59
        super(DefaultExtrudedVectorLayerProperties3D.class, DYNCLASS_NAME, DYNCLASS_DESCRIPTION, null, null);
60 60

  
61 61
        DynStruct definition = this.getDefinition();
62 62

  
63 63
        PersistenceManager manager = ToolsLocator.getPersistenceManager();
64
        definition.extend(manager.getDefinition(VectorLayerProperties3D.class));
64
        definition.extend(manager.getDefinition(DefaultVectorLayerProperties3D.class));
65 65
        definition.addDynFieldString(EXTRUSION_HEIGHT_FIELD);
66 66
        definition.addDynFieldDouble(VERTICAL_EXAGGERATION);
67 67
    }

Also available in: Unified diff