You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/02/28 12:29:57 UTC
[06/20] lucenenet git commit: Added FEATURE_COLLATION so it can be
left out of the compilation (it doesn't work)
Added FEATURE_COLLATION so it can be left out of the compilation (it doesn't work)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e20befa0
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e20befa0
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e20befa0
Branch: refs/heads/api-work
Commit: e20befa0098f5514542486603592a0f057219b0b
Parents: 4e4d17c
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Tue Feb 28 00:03:43 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Tue Feb 28 05:09:23 2017 +0700
----------------------------------------------------------------------
.../Collation/CollationAttributeFactory.cs | 6 ++++--
.../Collation/CollationKeyAnalyzer.cs | 6 ++++--
src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs | 6 ++++--
.../Collation/CollationKeyFilterFactory.cs | 6 ++++--
.../Collation/TokenAttributes/CollatedTermAttributeImpl.cs | 6 ++++--
.../Collation/TestCollationKeyAnalyzer.cs | 6 ++++--
.../Collation/TestCollationKeyFilter.cs | 6 ++++--
.../Collation/TestCollationKeyFilterFactory.cs | 6 ++++--
8 files changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
index 6e15ad1..bc2fa88 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu.Collation;
+\ufeff#if FEATURE_COLLATION
+using Icu.Collation;
using Lucene.Net.Collation.TokenAttributes;
using Lucene.Net.Util;
using System.Reflection;
@@ -102,4 +103,5 @@ namespace Lucene.Net.Collation
: this.@delegate.CreateAttributeInstance<T>();
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
index 6ebee3d..92ce4a0 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu.Collation;
+\ufeff#if FEATURE_COLLATION
+using Icu.Collation;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.Core;
using Lucene.Net.Util;
@@ -126,4 +127,5 @@ namespace Lucene.Net.Collation
}
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
index ae90816..4e053d7 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu.Collation;
+\ufeff#if FEATURE_COLLATION
+using Icu.Collation;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Util;
@@ -122,4 +123,5 @@ namespace Lucene.Net.Collation
return unsigned;
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
index 801692d..0859eda 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu;
+\ufeff#if FEATURE_COLLATION
+using Icu;
using Icu.Collation;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.Util;
@@ -299,4 +300,5 @@ namespace Lucene.Net.Collation
return value;
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs b/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
index 05333ed..bb8453d 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu.Collation;
+\ufeff#if FEATURE_COLLATION
+using Icu.Collation;
using Lucene.Net.Analysis.TokenAttributes;
using System;
@@ -52,4 +53,5 @@ namespace Lucene.Net.Collation.TokenAttributes
bytes.Length = bytes.Bytes.Length;
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
index 6af17e1..5f96c71 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
@@ -1,4 +1,5 @@
-\ufeffusing Icu;
+\ufeff#if FEATURE_COLLATION
+using Icu;
using Icu.Collation;
using Lucene.Net.Analysis;
using Lucene.Net.Util;
@@ -160,4 +161,5 @@ namespace Lucene.Net.Collation
return collator;
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
index fc6f4c9..c720c4b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
@@ -1,4 +1,5 @@
-\ufeffusing System;
+\ufeff#if FEATURE_COLLATION
+using System;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -151,4 +152,5 @@ namespace Lucene.Net.Collation
// oStrokeFirst ? "BFJHD" : "BFJDH", "EACGI", "BJDFH", "BJDHF");
//}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e20befa0/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
index 393edd4..4d2042a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
@@ -1,4 +1,5 @@
-\ufeffusing System.Collections.Generic;
+\ufeff#if FEATURE_COLLATION
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using Icu;
@@ -150,4 +151,5 @@ namespace Lucene.Net.Collation
stream2.Dispose();
}
}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file