From f06c046f6c0fc51cba8ef0ed1a1b43e8388f0ab4 Mon Sep 17 00:00:00 2001 From: low012 Date: Fri, 23 May 2008 18:12:44 +0000 Subject: [PATCH] *) refactoring (several instances of Indetificator can be created and used parallel now) *) fixed a potential NPE git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4841 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- .../identification/Identificator.java | 44 +-------- .../LanguageStatisticsHolder.java | 96 +++++++++++++++++++ 2 files changed, 100 insertions(+), 40 deletions(-) create mode 100644 source/de/anomic/language/identification/LanguageStatisticsHolder.java diff --git a/source/de/anomic/language/identification/Identificator.java b/source/de/anomic/language/identification/Identificator.java index 6a9d7e9ec..26af8a05c 100644 --- a/source/de/anomic/language/identification/Identificator.java +++ b/source/de/anomic/language/identification/Identificator.java @@ -4,7 +4,7 @@ // first published on http://www.yacy.net // Braunschweig, Germany, 2008 // -// $LastChangedDate: 2008-05-18 23:00:00 +0200 (Di, 18 Mai 2008) $ +// $LastChangedDate: 2008-05-23 23:00:00 +0200 (Fr, 23 Mai 2008) $ // $LastChangedRevision: 4824 $ // $LastChangedBy: low012 $ // @@ -43,37 +43,19 @@ package de.anomic.language.identification; -import java.io.File; -import java.io.FilenameFilter; import java.util.Iterator; import java.util.List; import java.util.Vector; /** * This class can try to identify the language a text is written in. - * It has been implemented as a Singleton since it has to access several - * files on instanciation which should be avoided since it is very slow. */ public final class Identificator { - private List languages = new Vector(); - private String languageDir = "langstats"; // directory that contains language files + private LanguageStatisticsHolder languages; - private static Identificator instance; - - private Identificator() { - addAllLanguagesInDirectory(languageDir); - } - - /** - * method to get an instance of this class, should be used insted of new Identificator() - * @return an instance of the class Identificator - */ - public synchronized static Identificator getInstance() { - if (instance == null) { - instance = new Identificator(); - } - return instance; + public Identificator() { + languages = LanguageStatisticsHolder.getInstance(); } /** @@ -197,22 +179,4 @@ public final class Identificator { } - /** - * Reads all language files from a directory. - * @param directory the directory that contains the language files - */ - private void addAllLanguagesInDirectory(String directory) { - - File folder = new File(directory); - FilenameFilter filter = new LanguageFilenameFilter(); - File[] allLanguageFiles = folder.listFiles(filter); - - for (int i = 0; i < allLanguageFiles.length; i++) { - if(allLanguageFiles[i].isFile()) { - languages.add(new LanguageStatistics(allLanguageFiles[i])); - } - } - } - - } diff --git a/source/de/anomic/language/identification/LanguageStatisticsHolder.java b/source/de/anomic/language/identification/LanguageStatisticsHolder.java new file mode 100644 index 000000000..d9d9b408d --- /dev/null +++ b/source/de/anomic/language/identification/LanguageStatisticsHolder.java @@ -0,0 +1,96 @@ +// LanguageStatisticsHolder.java +// ----------------------- +// (C) by Marc Nause; marc.nause@audioattack.de +// first published on http://www.yacy.net +// Braunschweig, Germany, 2008 +// +// $LastChangedDate: 2008-05-23 23:00:00 +0200 (Fr, 23 Mai 2008) $ +// $LastChangedRevision: 4824 $ +// $LastChangedBy: low012 $ +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// Using this software in any meaning (reading, learning, copying, compiling, +// running) means that you agree that the Author(s) is (are) not responsible +// for cost, loss of data or any harm that may be caused directly or indirectly +// by usage of this softare or this documentation. The usage of this software +// is on your own risk. The installation and usage (starting/running) of this +// software may allow other people or application to access your computer and +// any attached devices and is highly dependent on the configuration of the +// software which must be done by the user of the software; the author(s) is +// (are) also not responsible for proper configuration and usage of the +// software, even if provoked by documentation provided together with +// the software. +// +// Any changes to this file according to the GPL as documented in the file +// gpl.txt aside this file in the shipment you received can be done to the +// lines that follows this copyright notice here, but changes must not be +// done inside the copyright notive above. A re-distribution must contain +// the intact and unchanged copyright notice. +// Contributions and changes to the program code must be marked as such. + +package de.anomic.language.identification; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.Vector; + +/** + * This class loads and provides several language statistics to the system. + * It has been implemented as a Singleton since it has to access several + * files on instanciation which should be avoided since it is very slow. + */ +public class LanguageStatisticsHolder extends Vector { + + private String languageDir = "langstats"; // directory that contains language files + + private static LanguageStatisticsHolder instance; + + private LanguageStatisticsHolder() { + addAllLanguagesInDirectory(languageDir); + } + + /** + * method to get an instance of this class, should be used instead of + * new LanguageStatisticsHolder() + * @return an instance of the class Identificator + */ + public synchronized static LanguageStatisticsHolder getInstance() { + if (instance == null) { + instance = new LanguageStatisticsHolder(); + } + return instance; + } + + /** + * Reads all language files from a directory. + * @param directory the directory that contains the language files + */ + private void addAllLanguagesInDirectory(String directory) { + + File folder = new File(directory); + FilenameFilter filter = new LanguageFilenameFilter(); + File[] allLanguageFiles = folder.listFiles(filter); + + if (allLanguageFiles != null) { + for (int i = 0; i < allLanguageFiles.length; i++) { + if(allLanguageFiles[i].isFile()) { + this.add(new LanguageStatistics(allLanguageFiles[i])); + } + } + } + } + +}