some misc. maintenance

[mir.git] / source / mir / entity / adapter / EntityAdapterModel.java

diff --git a/source/mir/entity/adapter/EntityAdapterModel.java b/source/mir/entity/adapter/EntityAdapterModel.java
index 154b161..586200e 100755 (executable)
--- a/source/mir/entity/adapter/EntityAdapterModel.java
+++ b/source/mir/entity/adapter/EntityAdapterModel.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2001, 2002  The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir 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.
- *
- * Mir 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 Mir; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
- */
-
+/*\r
+ * Copyright (C) 2001, 2002  The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * In addition, as a special exception, The Mir-coders gives permission to link\r
+ * the code of this program with the com.oreilly.servlet library, any library\r
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
+ * the above that use the same license as the above), and distribute linked\r
+ * combinations including the two.  You must obey the GNU General Public\r
+ * License in all respects for all of the code used other than the above\r
+ * mentioned libraries.  If you modify this file, you may extend this exception\r
+ * to your version of the file, but you are not obligated to do so.  If you do\r
+ * not wish to do so, delete this exception statement from your version.\r
+ */\r
+\r
 package mir.entity.adapter;\r
 \r
 import java.util.*;\r
@@ -43,12 +43,9 @@ public class EntityAdapterModel {
     entityAdapterMappings = new HashMap();\r
   }\r
 \r
-  public EntityAdapter makeEntityAdapter( String aName, Entity anEntity ) {\r
+  public EntityAdapter makeEntityAdapter( String aName, Entity anEntity ) throws EntityAdapterExc {\r
     Mapping mapping = getMappingForName( aName );\r
 \r
-    if (mapping == null )\r
-      throw new RuntimeException( "Adapter definition with name '" + aName + "' not present in model" );\r
-\r
     return mapping.getDefinition().makeEntityAdapter( anEntity, this );\r
   }\r
 \r
@@ -56,7 +53,10 @@ public class EntityAdapterModel {
     entityAdapterMappings.put( aName, new Mapping( aStorage, aDefinition ) );\r
     }\r
 \r
-  public Mapping getMappingForName( String aName ) {\r
+  public Mapping getMappingForName( String aName ) throws EntityAdapterExc {\r
+    if (!entityAdapterMappings.containsKey(aName))\r
+      throw new EntityAdapterExc( "'" + aName + "' not present in model" );\r
+\r
     return (Mapping) entityAdapterMappings.get( aName );\r
   }\r
 \r
@@ -80,4 +80,3 @@ public class EntityAdapterModel {
 }\r
 \r
 \r
-                                                                                                   
\ No newline at end of file