merged 1.1 branch into head

[mir.git] / source / mircoders / module / ModuleLanguage.java

diff --git a/source/mircoders/module/ModuleLanguage.java b/source/mircoders/module/ModuleLanguage.java
index 565d3d9..c855058 100755 (executable)
--- a/source/mircoders/module/ModuleLanguage.java
+++ b/source/mircoders/module/ModuleLanguage.java
@@ -29,24 +29,15 @@
  */
 package mircoders.module;
 
+import mir.entity.Entity;
+import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
 import mir.module.AbstractModule;
 import mir.module.ModuleExc;
 import mir.module.ModuleFailure;
 import mir.util.JDBCStringRoutines;
-import mir.entity.Entity;
-import mir.entity.EntityList;
 import mircoders.storage.DatabaseLanguage;
 
-/**
- * Title:        mir - another content management system
- * Description:
- * Copyright:    Copyright (c) 2001
- * Company:      indymedia
- * @author       idefix
- * @version 1.0
- */
-
 public class ModuleLanguage extends AbstractModule {
   static LoggerWrapper logger = new LoggerWrapper("Module.Language");
 
@@ -56,7 +47,7 @@ public class ModuleLanguage extends AbstractModule {
 
   public String languageIdForCode(String aCode) throws ModuleExc, ModuleFailure {
     try {
-      return storage.executeFreeSingleValueSql("select id from language where code = '" + JDBCStringRoutines.escapeStringLiteral(aCode) + "'");
+      return database.executeFreeSingleValueSql("select id from language where code = '" + JDBCStringRoutines.escapeStringLiteral(aCode) + "'");
     }
     catch (Throwable t) {
       throw new ModuleFailure(t);
@@ -65,13 +56,12 @@ public class ModuleLanguage extends AbstractModule {
 
   public Entity languageForCode(String aCode) throws ModuleExc, ModuleFailure {
     try {
-      EntityList list = storage.selectByFieldValue("code", aCode);
+      EntityList list = database.selectByFieldValue("code", aCode);
+      
       if (list.size()>0) {
         return list.elementAt(0);
       }
-      else {
-        throw new ModuleExc("No language found for code " + aCode);
-      }
+                       throw new ModuleExc("No language found for code " + aCode);
     }
     catch (Throwable t) {
       throw new ModuleFailure(t);