svnno****@sourc*****
svnno****@sourc*****
2008年 10月 5日 (日) 08:44:20 JST
Revision: 1993
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1993
Author: daisuke_m
Date: 2008-10-05 08:44:20 +0900 (Sun, 05 Oct 2008)
Log Message:
-----------
新しいJiemamy-coreの使い方に追従。まだ動いてないけど。
Modified Paths:
--------------
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
vesta/trunk/org.jiemamy.eclipse/src/main/resources/jiemamy-eclipse.dicon
-------------- next part --------------
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2008-10-04 17:57:46 UTC (rev 1992)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2008-10-04 23:44:20 UTC (rev 1993)
@@ -168,8 +168,8 @@
try {
SingletonS2ContainerFactory.setConfigPath("jiemamy-eclipse.dicon");
SingletonS2ContainerFactory.init();
- } catch (Exception t) {
- t.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
container = SingletonS2ContainerFactory.getContainer();
plugin = this;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java 2008-10-04 17:57:46 UTC (rev 1992)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java 2008-10-04 23:44:20 UTC (rev 1993)
@@ -31,6 +31,7 @@
import org.eclipse.ui.ide.IDE;
import org.seasar.framework.container.S2Container;
+import org.jiemamy.core.S2FactoryStrategy;
import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.utils.ExceptionHandler;
@@ -142,6 +143,7 @@
*/
@Override
protected InputStream getInitialContents() {
+ JiemamyModelFactory.init(new S2FactoryStrategy("jiemamy-eclipse.dicon"));
RootModel rootModel = JiemamyModelFactory.createRoot().init();
try {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/resources/jiemamy-eclipse.dicon
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/resources/jiemamy-eclipse.dicon 2008-10-04 17:57:46 UTC (rev 1992)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/resources/jiemamy-eclipse.dicon 2008-10-04 23:44:20 UTC (rev 1993)
@@ -2,7 +2,8 @@
<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
"http://www.seasar.org/dtd/components24.dtd">
<components>
- <include path="jiemamy-core.dicon"/>
+ <include path="jiemamy-view.dicon"/>
+ <include path="jiemamy-event.dicon"/>
<include path="jiemamy-serializer.dicon"/>
<include path="jiemamy-dialect.dicon"/>