* Terrain Module code has been reformatted to comply with guidelines.

* Fixed a variety of code quality issues. (Yes, I've found ReSharper.)

9 files changed, 77 insertions, 79 deletions

diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs
index cad0edf..f975872 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs
@@ -24,8 +24,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
     /// 
     /// Uses the System.Drawing filesystem loader.
     /// </summary>
-    class BMP : GenericSystemDrawing
+    internal class BMP : GenericSystemDrawing
     {
         /// <summary>
         /// Exports a file to a image on the disk using a System.Drawing exporter.
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
         {
             Bitmap colours = CreateGrayscaleBitmapFromMap(map);
 
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Bmp);
+            colours.Save(filename, ImageFormat.Bmp);
         }
 
         /// <summary>
@@ -59,4 +59,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return "BMP";
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs
index 7f07fd9..cf82000 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs
@@ -24,19 +24,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
 {
-    class GIF : GenericSystemDrawing
+    internal class GIF : GenericSystemDrawing
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
             Bitmap colours = CreateGrayscaleBitmapFromMap(map);
 
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Gif);
+            colours.Save(filename, ImageFormat.Gif);
         }
 
         public override string ToString()
@@ -44,4 +44,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return "GIF";
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs
index 9bcf94d..47e0e4cb 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
@@ -72,6 +73,20 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Exports a file to a image on the disk using a System.Drawing exporter.
+        /// </summary>
+        /// <param name="filename">The target filename</param>
+        /// <param name="map">The terrain channel being saved</param>
+        public virtual void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Png);
+        }
+
+        #endregion
+
         public override string ToString()
         {
             return "SYS.DRAWING";
@@ -100,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
                 for (int x = 0; x < map.Width; x++)
                 {
                     // 512 is the largest possible height before colours clamp
-                    int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));
 
                     // Handle error conditions
                     if (colorindex > pallete - 1 || colorindex < 0)
@@ -137,7 +152,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
                 for (int x = 0; x < map.Width; x++)
                 {
                     // 512 is the largest possible height before colours clamp
-                    int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
 
                     // Handle error conditions
                     if (colorindex > pallete - 1 || colorindex < 0)
@@ -148,19 +163,5 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             }
             return bmp;
         }
-
-        /// <summary>
-        /// Exports a file to a image on the disk using a System.Drawing exporter.
-        /// </summary>
-        /// <param name="filename">The target filename</param>
-        /// <param name="map">The terrain channel being saved</param>
-        public virtual void SaveFile(string filename, ITerrainChannel map)
-        {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
-        }
-
-        #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs
index d6430cd..f25b29b 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs
@@ -26,8 +26,8 @@
  */
 
 using System;
-using System.IO;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
@@ -46,6 +46,15 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             throw new NotImplementedException();
         }
 
+        public void SaveFile(string filename, ITerrainChannel map)
+        {
+            Bitmap colours = CreateBitmapFromMap(map);
+
+            colours.Save(filename, ImageFormat.Jpeg);
+        }
+
+        #endregion
+
         public override string ToString()
         {
             return "JPEG";
@@ -70,20 +79,11 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
                 for (int x = 0; x < map.Width; x++)
                 {
                     // 512 is the largest possible height before colours clamp
-                    int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
+                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
                     bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
                 }
             }
             return bmp;
         }
-
-        public void SaveFile(string filename, ITerrainChannel map)
-        {
-            Bitmap colours = CreateBitmapFromMap(map);
-
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Jpeg);
-        }
-
-        #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs
index 7436dc5..fda46f0 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             {
                 for (x = 0; x < retval.Width; x++)
                 {
-                    retval[x, y] = (double)bs.ReadByte() * ((double)bs.ReadByte() / 127.0);
+                    retval[x, y] = (double) bs.ReadByte() * ((double) bs.ReadByte() / 127.0);
                     bs.ReadBytes(11); // Advance the stream to next bytes.
                 }
             }
@@ -58,11 +58,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return retval;
         }
 
-        public override string ToString()
-        {
-            return "LL/SL RAW";
-        }
-
         public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
         {
             throw new NotImplementedException();
@@ -81,7 +76,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             {
                 for (j = 0; j < 256; j++)
                 {
-                    lookupHeightTable[i + (j * 256)] = ((double)i * ((double)j / 127.0));
+                    lookupHeightTable[i + (j * 256)] = ((double) i * ((double) j / 127.0));
                 }
             }
 
@@ -103,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
                         }
                     }
 
-                    byte red = (byte)(index & 0xFF);
-                    byte green = (byte)((index >> 8) & 0xFF);
-                    byte blue   = 20;
+                    byte red = (byte) (index & 0xFF);
+                    byte green = (byte) ((index >> 8) & 0xFF);
+                    byte blue = 20;
                     byte alpha1 = 0; // Land Parcels
                     byte alpha2 = 0; // For Sale Land
                     byte alpha3 = 0; // Public Edit Object
@@ -138,5 +133,10 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
         }
 
         #endregion
+
+        public override string ToString()
+        {
+            return "LL/SL RAW";
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs
index d7f34ee..16f1e3c 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs
@@ -24,19 +24,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
 {
-    class PNG : GenericSystemDrawing
+    internal class PNG : GenericSystemDrawing
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
             Bitmap colours = CreateGrayscaleBitmapFromMap(map);
 
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png);
+            colours.Save(filename, ImageFormat.Png);
         }
 
         public override string ToString()
@@ -44,4 +44,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return "PNG";
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
index 7575b1b..d496069 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
 using OpenSim.Region.Environment.Interfaces;
 
@@ -57,11 +56,6 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return retval;
         }
 
-        public override string ToString()
-        {
-            return "RAW32";
-        }
-
         public ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight)
         {
             TerrainChannel retval = new TerrainChannel(sectionWidth, sectionHeight);
@@ -69,7 +63,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             FileInfo file = new FileInfo(filename);
             FileStream s = file.Open(FileMode.Open, FileAccess.Read);
             BinaryReader bs = new BinaryReader(s);
-            
+
             int currFileXOffset = 0;
             int currFileYOffset = 0;
 
@@ -79,7 +73,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             {
                 // read a whole strip of regions
                 int heightsToRead = sectionHeight * (fileWidth * sectionWidth);
-                bs.ReadBytes( heightsToRead * 4); // because the floats are 4 bytes in the file
+                bs.ReadBytes(heightsToRead * 4); // because the floats are 4 bytes in the file
                 currFileYOffset++;
             }
 
@@ -90,13 +84,13 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             for (y = 0; y < sectionHeight; y++)
             {
                 currFileXOffset = 0;
-                     
+
                 // if our region isn't the first X section of the areas to be landscaped, then
                 // advance the stream to the X start pos of our section in the file
                 // i.e. eat X upto where we start
                 while (currFileXOffset < offsetX)
                 {
-                    bs.ReadBytes( sectionWidth * 4); // 4 bytes = single
+                    bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
                     currFileXOffset++;
                 }
 
@@ -111,14 +105,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
 
                 // if our region isn't the last X section of the areas to be landscaped, then
                 // advance the stream to the end of this Y column
-                while (currFileXOffset < fileWidth )
+                while (currFileXOffset < fileWidth)
                 {
                     // eat the next regions x line
                     bs.ReadBytes(sectionWidth * 4); // 4 bytes = single
                     currFileXOffset++;
                 }
-
-
             }
 
             bs.Close();
@@ -138,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             {
                 for (x = 0; x < map.Width; x++)
                 {
-                    bs.Write((float)map[x, y]);
+                    bs.Write((float) map[x, y]);
                 }
             }
 
@@ -147,5 +139,10 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
         }
 
         #endregion
+
+        public override string ToString()
+        {
+            return "RAW32";
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs
index 8eb53fc..39c2428 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs
@@ -24,19 +24,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
 using System.Drawing;
+using System.Drawing.Imaging;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
 {
-    class TIFF : GenericSystemDrawing
+    internal class TIFF : GenericSystemDrawing
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
             Bitmap colours = CreateGrayscaleBitmapFromMap(map);
 
-            colours.Save(filename, System.Drawing.Imaging.ImageFormat.Tiff);
+            colours.Save(filename, ImageFormat.Tiff);
         }
 
         public override string ToString()
@@ -44,4 +44,4 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             return "TIFF";
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
index 6a3c354..9f9edbc 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
     /// Built from specification at
     /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
     /// </summary>
-    class Terragen : ITerrainLoader
+    internal class Terragen : ITerrainLoader
     {
         #region ITerrainLoader Members
 
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
                             {
                                 for (y = 0; y < h; y++)
                                 {
-                                    retval[x, y] = (double)baseHeight + (double)bs.ReadInt16() * (double)heightScale / 65536.0;
+                                    retval[x, y] = (double) baseHeight + (double) bs.ReadInt16() * (double) heightScale / 65536.0;
                                 }
                             }
                             break;
@@ -107,16 +107,16 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
             throw new NotImplementedException();
         }
 
-        public override string ToString()
-        {
-            return "Terragen";
-        }
-
         public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h)
         {
             throw new NotImplementedException();
         }
 
         #endregion
+
+        public override string ToString()
+        {
+            return "Terragen";
+        }
     }
-}
+}
\ No newline at end of file