[fdo-commits] r652 - in trunk/Fdo/Unmanaged: . Inc Inc/Fdo/Raster

[svn_fdo at osgeo.org]

Author: brentrobinson
Date: 2007-01-23 16:21:24 -0500 (Tue, 23 Jan 2007)
New Revision: 652

Modified:
   trunk/Fdo/Unmanaged/Fdo.vcproj
   trunk/Fdo/Unmanaged/Inc/Fdo.h
   trunk/Fdo/Unmanaged/Inc/Fdo/Raster/DataValueCollection.h
   trunk/Fdo/Unmanaged/Inc/Fdo/Raster/IRasterPropertyDictionary.h
Log:
Deprecated redundant Inc/Fdo/Raster/DataValueCollection.h.

Modified: trunk/Fdo/Unmanaged/Fdo.vcproj
===================================================================
--- trunk/Fdo/Unmanaged/Fdo.vcproj	2007-01-23 19:49:02 UTC (rev 651)
+++ trunk/Fdo/Unmanaged/Fdo.vcproj	2007-01-23 21:21:24 UTC (rev 652)
@@ -2148,10 +2148,6 @@
 				Name="Raster"
 				>
 				<File
-					RelativePath="Inc\Fdo\Raster\DataValueCollection.h"
-					>
-				</File>
-				<File
 					RelativePath="Inc\Fdo\Raster\IRaster.h"
 					>
 				</File>

Modified: trunk/Fdo/Unmanaged/Inc/Fdo/Raster/DataValueCollection.h
===================================================================
--- trunk/Fdo/Unmanaged/Inc/Fdo/Raster/DataValueCollection.h	2007-01-23 19:49:02 UTC (rev 651)
+++ trunk/Fdo/Unmanaged/Inc/Fdo/Raster/DataValueCollection.h	2007-01-23 21:21:24 UTC (rev 652)
@@ -1,9 +1,9 @@
-#ifndef _DATAVALUECOLLECTION_H_
-#define _DATAVALUECOLLECTION_H_
+#ifndef _RASTERDATAVALUECOLLECTION_H_
+#define _RASTERDATAVALUECOLLECTION_H_
 // 
 
 //
-// Copyright (C) 2004-2006  Autodesk, Inc.
+// Copyright (C) 2004-2007  Autodesk, Inc.
 // 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of version 2.1 of the GNU Lesser
@@ -23,24 +23,12 @@
 #pragma once
 #endif
 
+// This header is deprecated since it used to define the same class as fdo/Expression/DataValueCollection.h.
+// However it is being kept for backward compatibility.
+
 #include <FdoStd.h>
+#include <Fdo/Expression/DataValueCollection.h>
 
-/// \brief
-/// The FdoDataValueCollection represents a collection of FdoDataValue and FdoException classes.
-class FdoDataValueCollection : public FdoCollection<FdoDataValue, FdoException>
-{
-public:
-    FdoDataValueCollection () :
-        FdoCollection<FdoDataValue, FdoException> ()
-    {
-    }
-    
-    ~FdoDataValueCollection ()
-    {
-    }
+#endif // _RASTERDATAVALUECOLLECTION_H_
 
-};
 
-#endif // _DATAVALUECOLLECTION_H_
-
-

Modified: trunk/Fdo/Unmanaged/Inc/Fdo/Raster/IRasterPropertyDictionary.h
===================================================================
--- trunk/Fdo/Unmanaged/Inc/Fdo/Raster/IRasterPropertyDictionary.h	2007-01-23 19:49:02 UTC (rev 651)
+++ trunk/Fdo/Unmanaged/Inc/Fdo/Raster/IRasterPropertyDictionary.h	2007-01-23 21:21:24 UTC (rev 652)
@@ -24,7 +24,7 @@
 #include <FdoStd.h>
 #include <Fdo/Raster/RasterDataModelType.h>
 #include <Fdo/Raster/RasterDataOrganization.h>
-#include <Fdo/Raster/DataValueCollection.h>
+#include <Fdo/Expression/DataValueCollection.h>
 
 /// \brief
 /// The FdoIRasterPropertyDictionary exposes a dictionary style

Modified: trunk/Fdo/Unmanaged/Inc/Fdo.h
===================================================================
--- trunk/Fdo/Unmanaged/Inc/Fdo.h	2007-01-23 19:49:02 UTC (rev 651)
+++ trunk/Fdo/Unmanaged/Inc/Fdo.h	2007-01-23 21:21:24 UTC (rev 652)
@@ -271,7 +271,6 @@
 ////////////////////////////////////////////////////////////////
 // Raster
 //
-#include <Fdo/Raster/DataValueCollection.h>
 #include <Fdo/Raster/IRaster.h>
 #include <Fdo/Raster/IRasterPropertyDictionary.h>
 #include <Fdo/Raster/RasterDataOrganization.h>