svnno****@sourc*****
svnno****@sourc*****
2009年 9月 14日 (月) 23:08:19 JST
Revision: 3560
http://sourceforge.jp/projects/jiemamy/svn/view?view=rev&revision=3560
Author: daisuke_m
Date: 2009-09-14 23:08:19 +0900 (Mon, 14 Sep 2009)
Log Message:
-----------
[SPEC-25] メソッド名を変更。従来の get(Begin|End)ScriptメソッドとはAPI互換性がなくなった。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultSqlEmitter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/RootModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/entity/AbstractEntityModel.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomParser.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java
hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Advisable.java
zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/CoreTestModelBuilder.java
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultSqlEmitter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultSqlEmitter.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultSqlEmitter.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -97,7 +97,7 @@
// THINK RootBeginScript と CreateSchemaStatement、どっちが先？
- ScriptModel rootBeginScriptModel = rootModel.getBeginScriptModel();
+ ScriptModel rootBeginScriptModel = rootModel.getBeginScript();
if (rootBeginScriptModel != null) {
String beginScriptResilt = rootBeginScriptModel.process();
if (StringUtils.isEmpty(beginScriptResilt) == false) {
@@ -127,7 +127,7 @@
&& Boolean.TRUE.equals(entityModel.getAdapter(Disablable.class).isDisabled())) {
continue;
}
- ScriptModel entityBeginScriptModel = entityModel.getBeginScriptModel();
+ ScriptModel entityBeginScriptModel = entityModel.getBeginScript();
if (entityBeginScriptModel != null) {
String beginScriptResult = entityBeginScriptModel.process();
if (StringUtils.isEmpty(beginScriptResult) == false) {
@@ -151,7 +151,7 @@
result.add(emitCreateIndexStatement(tableModel, indexModel));
}
}
- ScriptModel entityEndScriptModel = entityModel.getEndScriptModel();
+ ScriptModel entityEndScriptModel = entityModel.getEndScript();
if (entityEndScriptModel != null) {
String endScriptResult = entityEndScriptModel.process();
if (StringUtils.isEmpty(endScriptResult) == false) {
@@ -188,7 +188,7 @@
result.add(new SqlStatementImpl(Keyword.of("COMMIT"), Separator.SEMICOLON));
}
- ScriptModel rootEndScriptModel = rootModel.getEndScriptModel();
+ ScriptModel rootEndScriptModel = rootModel.getEndScript();
if (rootEndScriptModel != null) {
String endScriptResult = rootEndScriptModel.process();
if (StringUtils.isEmpty(endScriptResult) == false) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/RootModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/RootModelImpl.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/RootModelImpl.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -54,10 +54,10 @@
private String dialectClassName;
/** 開始スクリプト */
- private ScriptModel beginScriptModel;
+ private ScriptModel beginScript;
/** 終了スクリプト */
- private ScriptModel endScriptModel;
+ private ScriptModel endScript;
/** 説明文 */
private String description;
@@ -120,18 +120,10 @@
return nodes;
}
- @Deprecated
- public String getBeginScript() {
- if (beginScriptModel != null) {
- return beginScriptModel.process();
- }
- return null;
+ public ScriptModel getBeginScript() {
+ return beginScript;
}
- public ScriptModel getBeginScriptModel() {
- return beginScriptModel;
- }
-
public List<DataSetModel> getDataSets() {
assert dataSets != null;
return dataSets;
@@ -150,18 +142,10 @@
return domains;
}
- @Deprecated
- public String getEndScript() {
- if (endScriptModel != null) {
- return endScriptModel.process();
- }
- return null;
+ public ScriptModel getEndScript() {
+ return endScript;
}
- public ScriptModel getEndScriptModel() {
- return endScriptModel;
- }
-
public SortedSet<EntityModel> getEntities() {
assert entities != null;
return entities;
@@ -222,15 +206,15 @@
}
}
- public void setBeginScriptModel(ScriptModel beginScript) {
- this.beginScriptModel = beginScript;
+ public void setBeginScript(ScriptModel beginScript) {
+ this.beginScript = beginScript;
}
@Deprecated
public void setBeginScript(String beginScript) {
ScriptModel script = getJiemamy().getFactory().newModel(ScriptModel.class);
script.setScript(beginScript);
- this.beginScriptModel = script;
+ this.beginScript = script;
}
/**
@@ -265,15 +249,15 @@
this.domains = domains;
}
- public void setEndScriptModel(ScriptModel endScript) {
- this.endScriptModel = endScript;
+ public void setEndScript(ScriptModel endScript) {
+ this.endScript = endScript;
}
@Deprecated
public void setEndScript(String endScript) {
ScriptModel script = getJiemamy().getFactory().newModel(ScriptModel.class);
script.setScript(endScript);
- beginScriptModel = script;
+ this.endScript = script;
}
/**
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/entity/AbstractEntityModel.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/entity/AbstractEntityModel.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/model/entity/AbstractEntityModel.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -154,10 +154,10 @@
private String logicalName;
/** 開始スクリプト */
- private ScriptModel beginScriptModel;
+ private ScriptModel beginScript;
/** 終了スクリプト */
- private ScriptModel endScriptModel;
+ private ScriptModel endScript;
/** 説明文 */
private String description;
@@ -182,34 +182,18 @@
return recursive ? getSuperEntitiesRecursive(this) : getSuperEntitiesNonRecursive(this);
}
- @Deprecated
- public String getBeginScript() {
- if (beginScriptModel != null) {
- return beginScriptModel.process();
- }
- return null;
+ public ScriptModel getBeginScript() {
+ return beginScript;
}
- public ScriptModel getBeginScriptModel() {
- return beginScriptModel;
- }
-
public String getDescription() {
return description;
}
- @Deprecated
- public String getEndScript() {
- if (endScriptModel != null) {
- return endScriptModel.process();
- }
- return null;
+ public ScriptModel getEndScript() {
+ return endScript;
}
- public ScriptModel getEndScriptModel() {
- return endScriptModel;
- }
-
public String getLogicalName() {
return logicalName;
}
@@ -218,30 +202,30 @@
return name;
}
- public void setBeginScriptModel(ScriptModel beginScript) {
- this.beginScriptModel = beginScript;
+ public void setBeginScript(ScriptModel beginScript) {
+ this.beginScript = beginScript;
}
@Deprecated
public void setBeginScript(String beginScript) {
ScriptModel script = getJiemamy().getFactory().newModel(ScriptModel.class);
script.setScript(beginScript);
- this.beginScriptModel = script;
+ this.beginScript = script;
}
public void setDescription(String description) {
this.description = description;
}
- public void setEndScriptModel(ScriptModel endScript) {
- this.endScriptModel = endScript;
+ public void setEndScript(ScriptModel endScript) {
+ this.endScript = endScript;
}
@Deprecated
public void setEndScript(String endScript) {
ScriptModel script = getJiemamy().getFactory().newModel(ScriptModel.class);
script.setScript(endScript);
- beginScriptModel = script;
+ this.endScript = script;
}
public void setLogicalName(String logicalName) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomBuilder.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomBuilder.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -378,11 +378,11 @@
DomUtil.newChild(rootElement, SCHEMA_NAME, rootModel.getSchemaName());
DomUtil.newChild(rootElement, DESCRIPTION, rootModel.getDescription());
- if (rootModel.getBeginScriptModel() != null) {
- buildScript(rootElement, rootModel.getBeginScriptModel(), CoreQName.BEGIN_SCRIPT);
+ if (rootModel.getBeginScript() != null) {
+ buildScript(rootElement, rootModel.getBeginScript(), CoreQName.BEGIN_SCRIPT);
}
- if (rootModel.getEndScriptModel() != null) {
- buildScript(rootElement, rootModel.getEndScriptModel(), CoreQName.END_SCRIPT);
+ if (rootModel.getEndScript() != null) {
+ buildScript(rootElement, rootModel.getEndScript(), CoreQName.END_SCRIPT);
}
// DomUtil.newChild(rootElement, BEGIN_SCRIPT, rootModel.getBeginScript());
// DomUtil.newChild(rootElement, END_SCRIPT, rootModel.getEndScript());
@@ -409,10 +409,11 @@
}
/**
- * テーブル要素を構築する。
+ * スクリプト要素を構築する。
*
* @param parentElement 親となるentities要素
* @param scriptModel 対象{@link ScriptModel}
+ * @param qName スクリプト要素名
* @return 構築したXML要素
*/
private Element buildScript(Element parentElement, ScriptModel scriptModel, CoreQName qName) {
@@ -440,11 +441,11 @@
DomUtil.newChild(entityElement, LOGICAL_NAME, tableModel.getLogicalName());
DomUtil.newChild(entityElement, DESCRIPTION, tableModel.getDescription());
- if (tableModel.getBeginScriptModel() != null) {
- buildScript(entityElement, tableModel.getBeginScriptModel(), CoreQName.BEGIN_SCRIPT);
+ if (tableModel.getBeginScript() != null) {
+ buildScript(entityElement, tableModel.getBeginScript(), CoreQName.BEGIN_SCRIPT);
}
- if (tableModel.getEndScriptModel() != null) {
- buildScript(entityElement, tableModel.getEndScriptModel(), CoreQName.END_SCRIPT);
+ if (tableModel.getEndScript() != null) {
+ buildScript(entityElement, tableModel.getEndScript(), CoreQName.END_SCRIPT);
}
Element attributesElement = DomUtil.newChild(entityElement, ATTRIBUTES);
@@ -504,11 +505,11 @@
DomUtil.newChild(entityElement, LOGICAL_NAME, viewModel.getLogicalName());
DomUtil.newChild(entityElement, DESCRIPTION, viewModel.getDescription());
- if (viewModel.getBeginScriptModel() != null) {
- buildScript(entityElement, viewModel.getBeginScriptModel(), CoreQName.BEGIN_SCRIPT);
+ if (viewModel.getBeginScript() != null) {
+ buildScript(entityElement, viewModel.getBeginScript(), CoreQName.BEGIN_SCRIPT);
}
- if (viewModel.getEndScriptModel() != null) {
- buildScript(entityElement, viewModel.getEndScriptModel(), CoreQName.END_SCRIPT);
+ if (viewModel.getEndScript() != null) {
+ buildScript(entityElement, viewModel.getEndScript(), CoreQName.END_SCRIPT);
}
DomUtil.newChild(entityElement, DEFINITION, viewModel.getDefinition());
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomParser.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomParser.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/JiemamyDomParser.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -161,7 +161,9 @@
if (dialect == null) {
mold = new BuiltinDataTypeMoldImpl(DataTypeCategory.valueOf(typeCategoryString), typeName);
} else {
- mold = dialect.findDataTypeMold(DataTypeCategory.valueOf(typeCategoryString), typeName);
+ mold =
+ dialect.getMoldManager().findDataTypeMold(DataTypeCategory.valueOf(typeCategoryString),
+ typeName);
}
} else {
DataTypeCategory category;
@@ -173,7 +175,7 @@
if (dialect == null) {
mold = new BuiltinDataTypeMoldImpl(category, typeName);
} else {
- mold = dialect.findDataTypeMold(category, typeName);
+ mold = dialect.getMoldManager().findDataTypeMold(category, typeName);
}
}
BuiltinDataType dataType = factory.newDataType(mold);
@@ -496,8 +498,8 @@
rootModel.setDialectClassName(smartXpath.getTextContent(document, "/core:jiemamy/core:dialect"));
rootModel.setSchemaName(smartXpath.getTextContent(document, "/core:jiemamy/core:schemaName"));
- rootModel.setBeginScriptModel(parseScript(document, "/core:jiemamy/core:beginScript"));
- rootModel.setEndScriptModel(parseScript(document, "/core:jiemamy/core:endScript"));
+ rootModel.setBeginScript(parseScript(document, "/core:jiemamy/core:beginScript"));
+ rootModel.setEndScript(parseScript(document, "/core:jiemamy/core:endScript"));
rootModel.setDescription(smartXpath.getTextContent(document, "/core:jiemamy/core:description"));
@@ -522,8 +524,8 @@
TableModel tableModel = factory.newModel(TableModel.class, getUUID(tableElement, CoreQName.ID));
tableModel.setName(smartXpath.getTextContent(tableElement, EL_CORE_NAME));
tableModel.setLogicalName(smartXpath.getTextContent(tableElement, EL_CORE_LOGICALNAME));
- tableModel.setBeginScriptModel(parseScript(tableElement, "core:beginScript"));
- tableModel.setEndScriptModel(parseScript(tableElement, "core:endScript"));
+ tableModel.setBeginScript(parseScript(tableElement, "core:beginScript"));
+ tableModel.setEndScript(parseScript(tableElement, "core:endScript"));
tableModel.setDescription(smartXpath.getTextContent(tableElement, "core:description"));
parseAttributes(tableElement, tableModel);
@@ -564,8 +566,8 @@
ViewModel viewModel = factory.newModel(ViewModel.class, getUUID(viewElement, CoreQName.ID));
viewModel.setName(smartXpath.getTextContent(viewElement, EL_CORE_NAME));
viewModel.setLogicalName(smartXpath.getTextContent(viewElement, EL_CORE_LOGICALNAME));
- viewModel.setBeginScriptModel(parseScript(viewElement, "core:beginScript"));
- viewModel.setEndScriptModel(parseScript(viewElement, "core:endScript"));
+ viewModel.setBeginScript(parseScript(viewElement, "core:beginScript"));
+ viewModel.setEndScript(parseScript(viewElement, "core:endScript"));
viewModel.setDescription(smartXpath.getTextContent(viewElement, "core:description"));
viewModel.setDefinition(smartXpath.getTextContent(viewElement, "core:definition"));
readAdapter(viewElement, viewModel);
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -86,8 +86,8 @@
public void test01_各プロパティが正常に初期化されていること() throws Exception {
assertThat(tableModel.getName(), is("table"));
assertThat(tableModel.getLogicalName(), is(nullValue()));
- assertThat(tableModel.getBeginScriptModel(), is(nullValue()));
- assertThat(tableModel.getEndScriptModel(), is(nullValue()));
+ assertThat(tableModel.getBeginScript(), is(nullValue()));
+ assertThat(tableModel.getEndScript(), is(nullValue()));
assertThat(tableModel.getDescription(), is(nullValue()));
assertThat(tableModel.getId(), is(notNullValue()));
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/JiemamySerializerTest.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -148,10 +148,10 @@
assertThat(rootModel, is(notNullValue()));
assertThat(rootModel.getDialectClassName(), is("org.jiemamy.dialect.mysql.MySqlDialect"));
assertThat(rootModel.getSchemaName(), is("FOO"));
- assertThat(rootModel.getBeginScriptModel().getScript(), is("BEGIN;"));
- assertThat(rootModel.getEndScriptModel().getScript(), is("COMMIT;"));
- assertThat(rootModel.getBeginScriptModel().getScriptEngine(), is(PlainScriptEngine.class.getName()));
- assertThat(rootModel.getEndScriptModel().getScriptEngine(), is(PlainScriptEngine.class.getName()));
+ assertThat(rootModel.getBeginScript().getScript(), is("BEGIN;"));
+ assertThat(rootModel.getEndScript().getScript(), is("COMMIT;"));
+ assertThat(rootModel.getBeginScript().getScriptEngine(), is(PlainScriptEngine.class.getName()));
+ assertThat(rootModel.getEndScript().getScriptEngine(), is(PlainScriptEngine.class.getName()));
assertThat(rootModel.getDescription(), is("Jiemamyテストモデル1"));
assertThat(rootModel.getEntities().size(), is(3));
Modified: hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java
===================================================================
--- hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ hercules/trunk/jiemamy-integration-test/src/test/java/org/jiemamy/internal/serializer/SerializationTest.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -133,10 +133,10 @@
logger.info("RootModel(Dialect):" + rootModel.getDialectClassName());
assertThat((String) jxpath.getValue("dialectClassName"), is("org.jiemamy.dialect.mysql.MySqlDialect"));
- logger.info("RootModel(BeginScript):" + rootModel.getBeginScriptModel());
+ logger.info("RootModel(BeginScript):" + rootModel.getBeginScript());
assertThat((String) jxpath.getValue("beginScript"), is("BEGIN;"));
- logger.info("RootModel(EndScript):" + rootModel.getEndScriptModel());
+ logger.info("RootModel(EndScript):" + rootModel.getEndScript());
assertThat((String) jxpath.getValue("endScript"), is("COMMIT;"));
logger.info("RootModel(Description):" + rootModel.getDescription());
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyProperty.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -212,11 +212,11 @@
/** {@link EntityModel#getDescription()}で取得できるプロパティ */
description,
- /** {@link EntityModel#getBeginScriptModel()}で取得できるプロパティ */
- beginScriptModel,
+ /** {@link EntityModel#getBeginScript()}で取得できるプロパティ */
+ beginScript,
- /** {@link EntityModel#getEndScriptModel()}で取得できるプロパティ */
- endScriptModel
+ /** {@link EntityModel#getEndScript()}で取得できるプロパティ */
+ endScript
}
/**
@@ -331,11 +331,11 @@
/** {@link RootModel#getDialectClassName()}で取得できるプロパティ */
dialectClassName,
- /** {@link RootModel#getBeginScriptModel()}で取得できるプロパティ */
- beginScriptModel,
+ /** {@link RootModel#getBeginScript()}で取得できるプロパティ */
+ beginScript,
- /** {@link RootModel#getEndScriptModel()}で取得できるプロパティ */
- endScriptModel,
+ /** {@link RootModel#getEndScript()}で取得できるプロパティ */
+ endScript,
/** {@link RootModel#getDescription()}で取得できるプロパティ */
description,
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-09-14 14:00:32 UTC (rev 3559)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/RootModel.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -65,16 +65,6 @@
<T extends EntityModel>Collection<T> findEntities(Class<T> clazz);
/**
- * 開始スクリプトを取得する。
- *
- * @return 開始スクリプト. 未設定の場合は{@code null}
- * @since 0.2
- * @deprecated use {@link #getBeginScriptModel()}
- */
- @Deprecated
- String getBeginScript();
-
- /**
* INSERTデータセットのリストを取得する。
*
* <p>このメソッドは、インスタンスの持つフィールドをそのまま返す。返される{@link List}を直接操作することで、
@@ -113,16 +103,6 @@
List<DomainModel> getDomains();
/**
- * 終了スクリプトを取得する。
- *
- * @return 終了スクリプト. 未設定の場合は{@code null}
- * @since 0.2
- * @deprecated use {@link #getEndScriptModel()}
- */
- @Deprecated
- String getEndScript();
-
- /**
* エンティティ定義のセットを取得する。
*
* <p>このメソッドは、インスタンスの持つフィールドをそのまま返す。返される{@link SortedSet}を直接操作することで、
@@ -177,7 +157,7 @@
*
* @param beginScript 開始スクリプト
* @since 0.2
- * @deprecated use {@link #setBeginScriptModel(ScriptModel)}
+ * @deprecated use {@link #setBeginScript(ScriptModel)}
*/
@Deprecated
void setBeginScript(String beginScript);
@@ -209,7 +189,7 @@
*
* @param endScript 終了スクリプト
* @since 0.2
- * @deprecated use {@link #setEndScriptModel(ScriptModel)}
+ * @deprecated use {@link #setEndScript(ScriptModel)}
*/
@Deprecated
void setEndScript(String endScript);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/entity/EntityModel.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -63,16 +63,6 @@
Collection<EntityModel> findSuperEntities(boolean recursive);
/**
- * 開始スクリプトを取得する。
- *
- * @return 開始スクリプト. 未設定の場合は{@code null}
- * @since 0.2
- * @deprecated use {@link #getBeginScriptModel()}
- */
- @Deprecated
- String getBeginScript();
-
- /**
* 説明文を取得する。
*
* @return 説明文. 未設定の場合は{@code null}
@@ -81,16 +71,6 @@
String getDescription();
/**
- * 終了スクリプトを取得する。
- *
- * @return 終了スクリプト. 未設定の場合は{@code null}
- * @since 0.2
- * @deprecated use {@link #getEndScriptModel()}
- */
- @Deprecated
- String getEndScript();
-
- /**
* 論理名を取得する。
*
* @return 論理名. 未設定の場合は{@code null}
@@ -113,7 +93,7 @@
*
* @param beginScript 開始スクリプト
* @since 0.2
- * @deprecated use {@link #setBeginScriptModel(ScriptModel)}
+ * @deprecated use {@link #setBeginScript(ScriptModel)}
*/
@Deprecated
void setBeginScript(String beginScript);
@@ -135,7 +115,7 @@
*
* @param endScript 終了スクリプト
* @since 0.2
- * @deprecated use {@link #setEndScriptModel(ScriptModel)}
+ * @deprecated use {@link #setEndScript(ScriptModel)}
*/
@Deprecated
void setEndScript(String endScript);
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Advisable.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Advisable.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Advisable.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -34,15 +34,15 @@
* @return 開始スクリプト. 未設定の場合は{@code null}
* @since 0.3
*/
- ScriptModel getBeginScriptModel();
+ ScriptModel getBeginScript();
/**
* 終了スクリプトを取得する。
*
* @return 終了スクリプト. 未設定の場合は{@code null}
- * @since 0.2
+ * @since 0.3
*/
- ScriptModel getEndScriptModel();
+ ScriptModel getEndScript();
/**
* 開始スクリプトを設定する。
@@ -52,7 +52,7 @@
* @param beginScript 開始スクリプト
* @since 0.3
*/
- void setBeginScriptModel(ScriptModel beginScript);
+ void setBeginScript(ScriptModel beginScript);
/**
* 終了スクリプトを設定する。
@@ -62,6 +62,6 @@
* @param endScript 終了スクリプト
* @since 0.3
*/
- void setEndScriptModel(ScriptModel endScript);
+ void setEndScript(ScriptModel endScript);
}
Modified: zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/CoreTestModelBuilder.java
===================================================================
--- zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/CoreTestModelBuilder.java 2009-09-14 14:00:32 UTC (rev 3559)
+++ zeus/trunk/jiemamy-test-helper/src/main/java/org/jiemamy/internal/test/CoreTestModelBuilder.java 2009-09-14 14:08:19 UTC (rev 3560)
@@ -620,7 +620,7 @@
ScriptModel beginScript = factory.newModel(ScriptModel.class, uuid.get("356ea9de-e466-4649-965d-991dc4cffd91"));
beginScript.setScript("/* test begin script */");
- tableDept.setBeginScriptModel(beginScript);
+ tableDept.setBeginScript(beginScript);
tableDept.setDescription("部署マスタです。");
@@ -681,7 +681,7 @@
ScriptModel endScript = factory.newModel(ScriptModel.class, uuid.get("7d4711e8-b916-41c1-8a9d-497be982e927"));
endScript.setScript("/* test end script */");
- tableEmp.setBeginScriptModel(endScript);
+ tableEmp.setBeginScript(endScript);
tableEmp.setDescription("従業員マスタです。");