svnno****@sourc*****
svnno****@sourc*****
2009年 10月 8日 (木) 03:16:38 JST
Revision: 3728 http://sourceforge.jp/projects/jiemamy/svn/view?view=rev&revision=3728 Author: daisuke_m Date: 2009-10-08 03:16:38 +0900 (Thu, 08 Oct 2009) Log Message: ----------- 警告対策。 Modified Paths: -------------- hermes/jiemamy-dialect-mysql/trunk/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java Modified: hermes/jiemamy-dialect-mysql/trunk/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java =================================================================== --- hermes/jiemamy-dialect-mysql/trunk/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java 2009-10-07 17:55:44 UTC (rev 3727) +++ hermes/jiemamy-dialect-mysql/trunk/src/test/java/org/jiemamy/dialect/mysql/MySqlEmitterTest.java 2009-10-07 18:16:38 UTC (rev 3728) @@ -76,7 +76,7 @@ mb.tableDept.registerAdapter(new StorageEngineImpl()); mb.tableDept.getAdapter(StorageEngine.class).setType(StandardEngine.InnoDB); - Dialect dialect = mb.rootModel.findDialect(); + Dialect dialect = mb.jiemamy.getServiceLocator().getService(Dialect.class, mb.rootModel.getDialectClassName()); jiemamy = mb.getJiemamy(); sqlEmitter = new MySqlEmitter(dialect.getDataTypeResolver()); @@ -118,7 +118,7 @@ JiemamyFactory factory = jiemamy.getFactory(); RootModel rootModel = factory.getRootModel(); rootModel.setDialectClassName(MySqlDialect.class.getName()); - Dialect dialect = rootModel.findDialect(); + Dialect dialect = jiemamy.getServiceLocator().getService(Dialect.class, rootModel.getDialectClassName()); TableModel tableModel = factory.newModel(TableModel.class); rootModel.getEntities().add(tableModel); Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java =================================================================== --- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-10-07 17:55:44 UTC (rev 3727) +++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-10-07 18:16:38 UTC (rev 3728) @@ -508,12 +508,13 @@ @SuppressWarnings("unchecked") T result = (T) Class.forName(fqcn).newInstance(); return result; - } catch (Exception e) { + } catch (InstantiationException e) { // ignore + } catch (IllegalAccessException e) { + // ignore } throw new ClassNotFoundException(fqcn); } - } }