svnno****@sourc*****
svnno****@sourc*****
2009年 3月 3日 (火) 01:30:58 JST
Revision: 2789
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2789
Author: daisuke_m
Date: 2009-03-03 01:30:58 +0900 (Tue, 03 Mar 2009)
Log Message:
-----------
各種warningに対処。
Modified Paths:
--------------
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/DefaultSqlExportConfig.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExportConfig.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/TokorotenStack.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/builder/TableBuilderTest.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java
artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
vesta/trunk/org.jiemamy.eclipse.dialect.mysql/build.properties
vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/META-INF/MANIFEST.MF
vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/build.properties
vesta/trunk/org.jiemamy.eclipse.dialect.sql99/build.properties
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/EmitConfig.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/facade/JiemamyFacade.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/DefaultSqlExportConfig.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/DefaultSqlExportConfig.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/DefaultSqlExportConfig.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -18,7 +18,6 @@
*/
package org.jiemamy.composer.exporter;
-
/**
* {@link SqlExporter}に関する設定情報保持クラス。
*
@@ -26,4 +25,35 @@
*/
public class DefaultSqlExportConfig extends AbstractFileExportConfig implements SqlExportConfig {
+ private boolean emitDropStatements;
+
+ private boolean emitInsertStatements;
+
+
+ public boolean emitDropStatements() {
+ return emitDropStatements;
+ }
+
+ public boolean emitInsertStatements() {
+ return emitInsertStatements;
+ }
+
+ /**
+ * CREATE文の前にDROP文を出力するかどうかを設定する。
+ *
+ * @param emitDropStatements 出力する場合は{@code true}
+ */
+ public void setEmitDropStatements(boolean emitDropStatements) {
+ this.emitDropStatements = emitDropStatements;
+ }
+
+ /**
+ * INSERT文を出力するかどうかを設定する。
+ *
+ * @param emitInsertStatements 出力する場合は{@code true}
+ */
+ public void setEmitInsertStatements(boolean emitInsertStatements) {
+ this.emitInsertStatements = emitInsertStatements;
+ }
+
}
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExportConfig.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExportConfig.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExportConfig.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -18,12 +18,13 @@
*/
package org.jiemamy.composer.exporter;
+import org.jiemamy.dialect.EmitConfig;
/**
* {@link SqlExporter}に関する設定情報インターフェイス。
*
* @author daisuke
*/
-public interface SqlExportConfig extends FileExportConfig {
+public interface SqlExportConfig extends FileExportConfig, EmitConfig {
}
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -35,7 +35,6 @@
import org.jiemamy.composer.ExportException;
import org.jiemamy.composer.Exporter;
import org.jiemamy.dialect.Dialect;
-import org.jiemamy.dialect.EmitConfig;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.sql.SqlStatement;
import org.jiemamy.utils.model.RootModelUtil;
@@ -54,20 +53,20 @@
public static final String OUTPUT_FILE = "outputFile";
- public boolean exportModel(RootModel rootModel, SqlExportConfig ctx) throws ExportException {
+ public boolean exportModel(RootModel rootModel, SqlExportConfig config) throws ExportException {
Validate.notNull(rootModel);
- Validate.notNull(ctx);
- Validate.notNull(ctx.getOutputFile());
+ Validate.notNull(config);
+ Validate.notNull(config.getOutputFile());
Writer writer = null;
try {
Dialect dialect = RootModelUtil.getDialect(rootModel);
- EmitConfig config = null; // FIXME ctxより生成
+
List<SqlStatement> statements = dialect.emitStatements(rootModel, config);
- File outputFile = ctx.getOutputFile();
+ File outputFile = config.getOutputFile();
if (outputFile.exists()) {
- if (ctx.isOverwrite() == false) {
+ if (config.isOverwrite() == false) {
return false;
}
if (outputFile.delete() == false) {
Modified: artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
===================================================================
--- artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -18,6 +18,7 @@
*/
package org.jiemamy.composer.importer;
+import java.io.IOException;
import java.net.URL;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -39,6 +40,7 @@
import org.jiemamy.composer.Importer;
import org.jiemamy.dialect.Dialect;
import org.jiemamy.dialect.generic.GenericDialect;
+import org.jiemamy.exception.DriverNotFoundException;
import org.jiemamy.exception.GenericModelingModeException;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.ColumnModel;
@@ -126,6 +128,18 @@
reader.readEnities(new EntityImportVisitor(meta, rootModel, ctx));
reader.readRelations(new RelationImportVisitor(meta, rootModel, ctx));
dialect.getAdvisor().tearDownRead(connection);
+ } catch (GenericModelingModeException e) {
+ throw new ImportException(e);
+ } catch (DriverNotFoundException e) {
+ throw new ImportException(e);
+ } catch (InstantiationException e) {
+ throw new ImportException(e);
+ } catch (IllegalAccessException e) {
+ throw new ImportException(e);
+ } catch (IOException e) {
+ throw new ImportException(e);
+ } catch (SQLException e) {
+ throw new ImportException(e);
} catch (Exception e) {
throw new ImportException(e);
} finally {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/ReferenceResolverImpl.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -47,7 +47,7 @@
/**
* {@link JiemamyElement}のidと{@link JiemamyElement}の実体をマップする。
*/
- private static Map<UUID, JiemamyElement> map = new HashMap<UUID, JiemamyElement>();
+ private static Map<UUID, JiemamyElement> elementMapping = new HashMap<UUID, JiemamyElement>();
/**
@@ -159,15 +159,15 @@
}
public void add(JiemamyElement model) {
- assert map != null;
+ assert elementMapping != null;
Validate.notNull(model);
UUID id = model.getId();
- map.put(id, model);
+ elementMapping.put(id, model);
}
@SuppressWarnings("unchecked")
public <T extends JiemamyElement>T resolve(ElementReference<T> reference) {
- assert map != null;
- return (T) map.get(reference.getReferenceId());
+ assert elementMapping != null;
+ return (T) elementMapping.get(reference.getReferenceId());
}
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -348,14 +348,15 @@
}
/**
- * 属性モデルからToken列を出力する。
+ * 属性モデルからトークンシーケンスを出力する。
*
* @param attributeModel 属性モデル
* @param resolver
* @param tokenResolver
- * @return Token列
+ * @param <T>
+ * @return トークンシーケンス
*/
- public abstract List<Token> emit(AttributeModel attributeModel, DataTypeResolver resolver,
+ public abstract <T extends AttributeModel>List<Token> emit(T attributeModel, DataTypeResolver resolver,
TokenResolver tokenResolver);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -109,7 +109,7 @@
}
/**
- * @deprecated use {@link #rollback(SavePointImpl)}
+ * @deprecated use {@link #rollback(SavePoint)}
*/
@Deprecated
public void redo() {
@@ -167,7 +167,7 @@
}
/**
- * @deprecated use {@link #rollback(SavePointImpl)}
+ * @deprecated use {@link #rollback(SavePoint)}
*/
@Deprecated
public void undo() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/TokorotenStack.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/TokorotenStack.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/TokorotenStack.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -26,6 +26,7 @@
*
* <p>スレッドアンセーフである。</p>
*
+ * @param <E>
* @author daisuke
*/
public class TokorotenStack<E> implements EssentialStack<E> {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/UUIDUtil.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -36,12 +36,15 @@
private static Logger logger = LoggerFactory.getLogger(UUIDUtil.class);
+ /**
+ * テスト用に使用するUUIDをランダムで発行するための便利メソッド。
+ *
+ * @param args
+ */
public static void main(String[] args) {
- System.out.println(UUID.randomUUID());
- System.out.println(UUID.randomUUID());
- System.out.println(UUID.randomUUID());
- System.out.println(UUID.randomUUID());
- System.out.println(UUID.randomUUID());
+ for (int i = 0; i < 5; i++) {
+ System.out.println(UUID.randomUUID());
+ }
}
/**
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/RootModelUtil.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -70,79 +70,102 @@
*/
public static JiemamyElement findJiemamyElement(RootModel rootModel, UUID refId) {
Validate.notNull(refId);
+ JiemamyElement result = null;
for (DomainModel domainModel : rootModel.getDomains()) {
if (domainModel.getId().equals(refId)) {
- return domainModel;
+ result = domainModel;
+ break;
}
NotNullConstraintModel notNull = domainModel.getNotNull();
if (notNull != null && refId.equals(notNull.getId())) {
- return notNull;
+ result = notNull;
+ break;
}
ColumnCheckModel check = domainModel.getCheck();
if (check != null && refId.equals(check.getId())) {
- return check;
+ result = check;
+ break;
}
}
+ if (result != null) {
+ return result;
+ }
for (EntityModel entityModel : rootModel.getEntities()) {
if (refId.equals(entityModel.getId())) {
- return entityModel;
+ result = entityModel;
+ break;
}
if (entityModel instanceof TableModel) {
TableModel tableModel = (TableModel) entityModel;
for (AttributeModel attributeModel : tableModel.getAttributes()) {
if (refId.equals(attributeModel.getId())) {
- return attributeModel;
+ result = attributeModel;
+ break;
}
if (attributeModel instanceof ColumnModel) {
ColumnModel columnModel = (ColumnModel) attributeModel;
NotNullConstraintModel notNull = columnModel.getNotNull();
if (notNull != null && refId.equals(notNull.getId())) {
- return notNull;
+ result = notNull;
+ break;
}
UniqueKeyModel uniqueKey = columnModel.getUniqueKey();
if (uniqueKey != null && refId.equals(uniqueKey.getId())) {
- return uniqueKey;
+ result = uniqueKey;
+ break;
}
PrimaryKeyModel primaryKey = columnModel.getPrimaryKey();
if (primaryKey != null && refId.equals(primaryKey.getId())) {
- return primaryKey;
+ result = primaryKey;
+ break;
}
ColumnCheckModel check = columnModel.getCheck();
if (check != null && refId.equals(check.getId())) {
- return check;
+ result = check;
+ break;
}
}
if (attributeModel instanceof ForeignKeyModel) {
ForeignKeyModel foreignKeyModel = (ForeignKeyModel) attributeModel;
Deferrability deferrability = foreignKeyModel.getDeferrability();
if (deferrability != null && refId.equals(deferrability.getId())) {
- return deferrability;
+ result = deferrability;
+ break;
}
}
}
+ if (result != null) {
+ return result;
+ }
+
for (IndexModel indexModel : tableModel.getIndexes()) {
if (refId.equals(indexModel.getId())) {
- return indexModel;
+ result = indexModel;
}
}
+ if (result != null) {
+ return result;
+ }
}
}
for (DataSetModel dataSetModel : rootModel.getDataSets()) {
if (refId.equals(dataSetModel.getId())) {
- return dataSetModel;
+ result = dataSetModel;
+ break;
}
for (List<RecordModel> records : dataSetModel.getRecords().values()) {
for (RecordModel recordModel : records) {
if (refId.equals(recordModel.getId())) {
- return recordModel;
+ result = recordModel;
+ break;
}
}
}
}
- return null;
+ return result;
}
/**
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/builder/TableBuilderTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/builder/TableBuilderTest.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/builder/TableBuilderTest.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -89,21 +89,16 @@
}
/**
- * TODO for daisuke
+ * ビルダのオートマトンっぷりを見てみる。
*
* @throws Exception
*/
@Test
- public void testname() throws Exception {
- // dummy
- }
-
-// @Test
-// public void test01() throws Exception {
+ public void test01_ビルダのオートマトンっぷりを見てみる() throws Exception {
// TableModel table1 = factory.newBuilder(PrematureTableBuilder.class).setName("T_USER").addColumn(col1).build();
// TableModel table2 = factory.newBuilder(PrematureTableBuilder.class).addColumn(col2).setName("T_USER").build();
//// TableModel table3 = factory.newBuilder(PrematureTableBuilder.class).addColumn(col3).build(); // コンパイルエラー
// logger.info(table1.toString());
// logger.info(table2.toString());
-// }
+ }
}
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlDialect.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -56,7 +56,7 @@
*/
public class MySqlDialect extends AbstractDialect {
- private static List<BuiltinDataTypeMold> list;
+ private static List<BuiltinDataTypeMold> typeList;
static {
List<BuiltinDataTypeMold> list = CollectionsUtil.newArrayList();
@@ -95,7 +95,7 @@
list.add(new BuiltinDataTypeMoldImpl(OTHER, "VARBINARY"));
list.add(new BuiltinDataTypeMoldImpl(OTHER, "ENUM"));
list.add(new BuiltinDataTypeMoldImpl(OTHER, "SET"));
- MySqlDialect.list = UnmodifiableList.decorate(list);
+ MySqlDialect.typeList = UnmodifiableList.decorate(list);
}
@@ -103,7 +103,7 @@
* インスタンスを生成する。
*/
public MySqlDialect() {
- super(list);
+ super(typeList);
emitter = new MySqlEmitter(getDataTypeResolver());
}
Modified: artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-dialect-postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlDialect.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -35,7 +35,7 @@
*/
public class PostgresqlDialect extends AbstractDialect {
- private static List<BuiltinDataTypeMold> list;
+ private static List<BuiltinDataTypeMold> typeList;
static {
List<BuiltinDataTypeMold> list = CollectionsUtil.newArrayList();
@@ -73,7 +73,7 @@
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.OTHER, "PATH"));
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.OTHER, "POINT"));
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.OTHER, "POLYGON"));
- PostgresqlDialect.list = UnmodifiableList.decorate(list);
+ PostgresqlDialect.typeList = UnmodifiableList.decorate(list);
}
@@ -81,7 +81,7 @@
* インスタンスを生成する。
*/
public PostgresqlDialect() {
- super(list);
+ super(typeList);
}
@Override
Modified: artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java
===================================================================
--- artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-dialect-sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99Dialect.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -39,7 +39,7 @@
*/
public class Sql99Dialect extends AbstractDialect {
- private static List<BuiltinDataTypeMold> list;
+ private static List<BuiltinDataTypeMold> typeList;
static {
List<BuiltinDataTypeMold> list = CollectionsUtil.newArrayList();
@@ -61,7 +61,7 @@
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.TIME, TimezonedDataTypeAdapter.class));
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.TIMESTAMP, TimezonedDataTypeAdapter.class));
list.add(new BuiltinDataTypeMoldImpl(DataTypeCategory.INTERVAL));
- Sql99Dialect.list = UnmodifiableList.decorate(list);
+ Sql99Dialect.typeList = UnmodifiableList.decorate(list);
// FIXME 適当
}
@@ -70,7 +70,7 @@
* インスタンスを生成する。
*/
public Sql99Dialect() {
- super(list);
+ super(typeList);
}
@Override
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -24,10 +24,8 @@
import org.apache.commons.lang.Validate;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.processor.ResetBendpointProcessor;
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.model.node.NodeAdapter;
-import org.jiemamy.utils.ProcessorUtil;
import org.jiemamy.utils.ValidateUtil;
/**
@@ -93,12 +91,6 @@
return name;
}
- @Deprecated
- public void resetBendpoints(ConnectionAdapter connection) {
- Validate.notNull(connection);
- ProcessorUtil.process(this, new ResetBendpointProcessor(connection));
- }
-
/**
* コネクションのベンドポイント情報を設定する。
*
@@ -128,12 +120,12 @@
/**
* ノードのレイアウト情報を設定する。
*
- * @param figureProfiles ノードのレイアウト情報
+ * @param nodeProfiles ノードのレイアウト情報
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
public void setNodeProfiles(Map<NodeAdapter, NodeProfile> nodeProfiles) {
Validate.notNull(nodeProfiles);
- ValidateUtil.injectionSetter(this.figureProfiles);
- this.figureProfiles = nodeProfiles;
+ ValidateUtil.injectionSetter(figureProfiles);
+ figureProfiles = nodeProfiles;
}
}
Modified: vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-03-02 16:21:55 UTC (rev 2788)
+++ vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-03-02 16:30:58 UTC (rev 2789)
@@ -26,8 +26,7 @@
lib/logback-classic-0.9.9.jar,
lib/logback-core-0.9.9.jar,
lib/osgi_R4_core-1.0.jar,
- lib/slf4j-api-1.5.5.jar,
- lib/xpp3_min-1.1.4c.jar
+ lib/slf4j-api-1.5.5.jar
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.mysql/build.properties
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.mysql/build.properties 2009-03-02 16:21:55 UTC (rev 2788)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.mysql/build.properties 2009-03-02 16:30:58 UTC (rev 2789)
@@ -36,4 +36,6 @@
.project,\
.fbprefs,\
.classpath,\
- .checkstyle
+ .checkstyle,\
+ findbugs.xml,\
+ license/
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/META-INF/MANIFEST.MF
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/META-INF/MANIFEST.MF 2009-03-02 16:21:55 UTC (rev 2788)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/META-INF/MANIFEST.MF 2009-03-02 16:30:58 UTC (rev 2789)
@@ -21,8 +21,7 @@
lib/jiemamy-spec-core-0.2-SNAPSHOT.jar,
lib/logback-classic-0.9.9.jar,
lib/logback-core-0.9.9.jar,
- lib/slf4j-api-1.5.5.jar,
- lib/stax-1.2.0.jar
+ lib/slf4j-api-1.5.5.jar
Require-Bundle: org.jiemamy.eclipse
Eclipse-BuddyPolicy: registered
Eclipse-RegisterBuddy: org.jiemamy.eclipse
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/build.properties
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/build.properties 2009-03-02 16:21:55 UTC (rev 2788)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.postgresql/build.properties 2009-03-02 16:30:58 UTC (rev 2789)
@@ -19,8 +19,7 @@
lib/jiemamy-spec-core-0.2-SNAPSHOT.jar,\
lib/logback-classic-0.9.9.jar,\
lib/logback-core-0.9.9.jar,\
- lib/slf4j-api-1.5.5.jar,\
- lib/stax-1.2.0.jar
+ lib/slf4j-api-1.5.5.jar
output..=target/classes/
source..=src/main/java/,src/main/resources/,src/test/java/,src/test/resources/
bin.excludes=lib/sources/
@@ -37,4 +36,6 @@
.project,\
.fbprefs,\
.classpath,\
- .checkstyle
+ .checkstyle,\
+ license/,\
+ findbugs.xml
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.sql99/build.properties
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.sql99/build.properties 2009-03-02 16:21:55 UTC (rev 2788)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.sql99/build.properties 2009-03-02 16:30:58 UTC (rev 2789)
@@ -36,4 +36,6 @@
.project,\
.fbprefs,\
.classpath,\
- .checkstyle
+ .checkstyle,\
+ license/,\
+ findbugs.xml
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/composer/Exporter.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -34,13 +34,13 @@
* <p>ファイル出力であれば、ファイルに保存する所までの責務を負う。</p>
*
* @param rootModel エクスポート対象モデル
- * @param ctx エクスポートのコンテキスト情報
+ * @param config エクスポートの設定情報
* @return エクスポートが正常に完了した場合は{@code true}、contextの設定等により出力が行われなかった場合は{@code false}
* @throws ExportException エクスポートに失敗した時
* @throws IllegalArgumentException 引数に{@code null}を与えた場合
* @throws IllegalArgumentException 必須コンテキスト情報が{@code null}または、型が異なる場合
*/
- boolean exportModel(RootModel rootModel, T ctx) throws ExportException;
+ boolean exportModel(RootModel rootModel, T config) throws ExportException;
/**
* Exporterの名称を取得する。
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/EmitConfig.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/EmitConfig.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/EmitConfig.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -26,17 +26,17 @@
public interface EmitConfig {
/**
- * DML（INSERT文）を出力するかどうかを取得する。
+ * CREATE文の前にDROP文を出力するかどうかを取得する。
*
* @return 出力する場合は{@code true}
*/
- boolean createDML();
+ boolean emitDropStatements();
/**
- * CREATE文の前にDROP文を出力するかどうかを取得する。
+ * INSERT文を出力するかどうかを取得する。
*
* @return 出力する場合は{@code true}
*/
- boolean createDrop();
+ boolean emitInsertStatements();
}
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/facade/JiemamyFacade.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/facade/JiemamyFacade.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/facade/JiemamyFacade.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -57,7 +57,7 @@
<T extends JiemamyElement>void changeModelProperty(T element, JiemamyProperty<T> property, Object newValue);
/**
- * @deprecated use {@link #rollback(SavePointImpl)}
+ * @deprecated use {@link #rollback(SavePoint)}
*/
@Deprecated
void redo();
@@ -92,7 +92,7 @@
SavePoint save();
/**
- * @deprecated use {@link #rollback(SavePointImpl)}
+ * @deprecated use {@link #rollback(SavePoint)}
*/
@Deprecated
void undo();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -32,8 +32,8 @@
*
* @author daisuke
*/
-public interface RootModel extends JiemamyElement/*, Cloneable*/{
-
+public interface RootModel extends JiemamyElement { // THINK Cloneableの実装
+
// THINK cloneの検討
// /**
// * モデルのクローンを生成する。
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java 2009-03-02 16:21:55 UTC (rev 2788)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/model/DiagramPresentationModel.java 2009-03-02 16:30:58 UTC (rev 2789)
@@ -66,19 +66,6 @@
String getName();
/**
- * ベンドポイントを初期化する。
- *
- * <p>異なるノード間のコネクションである場合、ベンドポイントは無くなるべきである(SHOULD)。
- * また、同一ノード間のコネクション（自己参照）である場合、コネクションが見やすい位置に複数のベンドポイントを
- * 配置してもよい(MAY)。</p>
- *
- * @param connection 設定対象コネクション
- * @throws IllegalArgumentException 引数に{@code null}を与えた場合
- */
- @Deprecated
- void resetBendpoints(ConnectionAdapter connection);
-
- /**
* 表示レベルを取得する。
*
* @param level 表示レベル