Index: src/Common/SharpMap/Data/Providers/DbaseReader.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r22ecee6c202a4fc87caa5b5fa30f472ad721e198
--- src/Common/SharpMap/Data/Providers/DbaseReader.cs (.../DbaseReader.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Data/Providers/DbaseReader.cs (.../DbaseReader.cs) (revision 22ecee6c202a4fc87caa5b5fa30f472ad721e198)
@@ -191,9 +191,6 @@
IsOpen = false;
}
- // Binary Tree not working yet on Mono
- // see bug: http://bugzilla.ximian.com/show_bug.cgi?id=78502
-#if !MONO
///
/// Indexes a DBF column in a binary tree [NOT COMPLETE]
///
@@ -209,7 +206,6 @@
}
return tree;
}
-#endif
///
/// Returns a DataTable that describes the column metadata of the DBase file.
@@ -420,8 +416,6 @@
return ((tempChar == 'T') || (tempChar == 't') || (tempChar == 'Y') || (tempChar == 'y'));
case "System.DateTime":
DateTime date;
- // Mono has not yet implemented DateTime.TryParseExact
-#if !MONO
if (DateTime.TryParseExact(Encoding.UTF7.GetString((br.ReadBytes(8))),
"yyyyMMdd", Map.numberFormat_EnUS, DateTimeStyles.None, out date))
{
@@ -431,17 +425,6 @@
{
return DBNull.Value;
}
-#else
- try
- {
- return date = DateTime.ParseExact ( System.Text.Encoding.UTF7.GetString((br.ReadBytes(8))),
- "yyyyMMdd", SharpMap.Map.numberFormat_EnUS, System.Globalization.DateTimeStyles.None );
- }
- catch ( Exception e )
- {
- return DBNull.Value;
- }
- #endif
default:
throw (new NotSupportedException("Cannot parse DBase field '" + dbf.ColumnName + "' of type '" + dbf.DataType.ToString() + "'"));
}
Index: src/Common/SharpMap/Utilities/Indexing/BinaryTree.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r22ecee6c202a4fc87caa5b5fa30f472ad721e198
--- src/Common/SharpMap/Utilities/Indexing/BinaryTree.cs (.../BinaryTree.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/SharpMap/Utilities/Indexing/BinaryTree.cs (.../BinaryTree.cs) (revision 22ecee6c202a4fc87caa5b5fa30f472ad721e198)
@@ -21,9 +21,6 @@
namespace SharpMap.Utilities.Indexing
{
-// Binary Tree not working yet on Mono
-// see bug: http://bugzilla.ximian.com/show_bug.cgi?id=78502
-#if !MONO
[Serializable]
internal class Node where T : IComparable
{
@@ -369,5 +366,4 @@
#endregion
}
-#endif
}
\ No newline at end of file
Index: src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs
===================================================================
diff -u -r893e87bb682400420fd124ca200c511c44f363e5 -r22ecee6c202a4fc87caa5b5fa30f472ad721e198
--- src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision 893e87bb682400420fd124ca200c511c44f363e5)
+++ src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision 22ecee6c202a4fc87caa5b5fa30f472ad721e198)
@@ -695,15 +695,14 @@
//enable activation AFTER initialization
documentViews.IgnoreActivation = false;
toolWindowViews.IgnoreActivation = false;
-#if !MONO
+
if (Settings.Default.SettingsKey.Contains("mruList"))
{
if (Settings.Default["mruList"] == null)
{
Settings.Default["mruList"] = new StringCollection();
}
}
-#endif
}
private void HandleApplicationExit(object sender, EventArgs e)
@@ -937,7 +936,6 @@
// TODO: incapsulate any knowledge of the plugin XML inside plugin configurator, the rest of the system should not know about it!
private void InitToolWindows()
{
-#if !MONO
log.Info(Resources.DeltaShellGui_InitToolWindows_Creating_document_window_manager____);
var allowedDocumentWindowLocations = new[]
@@ -990,7 +988,6 @@
mainWindow.InitializeToolWindows();
log.Debug(Resources.DeltaShellGui_InitToolWindows_Finished_InitToolWindows);
-#endif
mainWindow.SubscribeToGui();
}
Index: test/DeltaShell/DeltaShell.Tests/Gui/Log4netTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r22ecee6c202a4fc87caa5b5fa30f472ad721e198
--- test/DeltaShell/DeltaShell.Tests/Gui/Log4netTest.cs (.../Log4netTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Tests/Gui/Log4netTest.cs (.../Log4netTest.cs) (revision 22ecee6c202a4fc87caa5b5fa30f472ad721e198)
@@ -36,13 +36,11 @@
ILog log = LogManager.GetLogger("delftshell.tests.log4net");
//The following methods somehow dont work under mono.....
//TODO: find the cause of this
-#if !MONO
log.InfoFormat("LoggingTypes {0}", 1);
log.DebugFormat("LoggingTypes {0}", 1);
log.WarnFormat("LoggingTypes {0}", 1);
log.ErrorFormat("LoggingTypes {0}", 1);
log.FatalFormat("LoggingTypes {0}", 1);
-#endif
}
}
}
\ No newline at end of file