Revision 33410

View differences:

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLyrDefault.java
371 371
	 * @see org.cresques.geo.Projected#getProjection()
372 372
	 */
373 373
	public IProjection getProjection() {
374
//		if (!this.metadataContainer.hasDynValue(METADATA_CRS)) {
375
//			return null;
376
//		}
377 374
		return (IProjection) this.metadataContainer.getDynValue(METADATA_CRS);
378 375
	}
379 376

  
......
973 970
				null, 
974 971
				null
975 972
		);
976
		definition.addDynFieldString("name").setMandatory(true);
973
		definition.addDynFieldString("name").setMandatory(false);
977 974
		definition.addDynFieldInt("transparency").setMandatory(true);
978 975
		definition.addDynFieldDouble("minScale").setMandatory(true);
979 976
		definition.addDynFieldDouble("maxScale").setMandatory(true);
980
		definition.addDynFieldObject("crs").setClassOfValue(IProjection.class).setMandatory(true);
981
		definition.addDynFieldObject("parentLayer").setClassOfValue(FLayers.class).setMandatory(true);
982
		definition.addDynFieldObject("coordTrans").setClassOfValue(ICoordTrans.class).setMandatory(true);
977
		definition.addDynFieldObject("crs").setClassOfValue(IProjection.class).setMandatory(false);
978
		definition.addDynFieldObject("parentLayer").setClassOfValue(FLayers.class).setMandatory(false);
979
		definition.addDynFieldObject("coordTrans").setClassOfValue(ICoordTrans.class).setMandatory(false);
983 980
		definition.addDynFieldObject("status").setClassOfValue(FLayerStatus.class).setMandatory(true);
984 981
		definition.addDynFieldMap("properties").setClassOfItems(Object.class)
985 982
				.setMandatory(true);
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLayerStatus.java
334 334
		definition.addDynFieldBoolean("available").setMandatory(true);
335 335
		definition.addDynFieldBoolean("writable").setMandatory(true);
336 336
		definition.addDynFieldBoolean("driverLoaded").setMandatory(true);
337
		definition.addDynFieldBoolean("locked").setMandatory(true);
337
		//definition.addDynFieldBoolean("locked").setMandatory(true);
338 338
	}
339 339
}
340 340

  
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/ViewPort.java
1634 1634
				"ViewPort Persistence definition",
1635 1635
				null, 
1636 1636
				null
1637
		);
1638
		definition.addDynFieldString("comment");
1639
		definition.addDynFieldInt("code").setMandatory(true);
1640
		definition.addDynFieldString("creationDate").setMandatory(true);
1641
		definition.addDynFieldString("name").setMandatory(true);
1642
		definition.addDynFieldString("owner");
1643
		definition.addDynFieldBoolean("locked");
1637
		);		
1644 1638
		
1645
		
1646 1639
		definition.addDynFieldObject(FIELD_ADJUSTED_EXTENT)
1647 1640
        	.setClassOfValue(Rectangle2D.class)
1648
        	.setMandatory(true);
1641
        	.setMandatory(false);
1649 1642
        
1650
		definition.addDynFieldString(FIELD_BACK_COLOR)
1643
		definition.addDynFieldObject(FIELD_BACK_COLOR)
1651 1644
        	.setClassOfValue(Color.class)
1652
        	.setMandatory(true);
1645
        	.setMandatory(false);
1653 1646
        
1654 1647
		definition.addDynFieldObject(FIELD_CLIP)
1655 1648
        	.setClassOfValue(Rectangle2D.class)
1656
        	.setMandatory(true);
1649
        	.setMandatory(false);
1657 1650
        
1658 1651
		definition.addDynFieldDouble(FIELD_DIST1PIXEL)
1659 1652
        	.setMandatory(true);
......
1669 1662
        
1670 1663
		definition.addDynFieldObject(FIELD_EXTENT)
1671 1664
        	.setClassOfValue(Rectangle2D.class)
1672
        	.setMandatory(true);
1665
        	.setMandatory(false);
1673 1666
        
1674 1667
		definition.addDynFieldObject(FIELD_EXTENTS)
1675 1668
        	.setClassOfValue(ExtentHistory.class)
......
1680 1673
        
1681 1674
		definition.addDynFieldDouble(FIELD_OFFSET)
1682 1675
        	.setClassOfValue(Point2D.class)
1683
        	.setMandatory(true);
1676
        	.setMandatory(false);
1684 1677

  
1685 1678
		definition.addDynFieldObject(FIELD_PROJ)
1686 1679
        	.setClassOfValue(IProjection.class)
......
1688 1681
        
1689 1682
		definition.addDynFieldInt(FIELD_IMAGE_SIZE)
1690 1683
        	.setClassOfValue(Dimension.class)
1691
        	.setMandatory(true);
1684
        	.setMandatory(false);
1692 1685
	}	
1693 1686

  
1694 1687
	public void loadFromState(PersistentState state) throws PersistenceException {

Also available in: Unified diff