Author: rdonkin
Date: Thu Dec 5 20:20:51 2013
New Revision: 1548267
URL: http://svn.apache.org/r1548267
Log:
Move nested class to top level, allowing more flexibility about reuse.
Added:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
(with props)
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
Added:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java?rev=1548267&view=auto
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
(added)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
Thu Dec 5 20:20:51 2013
@@ -0,0 +1,61 @@
+/**
+ * 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.
+ */
+package org.apache.rat.analysis;
+
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+import org.apache.rat.document.IDocumentAnalyser;
+import org.apache.rat.document.RatDocumentAnalysisException;
+import org.apache.rat.document.impl.guesser.ArchiveGuesser;
+import org.apache.rat.document.impl.guesser.BinaryGuesser;
+import org.apache.rat.document.impl.guesser.NoteGuesser;
+
+final class DefaultAnalyser implements IDocumentAnalyser {
+
+ private final IHeaderMatcher matcher;
+ private final ArchiveGuesser archiveGuesser = new ArchiveGuesser();
+
+ public DefaultAnalyser(final IHeaderMatcher matcher) {
+ super();
+ this.matcher = matcher;
+ }
+
+ public void analyse(final Document subject)
+ throws RatDocumentAnalysisException {
+ final MetaData.Datum documentCategory;
+ if (NoteGuesser.isNote(subject)) {
+ documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE;
+ } else {
+ if (this.archiveGuesser.isArchive(subject.getName())) {
+ documentCategory =
+ MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE;
+ } else if (BinaryGuesser.isBinary(subject)) {
+ documentCategory =
+ MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
+ } else {
+ documentCategory =
+ MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD;
+ final DocumentHeaderAnalyser headerAnalyser =
+ new DocumentHeaderAnalyser(this.matcher);
+ headerAnalyser.analyse(subject);
+ }
+ }
+ subject.getMetaData().set(documentCategory);
+ }
+}
\ No newline at end of file
Propchange:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java?rev=1548267&r1=1548266&r2=1548267&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/DefaultAnalyserFactory.java
Thu Dec 5 20:20:51 2013
@@ -18,13 +18,7 @@
*/
package org.apache.rat.analysis;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
import org.apache.rat.document.IDocumentAnalyser;
-import org.apache.rat.document.RatDocumentAnalysisException;
-import org.apache.rat.document.impl.guesser.ArchiveGuesser;
-import org.apache.rat.document.impl.guesser.BinaryGuesser;
-import org.apache.rat.document.impl.guesser.NoteGuesser;
/**
* Creates default analysers.
@@ -37,38 +31,4 @@ public class DefaultAnalyserFactory {
return new DefaultAnalyser(matcher);
}
-
- private final static class DefaultAnalyser implements IDocumentAnalyser {
-
- private final IHeaderMatcher matcher;
- private final ArchiveGuesser archiveGuesser = new ArchiveGuesser();
-
- public DefaultAnalyser(final IHeaderMatcher matcher) {
- super();
- this.matcher = matcher;
- }
-
- public void analyse(final Document subject)
- throws RatDocumentAnalysisException {
- final MetaData.Datum documentCategory;
- if (NoteGuesser.isNote(subject)) {
- documentCategory = MetaData.RAT_DOCUMENT_CATEGORY_DATUM_NOTICE;
- } else {
- if (this.archiveGuesser.isArchive(subject.getName())) {
- documentCategory =
- MetaData.RAT_DOCUMENT_CATEGORY_DATUM_ARCHIVE;
- } else if (BinaryGuesser.isBinary(subject)) {
- documentCategory =
- MetaData.RAT_DOCUMENT_CATEGORY_DATUM_BINARY;
- } else {
- documentCategory =
- MetaData.RAT_DOCUMENT_CATEGORY_DATUM_STANDARD;
- final DocumentHeaderAnalyser headerAnalyser =
- new DocumentHeaderAnalyser(this.matcher);
- headerAnalyser.analyse(subject);
- }
- }
- subject.getMetaData().set(documentCategory);
- }
- }
}
