svnno****@sourc*****
svnno****@sourc*****
2008年 10月 6日 (月) 23:04:58 JST
Revision: 1999
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1999
Author: daisuke_m
Date: 2008-10-06 23:04:58 +0900 (Mon, 06 Oct 2008)
Log Message:
-----------
J-eclipseが、直接Seasar2に依存しないように変更。
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/editor/DiagramEditor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.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
Added Paths:
-----------
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java
-------------- next part --------------
Added: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java (rev 0)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/25
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.serializer;
+
+import org.jiemamy.serializer.impl.JiemamySerializerStab;
+
+/**
+ * JiemamySerializerのインスタンスを生成するためのファクトリ。
+ * @author daisuke
+ */
+public class JiemamySerializerFactory {
+
+ private static JiemamySerializer singleton;
+
+
+ /**
+ * 新しい {@link JiemamySerializer} のインスタンスを取得する。
+ * @return {@link JiemamySerializer}のインスタンス。
+ */
+ public static JiemamySerializer getInstance() {
+ if (singleton == null) {
+ singleton = (new JiemamySerializerStab());
+ }
+ return singleton;
+ }
+
+ /**
+ * privateコンストラクタ。
+ * @category instance creation
+ */
+ private JiemamySerializerFactory() {
+ }
+}
Property changes on: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -30,9 +30,9 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.seasar.eclipse.common.util.ImageManager;
-import org.seasar.framework.container.S2Container;
-import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
+import org.jiemamy.core.S2FactoryStrategy;
+import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.eclipse.extension.ExtensionResolver;
import org.jiemamy.eclipse.extension.validator.ModelValidator;
import org.jiemamy.eclipse.preference.JiemamyPreference;
@@ -56,9 +56,6 @@
/** プラグインクラスのシングルトンインスタンス */
private static JiemamyPlugin plugin;
- /** DIコンテナ */
- private static S2Container container;
-
/** 設定 */
private static JiemamyPreference pref;
@@ -76,14 +73,6 @@
/**
- * DIコンテナを取得する。
- * @return DIコンテナ
- */
- public static S2Container getContainer() {
- return container;
- }
-
- /**
* Returns the shared instance
*
* @return the shared instance
@@ -165,19 +154,13 @@
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
- try {
- SingletonS2ContainerFactory.setConfigPath("jiemamy-eclipse.dicon");
- SingletonS2ContainerFactory.init();
- } catch (Exception e) {
- e.printStackTrace();
- }
- container = SingletonS2ContainerFactory.getContainer();
plugin = this;
- pref = new JiemamyPreferenceImpl();
- dialectResolver = new ExtensionResolver<Dialect>("org.jiemamy.core", "dialects", "dialect", "class");
- importerResolver = new ExtensionResolver<Importer>("org.jiemamy.core", "composers", "importer", "class");
- exporterResolver = new ExtensionResolver<Exporter>("org.jiemamy.core", "composers", "exporter", "class");
- validatorResolver = new ExtensionResolver<ModelValidator>(PLUGIN_ID, "validators", "dialect", "class");
+ pref = (new JiemamyPreferenceImpl());
+ dialectResolver = (new ExtensionResolver<Dialect>("org.jiemamy.core", "dialects", "dialect", "class"));
+ importerResolver = (new ExtensionResolver<Importer>("org.jiemamy.core", "composers", "importer", "class"));
+ exporterResolver = (new ExtensionResolver<Exporter>("org.jiemamy.core", "composers", "exporter", "class"));
+ validatorResolver = (new ExtensionResolver<ModelValidator>(PLUGIN_ID, "validators", "dialect", "class"));
+ JiemamyModelFactory.init(new S2FactoryStrategy("jiemamy-eclipse.dicon"));
}
/**
@@ -191,8 +174,6 @@
validatorResolver = null;
pref = null;
plugin = null;
- container.destroy();
- SingletonS2ContainerFactory.destroy();
super.stop(context);
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -85,14 +85,14 @@
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.seasar.framework.container.S2Container;
-import org.jiemamy.eclipse.JiemamyPlugin;
+import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.eclipse.editor.editpart.DiagramEditPartFactory;
import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
import org.jiemamy.eclipse.editor.editpart.OutlineTreeEditPartFactory;
import org.jiemamy.eclipse.utils.ExceptionHandler;
import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.serializer.JiemamySerializerFactory;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.view.model.DiagramPresentationModel;
import org.jiemamy.spec.view.model.DiagramPresentations;
@@ -114,8 +114,6 @@
private boolean savePreviouslyNeeded = false;
- private S2Container container = JiemamyPlugin.getContainer();
-
/**
* コンストラクタ。
@@ -161,7 +159,7 @@
try {
IFile file = ((IFileEditorInput) getEditorInput()).getFile();
RootModel rootModel = (RootModel) getGraphicalViewer().getContents().getModel();
- JiemamySerializer serializer = (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
InputStream stream = serializer.serialize(rootModel);
file.setContents(stream, true, true, monitor);
getCommandStack().markSaveLocation();
@@ -193,8 +191,7 @@
public void execute(IProgressMonitor monitor) {
try {
RootModel rootModel = (RootModel) getGraphicalViewer().getContents().getModel();
- JiemamySerializer serializer =
- (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
InputStream stream = serializer.serialize(rootModel);
file.create(stream, true, monitor);
} catch (Exception e) {
@@ -442,7 +439,7 @@
// 最上位モデルの設定
IFile file = ((IFileEditorInput) getEditorInput()).getFile();
- JiemamySerializer serializer = (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
try {
rootModel = serializer.deserialize(file.getContents());
// rootModel.setDisplayMode(DatabaseModel.MODE_PHYSICAL_ATTRTYPE);
@@ -452,7 +449,7 @@
ExceptionHandler.handleException(e);
} finally {
if (rootModel == null) {
- rootModel = (RootModel) container.getComponent(RootModel.class);
+ rootModel = JiemamyModelFactory.createRoot();
}
if (rootModel.getAdapter(DiagramPresentations.class).size() == 0) {
DiagramPresentationModel presentationModel =
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -40,12 +40,12 @@
import org.eclipse.ui.dialogs.SaveAsDialog;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.MultiPageEditorPart;
-import org.seasar.framework.container.S2Container;
import org.seasar.framework.util.tiger.CollectionsUtil;
-import org.jiemamy.eclipse.JiemamyPlugin;
+import org.jiemamy.creator.JiemamyModelFactory;
import org.jiemamy.eclipse.utils.ExceptionHandler;
import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.serializer.JiemamySerializerFactory;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.view.model.DiagramPresentationModel;
import org.jiemamy.spec.view.model.DiagramPresentations;
@@ -61,8 +61,6 @@
/** エディタのルートモデル */
private RootModel rootModel;
- private S2Container container = JiemamyPlugin.getContainer();
-
/**
* コンストラクタ。
@@ -88,7 +86,7 @@
public void doSave(IProgressMonitor monitor) {
try {
IFile file = ((IFileEditorInput) getEditorInput()).getFile();
- JiemamySerializer serializer = (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
InputStream stream = serializer.serialize(rootModel);
file.setContents(stream, true, true, monitor);
for (DiagramEditor2 editor : editors) {
@@ -121,8 +119,7 @@
@Override
public void execute(IProgressMonitor monitor) {
try {
- JiemamySerializer serializer =
- (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
InputStream stream = serializer.serialize(rootModel);
file.create(stream, true, monitor);
} catch (Exception e) {
@@ -157,31 +154,27 @@
*/
@Override
public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ super.init(site, input);
+
+ // 最上位モデルの設定
+ IFile file = ((IFileEditorInput) input).getFile();
+ JiemamySerializer serializer = JiemamySerializerFactory.getInstance();
try {
- super.init(site, input);
-
- // 最上位モデルの設定
- IFile file = ((IFileEditorInput) input).getFile();
- JiemamySerializer serializer = (JiemamySerializer) container.getComponent(JiemamySerializer.class);
- try {
- rootModel = serializer.deserialize(file.getContents());
+ rootModel = serializer.deserialize(file.getContents());
// rootModel.setDisplayMode(DatabaseModel.MODE_PHYSICAL_ATTRTYPE);
- } catch (SerializationException e) {
- ExceptionHandler.handleException(e, "Data file is broken.");
- } catch (Exception e) {
- ExceptionHandler.handleException(e);
- } finally {
- if (rootModel == null) {
- rootModel = (RootModel) container.getComponent(RootModel.class);
- }
- if (rootModel.getAdapter(DiagramPresentations.class).size() == 0) {
- DiagramPresentationModel presentationModel =
- rootModel.createJiemamyModel(DiagramPresentationModel.class).init("default");
- rootModel.appendModel(presentationModel);
- }
- }
+ } catch (SerializationException e) {
+ ExceptionHandler.handleException(e, "Data file is broken.");
} catch (Exception e) {
- ExceptionHandler.handleException(e, "exception initializing " + getClass().getName()); //$NON-NLS-1$
+ ExceptionHandler.handleException(e);
+ } finally {
+ if (rootModel == null) {
+ rootModel = JiemamyModelFactory.createRoot();
+ }
+ if (rootModel.getAdapter(DiagramPresentations.class).size() == 0) {
+ DiagramPresentationModel presentationModel =
+ rootModel.createJiemamyModel(DiagramPresentationModel.class).init("default");
+ rootModel.appendModel(presentationModel);
+ }
}
setPartName(input.getName());
}
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/DiagramEditPartFactory.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -20,9 +20,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
-import org.seasar.framework.container.S2Container;
-import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.editpart.diagram.ForeignKeyEditPart;
import org.jiemamy.eclipse.editor.editpart.diagram.RootEditPart;
import org.jiemamy.eclipse.editor.editpart.diagram.StickyEditPart;
@@ -41,9 +39,6 @@
*/
public class DiagramEditPartFactory implements EditPartFactory {
- private S2Container container = JiemamyPlugin.getContainer();
-
-
/**
* {@inheritDoc}
*/
@@ -51,15 +46,15 @@
EditPart part = null;
if (model instanceof RootModel) {
- part = (EditPart) container.getComponent(RootEditPart.class);
+ part = (new RootEditPart());
} else if (model instanceof TableModel) {
- part = (EditPart) container.getComponent(TableEditPart.class);
+ part = (new TableEditPart());
} else if (model instanceof ViewModel) {
- part = (EditPart) container.getComponent(ViewEditPart.class);
+ part = (new ViewEditPart());
} else if (model instanceof StickyModel) {
- part = (EditPart) container.getComponent(StickyEditPart.class);
+ part = (new StickyEditPart());
} else if (model instanceof ForeignKeyModel) {
- part = (EditPart) container.getComponent(ForeignKeyEditPart.class);
+ part = (new ForeignKeyEditPart());
}
if (part == null) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/OutlineTreeEditPartFactory.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -20,9 +20,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
-import org.seasar.framework.container.S2Container;
-import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.ModelContainer;
import org.jiemamy.eclipse.editor.editpart.outlinetree.ModelContainerEditPart;
import org.jiemamy.eclipse.editor.editpart.outlinetree.RelationTreeEditPart;
@@ -44,9 +42,6 @@
*/
public class OutlineTreeEditPartFactory implements EditPartFactory {
- private S2Container container = JiemamyPlugin.getContainer();
-
-
/**
* {@inheritDoc}
*/
@@ -54,19 +49,19 @@
EditPart part = null;
if (model instanceof RootModel) {
- part = (EditPart) container.getComponent(RootTreeEditPart.class);
+ part = (new RootTreeEditPart());
} else if (model instanceof TableModel) {
- part = (EditPart) container.getComponent(TableTreeEditPart.class);
+ part = (new TableTreeEditPart());
} else if (model instanceof ColumnModel) {
- part = (EditPart) container.getComponent(TypeDefTreeEditPart.class);
+ part = (new TypeDefTreeEditPart());
} else if (model instanceof DomainModel) {
- part = (EditPart) container.getComponent(TypeDefTreeEditPart.class);
+ part = (new TypeDefTreeEditPart());
} else if (model instanceof ViewModel) {
- part = (EditPart) container.getComponent(ViewTreeEditPart.class);
+ part = (new ViewTreeEditPart());
} else if (model instanceof AbstractRelationModel) {
- part = (EditPart) container.getComponent(RelationTreeEditPart.class);
+ part = (new RelationTreeEditPart());
} else if (model instanceof ModelContainer) {
- part = (EditPart) container.getComponent(ModelContainerEditPart.class);
+ part = (new ModelContainerEditPart());
}
if (part == null) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -25,10 +25,8 @@
import org.eclipse.draw2d.StackLayout;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.tools.DirectEditManager;
-import org.seasar.framework.container.S2Container;
import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.figure.StickyFigure;
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.spec.event.ModelChangeEvent;
@@ -45,9 +43,6 @@
*/
public class StickyEditPart extends AbstractNodeEditPart {
- private S2Container container = JiemamyPlugin.getContainer();
-
-
/**
* {@inheritDoc}
*/
@@ -101,7 +96,7 @@
*/
@Override
protected IFigure createFigure() {
- StickyFigure figure = (StickyFigure) container.getComponent(StickyFigure.class);
+ StickyFigure figure = new StickyFigure();
String contents = ((StickyModel) getModel()).getContents();
if (contents.length() > 0) {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -25,10 +25,8 @@
import org.eclipse.draw2d.StackLayout;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.NodeEditPart;
-import org.seasar.framework.container.S2Container;
import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.DisplayTarget;
import org.jiemamy.eclipse.editor.extraprocessor.IsDisplayedProcessor;
@@ -53,9 +51,6 @@
*/
public class TableEditPart extends AbstractEntityEditPart implements NodeEditPart {
- private S2Container container = JiemamyPlugin.getContainer();
-
-
/**
* {@inheritDoc}
*/
@@ -133,7 +128,7 @@
*/
@Override
protected IFigure createFigure() {
- TableFigure figure = (TableFigure) container.getComponent(TableFigure.class);
+ TableFigure figure = (new TableFigure());
String description = ((TableModel) getModel()).getDescription();
if (description != null && description.length() > 0) {
@@ -202,8 +197,8 @@
return new ColumnFigure[0];
}
- ColumnFigure nameLabel = (ColumnFigure) container.getComponent(ColumnFigure.class);
- ColumnFigure typeLabel = (ColumnFigure) container.getComponent(ColumnFigure.class);
+ ColumnFigure nameLabel = (new ColumnFigure());
+ ColumnFigure typeLabel = (new ColumnFigure());
nameLabel.setText(rootModel.process(new LabelStringProcessor(column, DisplayTarget.NAME, DisplayPlace.FIGURE)));
typeLabel.setText(rootModel.process(new LabelStringProcessor(column, DisplayTarget.TYPE, DisplayPlace.FIGURE)));
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2008-10-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -25,10 +25,8 @@
import org.eclipse.draw2d.StackLayout;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.NodeEditPart;
-import org.seasar.framework.container.S2Container;
import org.jiemamy.core.MustBeMulti;
-import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.DisplayTarget;
import org.jiemamy.eclipse.editor.extraprocessor.LabelStringProcessor;
@@ -49,9 +47,6 @@
*/
public class ViewEditPart extends AbstractEntityEditPart implements NodeEditPart {
- private S2Container container = JiemamyPlugin.getContainer();
-
-
/**
* {@inheritDoc}
*/
@@ -107,7 +102,7 @@
*/
@Override
protected IFigure createFigure() {
- ViewFigure figure = (ViewFigure) container.getComponent(ViewFigure.class);
+ ViewFigure figure = (new ViewFigure());
String definition = ((ViewModel) getModel()).getDefinition();
if (definition.length() > 0) {
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-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/NewDiagramWizard.java 2008-10-06 14:04:58 UTC (rev 1999)
@@ -29,13 +29,12 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
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;
import org.jiemamy.serializer.JiemamySerializer;
+import org.jiemamy.serializer.impl.JiemamySerializerStab;
import org.jiemamy.spec.model.RootModel;
/**
@@ -50,8 +49,6 @@
private ISelection selection;
- private S2Container container = JiemamyPlugin.getContainer();
-
/**
* Instantiates a new new diagram wizard.
@@ -67,7 +64,7 @@
*/
@Override
public void addPages() {
- page = new NewDiagramWizardPage((IStructuredSelection) selection);
+ page = (new NewDiagramWizardPage((IStructuredSelection) selection));
addPage(page);
}
@@ -127,7 +124,7 @@
setTitle(Messages.Wizard_Title);
setMessage(Messages.Wizard_Message);
// setFileName("jiemamy.jer");
- serializer = (JiemamySerializer) container.getComponent(JiemamySerializer.class);
+ serializer = (new JiemamySerializerStab()); // FIXME serializer完成し次第、Implに切り替え。
}
/**
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-06 13:43:17 UTC (rev 1998)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/resources/jiemamy-eclipse.dicon 2008-10-06 14:04:58 UTC (rev 1999)
@@ -2,30 +2,8 @@
<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
"http://www.seasar.org/dtd/components24.dtd">
<components>
- <include path="jiemamy-view.dicon"/>
<include path="jiemamy-event.dicon"/>
<include path="jiemamy-serializer.dicon"/>
<include path="jiemamy-dialect.dicon"/>
-
- <!-- Diagram Edit Part (Controller) -->
- <component class="org.jiemamy.eclipse.editor.editpart.diagram.RootEditPart" instance="prototype" autoBinding="none"/>
- <component class="org.jiemamy.eclipse.editor.editpart.diagram.TableEditPart" instance="prototype" autoBinding="none"/>
- <component class="org.jiemamy.eclipse.editor.editpart.diagram.ViewEditPart" instance="prototype" autoBinding="none"/>
- <component class="org.jiemamy.eclipse.editor.editpart.diagram.StickyEditPart" instance="prototype" autoBinding="none"/>
- <component class="org.jiemamy.eclipse.editor.editpart.diagram.ForeignKeyEditPart" instance="prototype" autoBinding="none"/>
-
- <!-- Diagram Figure (View) -->
- <component class="org.jiemamy.eclipse.editor.figure.ColumnFigure" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.figure.TableFigure" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.figure.ViewFigure" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.figure.StickyFigure" instance="prototype" autoBinding="none" />
-
-
- <!-- Outline Tree Edit Part (Controller) -->
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.ModelContainerEditPart" instance="prototype" autoBinding="none"/>
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.TableTreeEditPart" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.ViewTreeEditPart" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.RelationTreeEditPart" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.RootTreeEditPart" instance="prototype" autoBinding="none" />
- <component class="org.jiemamy.eclipse.editor.editpart.outlinetree.TypeDefTreeEditPart" instance="prototype" autoBinding="none" />
+ <include path="jiemamy-view.dicon"/>
</components>