You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by rm...@apache.org on 2010/10/30 13:52:42 UTC
svn commit: r1029033 - in /lucene/java/branches/lucene_3_0:
contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/
contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/
contrib/highlighter/src/java/org/apache/lucene/search/...
Author: rmuir
Date: Sat Oct 30 11:52:41 2010
New Revision: 1029033
URL: http://svn.apache.org/viewvc?rev=1029033&view=rev
Log:
fix eol-style in .java files
Modified:
lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (props changed)
lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java (contents, props changed)
lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java (props changed)
lucene/java/branches/lucene_3_0/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java (props changed)
lucene/java/branches/lucene_3_0/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (props changed)
lucene/java/branches/lucene_3_0/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesianShapeFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharReader.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharStream.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/MappingCharFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/NormalizeCharMap.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/ReaderUtil.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestIsCurrent.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (props changed)
Propchange: lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java?rev=1029033&r1=1029032&r2=1029033&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java (original)
+++ lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java Sat Oct 30 11:52:41 2010
@@ -1,73 +1,73 @@
-package org.apache.lucene.benchmark.byTask.tasks;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.Properties;
-
-import org.apache.lucene.benchmark.BenchmarkTestCase;
-import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.benchmark.byTask.utils.Config;
-
-/** Tests the functionality of the abstract {@link PerfTask}. */
-public class PerfTaskTest extends BenchmarkTestCase {
-
- private static final class MyPerfTask extends PerfTask {
-
- public MyPerfTask(PerfRunData runData) {
- super(runData);
- }
-
- @Override
- public int doLogic() throws Exception {
- return 0;
- }
-
- public int getLogStep() { return logStep; }
-
- }
-
- private PerfRunData createPerfRunData(boolean setLogStep, int logStepVal,
- boolean setTaskLogStep, int taskLogStepVal) throws Exception {
- Properties props = new Properties();
- if (setLogStep) {
- props.setProperty("log.step", Integer.toString(logStepVal));
- }
- if (setTaskLogStep) {
- props.setProperty("log.step.MyPerf", Integer.toString(taskLogStepVal));
- }
- props.setProperty("directory", "RAMDirectory"); // no accidental FS dir.
- Config config = new Config(props);
- return new PerfRunData(config);
- }
-
- private void doLogStepTest(boolean setLogStep, int logStepVal,
- boolean setTaskLogStep, int taskLogStepVal, int expLogStepValue) throws Exception {
- PerfRunData runData = createPerfRunData(setLogStep, logStepVal, setTaskLogStep, taskLogStepVal);
- MyPerfTask mpt = new MyPerfTask(runData);
- assertEquals(expLogStepValue, mpt.getLogStep());
- }
-
- public void testLogStep() throws Exception {
- doLogStepTest(false, -1, false, -1, PerfTask.DEFAULT_LOG_STEP);
- doLogStepTest(true, -1, false, -1, Integer.MAX_VALUE);
- doLogStepTest(true, 100, false, -1, 100);
- doLogStepTest(false, -1, true, -1, Integer.MAX_VALUE);
- doLogStepTest(false, -1, true, 100, 100);
- }
-
-}
+package org.apache.lucene.benchmark.byTask.tasks;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Properties;
+
+import org.apache.lucene.benchmark.BenchmarkTestCase;
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+import org.apache.lucene.benchmark.byTask.utils.Config;
+
+/** Tests the functionality of the abstract {@link PerfTask}. */
+public class PerfTaskTest extends BenchmarkTestCase {
+
+ private static final class MyPerfTask extends PerfTask {
+
+ public MyPerfTask(PerfRunData runData) {
+ super(runData);
+ }
+
+ @Override
+ public int doLogic() throws Exception {
+ return 0;
+ }
+
+ public int getLogStep() { return logStep; }
+
+ }
+
+ private PerfRunData createPerfRunData(boolean setLogStep, int logStepVal,
+ boolean setTaskLogStep, int taskLogStepVal) throws Exception {
+ Properties props = new Properties();
+ if (setLogStep) {
+ props.setProperty("log.step", Integer.toString(logStepVal));
+ }
+ if (setTaskLogStep) {
+ props.setProperty("log.step.MyPerf", Integer.toString(taskLogStepVal));
+ }
+ props.setProperty("directory", "RAMDirectory"); // no accidental FS dir.
+ Config config = new Config(props);
+ return new PerfRunData(config);
+ }
+
+ private void doLogStepTest(boolean setLogStep, int logStepVal,
+ boolean setTaskLogStep, int taskLogStepVal, int expLogStepValue) throws Exception {
+ PerfRunData runData = createPerfRunData(setLogStep, logStepVal, setTaskLogStep, taskLogStepVal);
+ MyPerfTask mpt = new MyPerfTask(runData);
+ assertEquals(expLogStepValue, mpt.getLogStep());
+ }
+
+ public void testLogStep() throws Exception {
+ doLogStepTest(false, -1, false, -1, PerfTask.DEFAULT_LOG_STEP);
+ doLogStepTest(true, -1, false, -1, Integer.MAX_VALUE);
+ doLogStepTest(true, 100, false, -1, 100);
+ doLogStepTest(false, -1, true, -1, Integer.MAX_VALUE);
+ doLogStepTest(false, -1, true, 100, 100);
+ }
+
+}
Propchange: lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesianShapeFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/CharStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/MappingCharFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/NormalizeCharMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/ReaderUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestIsCurrent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
------------------------------------------------------------------------------
svn:eol-style = native