svnno****@sourc*****
svnno****@sourc*****
2009年 3月 23日 (月) 14:04:57 JST
Revision: 2981
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2981
Author: daisuke_m
Date: 2009-03-23 14:04:57 +0900 (Mon, 23 Mar 2009)
Log Message:
-----------
ヒープ汚染解消。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/ArtemisJiemamyFactoryTest.java
artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewFacadeImplTest.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/JiemamyUIPlugin.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/EntityPropertySource.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DataSetEditDialog.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/ui/JiemamyEditDialog.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyImplementation.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/Artemis.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -149,8 +149,8 @@
return ArtemisVersion.INSTANCE;
}
- public <T extends JiemamyFacade>T newFacade(Jiemamy jiemamy) {
- return getFactory(jiemamy).getFacade();
+ public <T extends JiemamyFacade>T newFacade(Jiemamy jiemamy, Class<T> clazz) {
+ return getFactory(jiemamy).newFacade(clazz);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -66,12 +66,6 @@
private RootModel rootModel;
- @SuppressWarnings("unchecked")
- public <T extends JiemamyFacade>T getFacade() {
- checkInitialized();
- return (T) new JiemamyFacadeImpl(jiemamy);
- }
-
public JiemamyImplementation getImplementation() {
checkInitialized();
return implementation;
@@ -146,6 +140,12 @@
return null;
}
+ @SuppressWarnings("unchecked")
+ public <T extends JiemamyFacade>T newFacade(Class<T> clazz) {
+ checkInitialized();
+ return (T) new JiemamyFacadeImpl(jiemamy);
+ }
+
public synchronized <T extends JiemamyElement>T newModel(Class<T> clazz) {
checkInitialized();
if (hasRootModel() == true && clazz == RootModel.class) {
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/ArtemisJiemamyFactoryTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/ArtemisJiemamyFactoryTest.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/ArtemisJiemamyFactoryTest.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -38,6 +38,7 @@
import org.jiemamy.Artemis;
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.facade.JiemamyFacade;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.ColumnModel;
@@ -104,7 +105,7 @@
assertThat(factory.getImplementation(), is(notNullValue()));
assertThat(factory.getSerializer(), is(notNullValue()));
assertThat(factory.getSupportedSpecs(), is(notNullValue()));
- assertThat(factory.getFacade(), is(notNullValue()));
+ assertThat(factory.newFacade(JiemamyFacade.class), is(notNullValue()));
}
/**
Modified: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewFacadeImplTest.java
===================================================================
--- artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewFacadeImplTest.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewFacadeImplTest.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -81,7 +81,7 @@
public void setUp() {
jiemamyWithView = Jiemamy.newInstance(new Artemis(new ArtemisView()));
factory = jiemamyWithView.getFactory();
- viewFacade = factory.getFacade();
+ viewFacade = factory.newFacade(JiemamyViewFacade.class);
rootModel = factory.getRootModel();
referenceResolver = jiemamyWithView.getReferenceResolver();
diagramPresentationModel = factory.newModel(DiagramPresentationModel.class);
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseDialectProvider.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -22,6 +22,7 @@
import org.jiemamy.InstanceProvider;
import org.jiemamy.dialect.Dialect;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
* Eclipse環境においての{@link Dialect}インスタンス取得戦略クラス。
@@ -34,7 +35,7 @@
try {
return JiemamyCorePlugin.getDialectResolver().getInstance(fqcn);
} catch (CoreException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
return null;
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseExporterProvider.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -23,6 +23,7 @@
import org.jiemamy.InstanceProvider;
import org.jiemamy.composer.ExportConfig;
import org.jiemamy.composer.Exporter;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
* Eclipse環境においての{@link Exporter}インスタンス取得戦略クラス。
@@ -35,7 +36,7 @@
try {
return JiemamyCorePlugin.getExporterResolver().getInstance(fqcn);
} catch (CoreException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
return null;
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/EclipseImporterProvider.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -23,6 +23,7 @@
import org.jiemamy.InstanceProvider;
import org.jiemamy.composer.ImportConfig;
import org.jiemamy.composer.Importer;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
* Eclipse環境においての{@link Importer}インスタンス取得戦略クラス。
@@ -35,7 +36,7 @@
try {
return JiemamyCorePlugin.getImporterResolver().getInstance(fqcn);
} catch (CoreException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
return null;
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/JiemamyUIPlugin.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/JiemamyUIPlugin.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/JiemamyUIPlugin.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -22,12 +22,10 @@
import java.util.ResourceBundle;
import org.apache.commons.lang.Validate;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.widgets.Display;
@@ -38,7 +36,6 @@
import org.jiemamy.eclipse.preference.JiemamyPreference;
import org.jiemamy.eclipse.preference.JiemamyPreferenceImpl;
-import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
* Jiemamy Eclipse Core PluginのActivatorクラス。
@@ -93,15 +90,6 @@
}
/**
- * ログを記録する。ログレベルはINFOとなる。
- *
- * @param msg ログメッセージ
- */
- public static void log(String msg) {
- log(msg, Status.INFO);
- }
-
- /**
* ログを記録する。
*
* @param msg ログメッセージ
@@ -112,25 +100,6 @@
plugin.getLog().log(status);
}
- /**
- * ログを記録する。
- *
- * @param throwable 発生した例外等
- * @deprecated use {@link ExceptionHandler#handleException(Throwable)}
-
- */
- @Deprecated
- public static void log(Throwable throwable) {
- IStatus status = null;
- if (throwable instanceof CoreException) {
- CoreException e = (CoreException) throwable;
- status = e.getStatus();
- } else {
- status = StatusUtil.createError(plugin, Status.ERROR, throwable);
- }
- plugin.getLog().log(status);
- }
-
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -38,7 +38,6 @@
import org.jiemamy.composer.ImportConfig;
import org.jiemamy.composer.Importer;
import org.jiemamy.eclipse.JiemamyCorePlugin;
-import org.jiemamy.eclipse.JiemamyUIPlugin;
import org.jiemamy.eclipse.action.AutoLayoutAction;
import org.jiemamy.eclipse.action.ChangeNodeBackgroundColorAction;
import org.jiemamy.eclipse.action.ExportAction;
@@ -48,6 +47,7 @@
import org.jiemamy.eclipse.action.SaveDiagramImageAction;
import org.jiemamy.eclipse.ui.ExporterWizard;
import org.jiemamy.eclipse.ui.ImporterWizard;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
/**
* コンテキストメニュープロバイダ。
@@ -192,7 +192,7 @@
.createExecutableExtension("wizard");
exportMenu.add(new ExportAction(exporter, wizard, viewer, editorPart));
} catch (CoreException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
}
menu.add(exportMenu);
@@ -215,7 +215,7 @@
.createExecutableExtension("wizard");
importMenu.add(new ImportAction(importer, wizard, viewer, editorPart));
} catch (CoreException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
}
menu.add(importMenu);
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/EntityPropertySource.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/EntityPropertySource.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/EntityPropertySource.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -28,7 +28,7 @@
import org.jiemamy.JiemamyProperty;
import org.jiemamy.JiemamyProperty.EntityProperty;
-import org.jiemamy.eclipse.JiemamyUIPlugin;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
import org.jiemamy.model.Adapter;
import org.jiemamy.model.AdapterType;
import org.jiemamy.model.entity.EntityModel;
@@ -76,15 +76,15 @@
Method m = clazz.getMethod(getterName);
return m.invoke(entityModel);
} catch (SecurityException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (IllegalArgumentException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (NoSuchMethodException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (IllegalAccessException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (InvocationTargetException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
}
return null;
@@ -108,15 +108,15 @@
m.invoke(entityModel, value);
// TODO イベント飛ばすため、facade経由しなきゃな。
} catch (SecurityException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (NoSuchMethodException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (IllegalArgumentException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (IllegalAccessException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (InvocationTargetException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -58,7 +58,7 @@
this.nodeAdapter = nodeAdapter;
this.newColor = newColor;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
}
@Override
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -76,7 +76,7 @@
*/
public ChangeNodeConstraintCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter,
JmRectangle boundary, EditPartViewer viewer) {
- super(diagramIndex, (JiemamyViewFacade) rootModel.getJiemamy().getFactory().getFacade());
+ super(diagramIndex, rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class));
this.rootModel = rootModel;
this.diagramIndex = diagramIndex;
this.nodeAdapter = nodeAdapter;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -58,7 +58,7 @@
*/
public CreateBendpointCommand(RootModel rootModel, int diagramIndex, ConnectionAdapter connectionAdapter,
Point location, int bendpointIndex) {
- super(diagramIndex, (JiemamyViewFacade) rootModel.getJiemamy().getFactory().getFacade());
+ super(diagramIndex, rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class));
this.diagramIndex = diagramIndex;
this.connectionAdapter = connectionAdapter;
this.location = location;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -81,7 +81,7 @@
this.diagramIndex = diagramIndex;
this.connection = connection;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
logger.debug(LogMarker.LIFECYCLE, "construct");
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -64,7 +64,7 @@
this.nodeAdapter = nodeAdapter;
this.rectangle = rectangle;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
logger.debug(LogMarker.LIFECYCLE, "construct");
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -59,7 +59,7 @@
this.connectionAdapter = connectionAdapter;
this.bendpointIndex = bendpointIndex;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
}
@Override
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -55,7 +55,7 @@
this.rootModel = rootModel;
this.connection = connection;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
}
@Override
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -53,7 +53,7 @@
public DeleteNodeCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter) {
this.diagramIndex = diagramIndex;
this.nodeAdapter = nodeAdapter;
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
}
@Override
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -62,7 +62,7 @@
* @param rootModel
*/
public DirectEditNodeCommand(RootModel rootModel) {
- jiemamyFacade = rootModel.getJiemamy().getFactory().getFacade();
+ jiemamyFacade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
}
@Override
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -58,7 +58,7 @@
*/
public MoveBendpointCommand(RootModel rootModel, int diagramIndex, ConnectionAdapter connectionAdapter,
int bendpointIndex, Point newLocation) {
- super(diagramIndex, (JiemamyViewFacade) rootModel.getJiemamy().getFactory().getFacade());
+ super(diagramIndex, rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class));
this.diagramIndex = diagramIndex;
this.connectionAdapter = connectionAdapter;
this.bendpointIndex = bendpointIndex;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DataSetEditDialog.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DataSetEditDialog.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DataSetEditDialog.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -56,8 +56,8 @@
import org.jiemamy.JiemamyFactory;
import org.jiemamy.ReferenceResolver;
-import org.jiemamy.eclipse.JiemamyUIPlugin;
import org.jiemamy.eclipse.ui.JiemamyEditDialog;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
import org.jiemamy.facade.JiemamyFacade;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.dataset.DataSetModel;
@@ -216,7 +216,7 @@
try {
DataSetUtil.exportToCsv(dataSetModel, tableModel, new FileOutputStream(csv));
} catch (IOException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
if (SystemUtils.IS_OS_WINDOWS) {
@@ -267,9 +267,9 @@
DataSetUtil.importFromCsv(dataSetModel, tableModel, new FileInputStream(csv));
} catch (FileNotFoundException e) {
MessageDialog.openError(getShell(), "File not found", "ファイルが見つかりません。"); // RESOURCE
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
} catch (IOException e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
MessageDialog.openInformation(getShell(), "Success", "インポートが完了しました。"); // RESOURCE
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -40,6 +40,7 @@
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.utils.LabelStringUtil;
import org.jiemamy.facade.JiemamyFacade;
+import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
@@ -82,7 +83,7 @@
ForeignKey foreignKey = connection.unwrap();
// 編集前のスナップショットを保存
- JiemamyFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
ForeignKeyEditDialog dialog = new ForeignKeyEditDialog(getViewer().getControl().getShell(), foreignKey, facade);
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -46,6 +46,7 @@
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandListener;
import org.jiemamy.facade.JiemamyFacade;
+import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
@@ -120,7 +121,7 @@
RootModel rootModel = getModel();
// 編集前のスナップショットを保存
- JiemamyFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
RootEditDialog dialog = new RootEditDialog(getViewer().getControl().getShell(), rootModel, facade);
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -83,7 +83,7 @@
StickyModel stickyModel = (StickyModel) getModel();
// 編集前のスナップショットを保存
- JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
Shell shell = getViewer().getControl().getShell();
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -80,7 +80,7 @@
TableModel tableModel = (TableModel) node.unwrap();
// 編集前のスナップショットを保存
- JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
Shell shell = getViewer().getControl().getShell();
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -76,7 +76,7 @@
ViewModel viewModel = (ViewModel) node.unwrap();
// 編集前のスナップショットを保存
- JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
Shell shell = getViewer().getControl().getShell();
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -80,7 +80,7 @@
TableModel tableModel = getModel();
// 編集前のスナップショットを保存
- JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
Shell shell = getViewer().getControl().getShell();
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -78,7 +78,7 @@
ViewModel viewModel = getModel();
// 編集前のスナップショットを保存
- JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().getFacade();
+ JiemamyViewFacade facade = rootModel.getJiemamy().getFactory().newFacade(JiemamyViewFacade.class);
SavePoint beforeEditSavePoint = facade.save();
Shell shell = getViewer().getControl().getShell();
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/ui/JiemamyEditDialog.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/ui/JiemamyEditDialog.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/ui/JiemamyEditDialog.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -43,6 +43,7 @@
import org.jiemamy.eclipse.editor.dialog.EditListener;
import org.jiemamy.eclipse.extension.ExtensionResolver;
import org.jiemamy.eclipse.ui.tab.AbstractTab;
+import org.jiemamy.eclipse.utils.ExceptionHandler;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
import org.jiemamy.utils.CollectionsUtil;
@@ -169,7 +170,7 @@
Constructor<?> constructor = tabClass.getConstructor(TabFolder.class, int.class, type);
tab = (AbstractTab) constructor.newInstance(tabFolder, SWT.NULL, targetModel);
} catch (Exception e) {
- JiemamyUIPlugin.log(e);
+ ExceptionHandler.handleException(e);
}
return tab;
}
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-03-23 03:57:47 UTC (rev 2980)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -252,8 +252,8 @@
* @return
* @since 0.2
*/
- public <T extends JiemamyFacade>T newFacade() {
- return defaultImplementation.newFacade(this);
+ public <T extends JiemamyFacade>T newFacade(Class<T> clazz) {
+ return defaultImplementation.<T> newFacade(this, clazz);
}
/**
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -47,15 +47,6 @@
public interface JiemamyFactory {
/**
- * TODO for daisuke
- * @param <T>
- *
- * @return
- * @since 0.2
- */
- <T extends JiemamyFacade>T getFacade();
-
- /**
* Jiemamy実装を取得する。
*
* <p>{@code null}を返してはならない。</p>
@@ -152,6 +143,16 @@
<T extends DataType>T newDataType(DataTypeMold<T> mold);
/**
+ * TODO for daisuke
+ *
+ * @param <T>
+ * @param clazz
+ * @return
+ * @since 0.2
+ */
+ <T extends JiemamyFacade>T newFacade(Class<T> clazz);
+
+ /**
* 新しいモデルを生成する。
*
* <p>{@code null}を返してはならない。</p>
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyImplementation.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyImplementation.java 2009-03-23 03:57:47 UTC (rev 2980)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyImplementation.java 2009-03-23 05:04:57 UTC (rev 2981)
@@ -100,5 +100,14 @@
*/
Version getVersion();
- <T extends JiemamyFacade>T newFacade(Jiemamy jiemamy);
+ /**
+ * TODO for daisuke
+ *
+ * @param <T>
+ * @param jiemamy
+ * @param clazz
+ * @return
+ * @since 0.2
+ */
+ <T extends JiemamyFacade>T newFacade(Jiemamy jiemamy, Class<T> clazz);
}