svnno****@sourc*****
svnno****@sourc*****
2009年 5月 3日 (日) 09:18:26 JST
Revision: 3344
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3344
Author: daisuke_m
Date: 2009-05-03 09:18:26 +0900 (Sun, 03 May 2009)
Log Message:
-----------
エラーコード設定。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/CheckConstraintValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/KeyConstraintValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ReferenceValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -49,7 +49,6 @@
protected AbstractProblem(String errorCode) {
Validate.notNull(errorCode);
this.errorCode = errorCode;
-
}
public boolean canQuickFix() {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/AbstractIdentifierValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -118,7 +118,7 @@
* @param pattern 識別子が満たすべき正規表現パターン
*/
public InvalidNameProblem(String name, Pattern pattern) {
- super("X0000"); // TODO エラーコード設定
+ super("E0010");
registerMessage(Locale.JAPAN, "識別子{0}は、正規表現{1}にマッチしません");
setArguments(new Object[] {
name,
@@ -140,7 +140,7 @@
* @param name 識別子名
*/
public ReservedWordProblem(String name) {
- super("X0000"); // TODO エラーコード設定
+ super("E0020");
registerMessage(Locale.JAPAN, "予約語{0}が識別子として使用されています");
setArguments(new Object[] {
name
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/CheckConstraintValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/CheckConstraintValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/CheckConstraintValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -86,7 +86,7 @@
* @param columnModel 制約式未設定チェック制約が設定されているカラム
*/
public EmptyExpressionProblem(TableModel tableModel, ColumnModel columnModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0030");
registerMessage(Locale.JAPAN, "テーブル{0}のカラム{1}に設定されたチェック制約に制約式がありません");
setArguments(new Object[] {
tableModel.getName(),
@@ -101,7 +101,7 @@
* @param index チェック制約のインデックス
*/
public EmptyExpressionProblem(TableModel tableModel, int index) {
- super("X0000"); // TODO エラーコード設定
+ super("E0031");
registerMessage(Locale.JAPAN, "テーブル{0}の{1}番目のチェック制約に制約式がありません");
setArguments(new Object[] {
tableModel.getName(),
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -84,7 +84,7 @@
* @param index カラムのインデックス
*/
public EmptyColumnNameProblem(TableModel tableModel, int index) {
- super("X0000"); // TODO エラーコード設定
+ super("E0040");
registerMessage(Locale.JAPAN, "テーブル{0}の{1}番目のカラムに名前がありません");
setArguments(new Object[] {
tableModel.getName(),
@@ -107,7 +107,7 @@
* @param columnModel データ型無指定のカラム
*/
public EmptyDataTypeProblem(TableModel tableModel, ColumnModel columnModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0050");
registerMessage(Locale.JAPAN, "テーブル{0}のカラム{1}にデータ型が設定されていません");
setArguments(new Object[] {
tableModel.getName(),
@@ -130,7 +130,7 @@
* @param localKeyConstraint 複合キー
*/
public MultiKeyColumnProblem(ColumnModel columnModel, LocalKeyConstraint localKeyConstraint) {
- super("X0000"); // TODO エラーコード設定
+ super("E0060");
registerMessage(Locale.JAPAN, "カラム{0}に対するキー制約({1})において、キーカラムの構成カラムが無いまたは複数で構成されています");
setArguments(new Object[] {
columnModel.getName(),
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/EntityNameCollisionValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -78,7 +78,7 @@
* @param entities 衝突したエンティティの集合
*/
public EntityNameCollisionProblem(String entityName, Collection<EntityModel> entities) {
- super("X0000"); // TODO エラーコード設定
+ super("E0070");
registerMessage(Locale.JAPAN, "エンティティ名 \"{0}\" が重複しています");
registerMessage(Locale.US, "Duplicate entity name {0}");
setArguments(new Object[] {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -74,7 +74,7 @@
* @param foreignKey 不正な外部キー
*/
public ReferenceKeyProblem(ForeignKey foreignKey) {
- super("X0000"); // TODO エラーコード設定
+ super("E0080");
registerMessage(Locale.JAPAN, "外部キー{0}が参照するカラムはキーになっていません");
setArguments(new Object[] {
StringUtils.isEmpty(foreignKey.getName()) ? foreignKey.getId().toString() : foreignKey.getName(),
@@ -97,7 +97,7 @@
* @param foreignKey 不正な外部キー
*/
public ReferenceMappingProblem(ForeignKey foreignKey) {
- super("X0000"); // TODO エラーコード設定
+ super("E0090");
registerMessage(Locale.JAPAN, "外部キー{0}のkeyColumnsサイズ({1})とreferenceColumnsサイズ({2})が一致していません");
setArguments(new Object[] {
foreignKey.getName() != null ? foreignKey.getName() : foreignKey.getId(),
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IdCollisionValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -71,7 +71,7 @@
* @param current 現在位置を表す文字列
*/
public IdCollisionProblem(UUID id, String prev, String current) {
- super("X0000"); // TODO エラーコード設定
+ super("F0010");
registerMessage(Locale.JAPAN, "{1}と{2}においてモデルID \"{0}\" が重複しています");
registerMessage(Locale.US, "Duplicate model ID {0} of {1} and {2}");
setArguments(new Object[] {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -91,7 +91,7 @@
* @param columnModel 複数設定されたカラム
*/
protected DuplicatedIndexColumnsProblem(IndexModel indexModel, ColumnModel columnModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0100");
registerMessage(Locale.JAPAN, "インデックス{0}に、同じカラム{1}が複数設定されています");
setArguments(new Object[] {
StringUtils.isEmpty(indexModel.getName()) ? indexModel.getId().toString() : indexModel.getName(),
@@ -115,7 +115,7 @@
* @param tableModel インデックスを保持するテーブル
*/
private IllegalIndexColumnRefProblem(TableModel tableModel, IndexModel indexModel, ColumnRef columnRef) {
- super("X0000"); // TODO エラーコード設定
+ super("E0110");
registerMessage(Locale.JAPAN, "テーブル{0}にインデックス{1}が参照するカラム{2}は存在しません");
setArguments(new Object[] {
tableModel.getName(),
@@ -138,7 +138,7 @@
* @param indexModel インデックスカラムを1つも持たないインデックス
*/
public NoIndexColumnProblem(TableModel tableModel, IndexModel indexModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0120");
registerMessage(Locale.JAPAN, "テーブル{0}のインデックス{2}を構成するカラムが設定されていません");
setArguments(new Object[] {
StringUtils.isEmpty(tableModel.getName()) ? tableModel.getId().toString() : tableModel.getName(),
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceCollisionValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -70,7 +70,7 @@
* @param current 現在位置を表す文字列
*/
public InstanceCollisionProblem(int identityHashCode, String prev, String current) {
- super("X0000"); // TODO エラーコード設定
+ super("F0020");
registerMessage(Locale.JAPAN, "{1}と{2}においてインスタンス \"{0}\" が重複しています");
registerMessage(Locale.US, "Duplicate instance {0} of {1} and {2}");
setArguments(new Object[] {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/InstanceSpaceValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -70,7 +70,7 @@
* @param pos 現在位置を表す文字列
*/
public InstanceSpaceProblem(String pos) {
- super("X0000"); // TODO エラーコード設定
+ super("F0030");
registerMessage(Locale.JAPAN, "{0}においてインスタンス空間が異なるモデルオブジェクトが存在します");
setArguments(new Object[] {
pos,
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/KeyConstraintValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/KeyConstraintValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/KeyConstraintValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -84,7 +84,7 @@
* @param tableModel キーを保持するテーブル
*/
public IllegalKeyColumnRefProblem(ColumnRef columnRef, KeyConstraint keyConstraint, TableModel tableModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0130");
registerMessage(Locale.JAPAN, "テーブル{0}({1})にキー{2}({3})が参照するカラム{4}は存在しません");
setArguments(new Object[] {
tableModel.getName(),
@@ -109,7 +109,7 @@
* @param keyConstraint キーカラムを1つも持たないキー制約
*/
public NoKeyColumnProblem(TableModel tableModel, KeyConstraint keyConstraint) {
- super("X0000"); // TODO エラーコード設定
+ super("E0140");
registerMessage(Locale.JAPAN, "テーブル{0}のキー{2}を構成するカラムが設定されていません");
setArguments(new Object[] {
StringUtils.isEmpty(tableModel.getName()) ? tableModel.getId().toString() : tableModel.getName(),
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/PrimaryKeyValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -64,7 +64,7 @@
* @param tableModel 複数の主キーが設定されたテーブル
*/
public MultiplePrimaryKeyProblem(TableModel tableModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0140");
registerMessage(Locale.JAPAN, "テーブル{0}において主キー制約が複数存在しています");
setArguments(new Object[] {
tableModel.getName()
@@ -85,7 +85,7 @@
* @param tableModel 主キーが存在しないテーブル
*/
public NoPrimaryKeyProblem(TableModel tableModel) {
- super("X0000"); // TODO エラーコード設定
+ super("N0010");
registerMessage(Locale.JAPAN, "テーブル{0}において主キー制約が存在しません");
setArguments(new Object[] {
tableModel.getName()
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ReferenceValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ReferenceValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ReferenceValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -69,7 +69,7 @@
* @param elementReference 参照の切れた参照オブジェクト
*/
private ReferenceProblem(ElementReference<?> elementReference, String pos) {
- super("X0000"); // TODO エラーコード設定
+ super("F0040");
registerMessage(Locale.JAPAN, "位置{0}において{1}に対する参照が解決できません");
setArguments(new Object[] {
pos,
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java 2009-04-30 15:06:09 UTC (rev 3343)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java 2009-05-03 00:18:26 UTC (rev 3344)
@@ -68,7 +68,7 @@
* @param tableModel テーブル名が設定されていないテーブル
*/
public EmptyTableNameProblem(TableModel tableModel) {
- super("X0000"); // TODO エラーコード設定
+ super("E0150");
registerMessage(Locale.JAPAN, "テーブル({0})に名前がありません");
setArguments(new Object[] {
tableModel.getId().toString()
@@ -89,7 +89,7 @@
* @param tableModel カラムの存在しないテーブル
*/
public NoColumnProblem(TableModel tableModel) {
- super("X0000"); // TODO エラーコード設定
+ super("W0010");
registerMessage(Locale.JAPAN, "テーブル{0}においてカラムが存在しません");
setArguments(new Object[] {
tableModel.getName()