svnno****@sourc*****
svnno****@sourc*****
2009年 2月 22日 (日) 23:27:41 JST
Revision: 2709
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2709
Author: daisuke_m
Date: 2009-02-22 23:27:41 +0900 (Sun, 22 Feb 2009)
Log Message:
-----------
TODO処理 / refactor / javadoc
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/FileCommentTest.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/TokenResolver.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DomUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.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/ForeignKeyValidator.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/KeyConstraintValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/xml/JiemamyNamespaceContext.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/XpathUtilTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/EqualsUtilTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/impl/AbstractIdentifierValidatorTest.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StandardEngine.java
artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StorageEngine.java
vesta/trunk/org.jiemamy.eclipse/plugin.xml
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/AdapterType.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java
Added Paths:
-----------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultTokenResolver.java
Removed Paths:
-------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefailtTokenResolver.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/InvalidClassException.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IndentStringBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DomainUtil.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/IndentStringBuilderTest.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/FileCommentTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/FileCommentTest.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/FileCommentTest.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -28,6 +28,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.CharEncoding;
+import org.apache.commons.lang.SystemUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +38,7 @@
import org.jiemamy.utils.CollectionsUtil;
/**
- * TODO for daisuke
+ * Javaソースファイルに対するテスト。
*
* @author daisuke
*/
@@ -122,10 +123,12 @@
logger.info("End Project " + path);
}
logger.info("==== FAILURE ============");
+ StringBuilder sb = new StringBuilder();
for (File file : errFiles) {
logger.info(file.toString());
+ sb.append(file.toString()).append(SystemUtils.LINE_SEPARATOR);
}
- assertThat(errFiles.size(), is(0));
+ assertThat(sb.toString(), errFiles.size(), is(0));
}
private void test(File file, List<File> errFiles) throws IOException {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -28,7 +28,6 @@
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandListener;
-import org.jiemamy.editcommand.CommandProcessor;
import org.jiemamy.editcommand.CommandProcessorImpl;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.utils.CollectionsUtil;
@@ -45,33 +44,14 @@
*/
public class EventBrokerImpl implements EventBroker {
- private static class DefaultDispatchStrategy implements DispatchStrategy {
-
- public boolean needToDispatch(CommandListener listener, Command command) {
- UUID uuid = command.getTarget().getId();
- JiemamyElement targetModel = listener.getTargetModel();
- return ReferenceResolverImpl.isDescendFromElement(targetModel, uuid);
- }
- }
-
-
private static Logger logger = LoggerFactory.getLogger(EventBrokerImpl.class);
private List<CommandListener> listeners = CollectionsUtil.newArrayList();
private DispatchStrategy strategy = new DefaultDispatchStrategy();
- private CommandProcessor commandProcessor;
-
/**
- * インスタンスを生成する。
- */
- public EventBrokerImpl() {
- commandProcessor = new CommandProcessorImpl(this);
- }
-
- /**
* {@inheritDoc}
*/
public void addListener(CommandListener listener) {
@@ -99,13 +79,6 @@
/**
* {@inheritDoc}
*/
- public CommandProcessor getCommandProcessor() {
- return commandProcessor;
- }
-
- /**
- * {@inheritDoc}
- */
public void removeListener(CommandListener listener) {
listeners.remove(listener);
logger.info("CommandListener is unregistered: " + listener.toString());
@@ -119,4 +92,14 @@
Validate.notNull(strategy);
this.strategy = strategy;
}
+
+
+ private static class DefaultDispatchStrategy implements DispatchStrategy {
+
+ public boolean needToDispatch(CommandListener listener, Command command) {
+ UUID uuid = command.getTarget().getId();
+ JiemamyElement targetModel = listener.getTargetModel();
+ return ReferenceResolverImpl.isDescendFromElement(targetModel, uuid);
+ }
+ }
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/FactoryExtension.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -149,7 +149,7 @@
/**
- * エンティティのソートオーダーを決めるコンパレータ。
+ * {@link JiemamyElement}のソートオーダーを決めるコンパレータ。
*
* <p>まずFQCNで比較し、同一だったらUUIDで比較。</p>
*
@@ -171,7 +171,7 @@
}
/**
- * TODO for daisuke
+ * 参照オブジェクトのソートオーダーを決めるコンパレータ。
*
* @author daisuke
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/JiemamyFacadeImpl.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -22,12 +22,13 @@
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandProcessor;
+import org.jiemamy.editcommand.CommandProcessorImpl;
import org.jiemamy.editcommand.impl.AddEntityToRootCommand;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.EntityModel;
/**
- * TODO for daisuke
+ * Jiemamyに対するファサードの実装クラス。
*
* @author daisuke
*/
@@ -49,7 +50,7 @@
*/
public JiemamyFacadeImpl(Jiemamy jiemamy) {
this.jiemamy = jiemamy;
- processor = jiemamy.getEventBroker().getCommandProcessor();
+ processor = new CommandProcessorImpl(jiemamy.getEventBroker());
}
public void addEntity(EntityModel entity) {
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -46,8 +46,8 @@
*
* @param qName 完全修飾名
*/
+ // 空のMapであるため、タイプセーフである。
@SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
public StartElementCommandImpl(JiemamyQName qName) {
this(qName.getQName(), MapUtils.EMPTY_MAP);
}
@@ -66,8 +66,8 @@
* インスタンスを生成する。
* @param qName
*/
+ // 空のMapであるため、タイプセーフである。
@SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
public StartElementCommandImpl(QName qName) {
this(qName, MapUtils.EMPTY_MAP);
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -68,8 +68,9 @@
case XMLStreamConstants.START_ELEMENT:
StartElement startElement = xmlEvent.asStartElement();
Map<QName, String> attributes = new HashMap<QName, String>();
+
+ // StartElement#getAttributes() は、Attributeのイテレータを返す仕様である。
@SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
Iterator<Attribute> itr = startElement.getAttributes();
while (itr.hasNext()) {
Attribute attribute = itr.next();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/BuiltinDataTypeMoldImpl.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -22,10 +22,11 @@
import java.util.Collection;
import org.jiemamy.dialect.Dialect.BuiltinDataTypeMold;
+import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.model.datatype.DataTypeCategory;
/**
- * TODO for daisuke
+ * {@link BuiltinDataType}インスタンスを生成する鋳型情報の実装クラス。
*
* @author daisuke
*/
Deleted: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefailtTokenResolver.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefailtTokenResolver.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefailtTokenResolver.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,87 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/12
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.dialect;
-
-import java.util.List;
-
-import org.jiemamy.model.attribute.constraint.Deferrability.InitiallyCheckTime;
-import org.jiemamy.model.attribute.constraint.ForeignKeyModel.MatchType;
-import org.jiemamy.model.attribute.constraint.ForeignKeyModel.ReferentialAction;
-import org.jiemamy.model.sql.Keyword;
-import org.jiemamy.model.sql.Token;
-import org.jiemamy.utils.CollectionsUtil;
-
-/**
- * TODO for daisuke
- *
- * @author daisuke
- */
-public class DefailtTokenResolver implements TokenResolver {
-
- /**
- * {@inheritDoc}
- */
- public List<Token> resolve(InitiallyCheckTime initiallyCheckTime) {
- List<Token> tokens = CollectionsUtil.newArrayList(1);
- if (initiallyCheckTime == InitiallyCheckTime.IMMEDIATE) {
- tokens.add(Keyword.IMMEDIATE);
- } else if (initiallyCheckTime == InitiallyCheckTime.DEFERRED) {
- tokens.add(Keyword.DEFERRED);
- }
- return tokens;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Token> resolve(MatchType matchType) {
- List<Token> tokens = CollectionsUtil.newArrayList(1);
- if (matchType == MatchType.SIMPLE) {
- tokens.add(Keyword.SIMPLE);
- } else if (matchType == MatchType.FULL) {
- tokens.add(Keyword.FULL);
- } else if (matchType == MatchType.PARTIAL) {
- tokens.add(Keyword.PARTIAL);
- }
- return tokens;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Token> resolve(ReferentialAction referentialAction) {
- List<Token> tokens = CollectionsUtil.newArrayList(1);
- if (referentialAction == ReferentialAction.CASCADE) {
- tokens.add(Keyword.CASCADE);
- } else if (referentialAction == ReferentialAction.SET_NULL) {
- tokens.add(Keyword.SET);
- tokens.add(Keyword.NULL);
- } else if (referentialAction == ReferentialAction.SET_DEFAULT) {
- tokens.add(Keyword.SET);
- tokens.add(Keyword.DEFAULT);
- } else if (referentialAction == ReferentialAction.RESTRICT) {
- tokens.add(Keyword.RESTRICT);
- } else if (referentialAction == ReferentialAction.NO_ACTION) {
- tokens.add(Keyword.NO);
- tokens.add(Keyword.ACTION);
- }
- return tokens;
- }
-
-}
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultSqlEmitter.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -54,7 +54,7 @@
import org.jiemamy.utils.model.ForeignKeyUtil;
/**
- * TODO for daisuke
+ * {@link SqlEmitter}の標準実装クラス。
*
* @author daisuke
*/
@@ -64,7 +64,7 @@
private ReferenceResolver referenceResolver;
- private TokenResolver tokenResolver = new DefailtTokenResolver();
+ private TokenResolver tokenResolver = new DefaultTokenResolver();
/**
Copied: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultTokenResolver.java (from rev 2708, artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefailtTokenResolver.java)
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultTokenResolver.java (rev 0)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultTokenResolver.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/12
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect;
+
+import java.util.List;
+
+import org.jiemamy.model.attribute.constraint.Deferrability.InitiallyCheckTime;
+import org.jiemamy.model.attribute.constraint.ForeignKeyModel.MatchType;
+import org.jiemamy.model.attribute.constraint.ForeignKeyModel.ReferentialAction;
+import org.jiemamy.model.sql.Keyword;
+import org.jiemamy.model.sql.Token;
+import org.jiemamy.utils.CollectionsUtil;
+
+/**
+ * {@link TokenResolver}の標準実装クラス。
+ *
+ * @author daisuke
+ */
+public class DefaultTokenResolver implements TokenResolver {
+
+ public List<Token> resolve(Enum<?> value) {
+ List<Token> tokens = CollectionsUtil.newArrayList(1);
+ if (value == InitiallyCheckTime.IMMEDIATE) {
+ tokens.add(Keyword.IMMEDIATE);
+ } else if (value == InitiallyCheckTime.DEFERRED) {
+ tokens.add(Keyword.DEFERRED);
+ } else if (value == MatchType.SIMPLE) {
+ tokens.add(Keyword.SIMPLE);
+ } else if (value == MatchType.FULL) {
+ tokens.add(Keyword.FULL);
+ } else if (value == MatchType.PARTIAL) {
+ tokens.add(Keyword.PARTIAL);
+ } else if (value == ReferentialAction.CASCADE) {
+ tokens.add(Keyword.CASCADE);
+ } else if (value == ReferentialAction.SET_NULL) {
+ tokens.add(Keyword.SET);
+ tokens.add(Keyword.NULL);
+ } else if (value == ReferentialAction.SET_DEFAULT) {
+ tokens.add(Keyword.SET);
+ tokens.add(Keyword.DEFAULT);
+ } else if (value == ReferentialAction.RESTRICT) {
+ tokens.add(Keyword.RESTRICT);
+ } else if (value == ReferentialAction.NO_ACTION) {
+ tokens.add(Keyword.NO);
+ tokens.add(Keyword.ACTION);
+ }
+ return tokens;
+ }
+
+}
Property changes on: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/DefaultTokenResolver.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/TokenResolver.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/TokenResolver.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/TokenResolver.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -20,9 +20,6 @@
import java.util.List;
-import org.jiemamy.model.attribute.constraint.Deferrability.InitiallyCheckTime;
-import org.jiemamy.model.attribute.constraint.ForeignKeyModel.MatchType;
-import org.jiemamy.model.attribute.constraint.ForeignKeyModel.ReferentialAction;
import org.jiemamy.model.sql.Token;
/**
@@ -33,27 +30,11 @@
public interface TokenResolver {
/**
- * TODO for daisuke
+ * Enum要素をトークン列に変換する。
*
- * @param initiallyCheckTime 変換対象
+ * @param value 変換対象
* @return トークンシーケンス
*/
- List<Token> resolve(InitiallyCheckTime initiallyCheckTime);
+ List<Token> resolve(Enum<?> value);
- /**
- * TODO for daisuke
- *
- * @param matchType 変換対象
- * @return トークンシーケンス
- */
- List<Token> resolve(MatchType matchType);
-
- /**
- * TODO for daisuke
- *
- * @param onDelete 変換対象
- * @return トークンシーケンス
- */
- List<Token> resolve(ReferentialAction onDelete);
-
}
Deleted: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/InvalidClassException.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/InvalidClassException.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/InvalidClassException.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,63 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/12/01
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.serializer;
-
-import org.jiemamy.exception.JiemamyException;
-
-/**
- * XMLモデルの class 属性に指定されたクラスがおかしい場合。
- * TODO 命名検討
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class InvalidClassException extends JiemamyException {
-
- /**
- * インスタンスを生成する。
- */
- public InvalidClassException() {
- super();
- }
-
- /**
- * インスタンスを生成する。
- * @param message 例外メッセージ
- */
- public InvalidClassException(String message) {
- super(message);
- }
-
- /**
- * インスタンスを生成する。
- * @param message 例外メッセージ
- * @param cause 起因例外
- */
- public InvalidClassException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * インスタンスを生成する。
- * @param cause 起因例外
- */
- public InvalidClassException(Throwable cause) {
- super(cause);
- }
-
-}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -223,12 +223,6 @@
}
}
- /**
- * TODO for daisuke
- *
- * @param tableElement
- * @param tableModel
- */
private void parseAttributes(Element tableElement, TableModel tableModel) {
NodeList attributeNodeList = XpathUtil.getNodes(tableElement, "core:attributes/*");
Iterable<Node> attributeIterableNodeList = new IterableNodeList(attributeNodeList);
@@ -237,15 +231,15 @@
continue;
}
Element attributeElement = (Element) attributeNode;
- if (DomUtil.equalsElement(attributeElement, CoreQName.COLUMN)) {
+ if (DomUtil.isEqualsQName(attributeElement, CoreQName.COLUMN)) {
parseColumn(attributeElement, tableModel);
- } else if (DomUtil.equalsElement(attributeElement, CoreQName.PRIMARY_KEY)) {
+ } else if (DomUtil.isEqualsQName(attributeElement, CoreQName.PRIMARY_KEY)) {
parsePrimaryKey(attributeElement, tableModel);
- } else if (DomUtil.equalsElement(attributeElement, CoreQName.UNIQUE_KEY)) {
+ } else if (DomUtil.isEqualsQName(attributeElement, CoreQName.UNIQUE_KEY)) {
parseUniqueKey(attributeElement, tableModel);
- } else if (DomUtil.equalsElement(attributeElement, CoreQName.FOREIGN_KEY)) {
+ } else if (DomUtil.isEqualsQName(attributeElement, CoreQName.FOREIGN_KEY)) {
parseForeignKey(attributeElement, tableModel);
- } else if (DomUtil.equalsElement(attributeElement, CoreQName.TABLE_CHECK_CONSTRAINT)) {
+ } else if (DomUtil.isEqualsQName(attributeElement, CoreQName.TABLE_CHECK_CONSTRAINT)) {
parseTableCheckConstraint(attributeElement, tableModel);
} else {
logger.warn("unknown attribute");
@@ -497,13 +491,6 @@
parseAttributes(tableElement, tableModel);
-// parseColumns(tableElement, tableModel);
-// parsePrimaryKeys(tableElement, tableModel);
-// parseUniqueKeys(tableElement, tableModel);
-// parseForeignKeys(tableElement, tableModel);
-// parseNotNullConstraints(tableElement, tableModel);
-// parseCheckConstraints(tableElement, tableModel);
-
readAdapter(tableElement, tableModel);
return tableModel;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DomUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DomUtil.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/DomUtil.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -38,21 +38,6 @@
public final class DomUtil {
/**
- * TODO for daisuke
- *
- * @param element
- * @param qName
- * @return
- */
- public static boolean equalsElement(Element element, JiemamyQName qName) {
- if (element == null || qName == null) {
- return false;
- }
- return qName.getQName().getNamespaceURI().equals(element.getNamespaceURI())
- && qName.getQName().getLocalPart().equals(element.getTagName());
- }
-
- /**
* 要素の属性に設定された値を文字列として取得する。
*
* @param domElement 要素
@@ -89,6 +74,32 @@
}
/**
+ * XML要素が、指定された完全修飾名を持つ要素かどうかを調べる。
+ *
+ * @param element 検査対象要素
+ * @param qName 完全修飾名
+ * @return 要素が指定された完全修飾名を持っていれば{@code true}
+ */
+ public static boolean isEqualsQName(Element element, JiemamyQName qName) {
+ return isEqualsQName(element, qName.getQName());
+ }
+
+ /**
+ * XML要素が、指定された完全修飾名を持つ要素かどうかを調べる。
+ *
+ * @param element 検査対象要素
+ * @param qName 完全修飾名
+ * @return 要素が指定された完全修飾名を持っていれば{@code true}
+ */
+ public static boolean isEqualsQName(Element element, QName qName) {
+ if (element == null || qName == null) {
+ return false;
+ }
+ return qName.getNamespaceURI().equals(element.getNamespaceURI())
+ && qName.getLocalPart().equals(element.getTagName());
+ }
+
+ /**
* 新しい要素を生成し、指定された要素の子として追加して返す。
*
* @param parentElement 親要素
Deleted: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IndentStringBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IndentStringBuilder.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/IndentStringBuilder.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,787 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/07/12
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.utils;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.commons.lang.text.StrBuilder;
-import org.apache.commons.lang.text.StrMatcher;
-
-/**
- * インデントを扱えるStringBuilder。
- * @author daisuke
- */
-public class IndentStringBuilder extends StrBuilder {
-
- /** The new line. */
- private String newLine;
-
- /** 現在のインデントの深さ */
- private int indentLevel;
-
- /** インデント1個分に使用するテキスト */
- private String indentText = " ";
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(boolean value) {
- return (IndentStringBuilder) super.append(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(char ch) {
- return (IndentStringBuilder) super.append(ch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(char[] chars) {
- return (IndentStringBuilder) super.append(chars);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(char[] chars, int startIndex, int length) {
- return (IndentStringBuilder) super.append(chars, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(double value) {
- return (IndentStringBuilder) super.append(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(float value) {
- return (IndentStringBuilder) super.append(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(int value) {
- return (IndentStringBuilder) super.append(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(long value) {
- return (IndentStringBuilder) super.append(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(Object obj) {
- return (IndentStringBuilder) super.append(obj);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(StrBuilder str) {
- return (IndentStringBuilder) super.append(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(StrBuilder str, int startIndex, int length) {
- return (IndentStringBuilder) super.append(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(String str) {
- return (IndentStringBuilder) super.append(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(String str, int startIndex, int length) {
- return (IndentStringBuilder) super.append(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(StringBuffer str) {
- return (IndentStringBuilder) super.append(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder append(StringBuffer str, int startIndex, int length) {
- return (IndentStringBuilder) super.append(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
- public IndentStringBuilder appendAll(Collection coll) {
- return (IndentStringBuilder) super.appendAll(coll);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
- public IndentStringBuilder appendAll(Iterator it) {
- return (IndentStringBuilder) super.appendAll(it);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendAll(Object[] array) {
- return (IndentStringBuilder) super.appendAll(array);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendFixedWidthPadLeft(int value, int width, char padChar) {
- return (IndentStringBuilder) super.appendFixedWidthPadLeft(value, width, padChar);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendFixedWidthPadLeft(Object obj, int width, char padChar) {
- return (IndentStringBuilder) super.appendFixedWidthPadLeft(obj, width, padChar);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendFixedWidthPadRight(int value, int width, char padChar) {
- return (IndentStringBuilder) super.appendFixedWidthPadRight(value, width, padChar);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendFixedWidthPadRight(Object obj, int width, char padChar) {
- return (IndentStringBuilder) super.appendFixedWidthPadRight(obj, width, padChar);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(boolean value) {
- return (IndentStringBuilder) super.appendln(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(char ch) {
- return (IndentStringBuilder) super.appendln(ch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(char[] chars) {
- return (IndentStringBuilder) super.appendln(chars);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(char[] chars, int startIndex, int length) {
- return (IndentStringBuilder) super.appendln(chars, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(double value) {
- return (IndentStringBuilder) super.appendln(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(float value) {
- return (IndentStringBuilder) super.appendln(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(int value) {
- return (IndentStringBuilder) super.appendln(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(long value) {
- return (IndentStringBuilder) super.appendln(value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(Object obj) {
- return (IndentStringBuilder) super.appendln(obj);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(StrBuilder str) {
- return (IndentStringBuilder) super.appendln(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(StrBuilder str, int startIndex, int length) {
- return (IndentStringBuilder) super.appendln(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(String str) {
- return (IndentStringBuilder) super.appendln(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(String str, int startIndex, int length) {
- return (IndentStringBuilder) super.appendln(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(StringBuffer str) {
- return (IndentStringBuilder) super.appendln(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendln(StringBuffer str, int startIndex, int length) {
- return (IndentStringBuilder) super.appendln(str, startIndex, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendNewLine() {
- if (newLine == null) {
- append(SystemUtils.LINE_SEPARATOR);
- } else {
- append(newLine);
- }
- append(getIndent());
- return this;
- }
-
- /**
- * インデントを変更しつつ、改行する。
- * @param indentDiff インデント増減量
- * @return 自らのインスタンス
- */
- public IndentStringBuilder appendNewLine(int indentDiff) {
- indentLevel += indentDiff;
- return appendNewLine();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendNull() {
- return (IndentStringBuilder) super.appendNull();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendPadding(int length, char padChar) {
- return (IndentStringBuilder) super.appendPadding(length, padChar);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendSeparator(char separator) {
- return (IndentStringBuilder) super.appendSeparator(separator);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendSeparator(char separator, int loopIndex) {
- return (IndentStringBuilder) super.appendSeparator(separator, loopIndex);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendSeparator(String separator) {
- return (IndentStringBuilder) super.appendSeparator(separator);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendSeparator(String separator, int loopIndex) {
- return (IndentStringBuilder) super.appendSeparator(separator, loopIndex);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
- public IndentStringBuilder appendWithSeparators(Collection coll, String separator) {
- return (IndentStringBuilder) super.appendWithSeparators(coll, separator);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- @SuppressWarnings("unchecked")
- // TODO キャスト安全性の根拠提示
- public IndentStringBuilder appendWithSeparators(Iterator it, String separator) {
- return (IndentStringBuilder) super.appendWithSeparators(it, separator);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder appendWithSeparators(Object[] array, String separator) {
- return (IndentStringBuilder) super.appendWithSeparators(array, separator);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder clear() {
- return (IndentStringBuilder) super.clear();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder delete(int startIndex, int endIndex) {
- return (IndentStringBuilder) super.delete(startIndex, endIndex);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteAll(char ch) {
- return (IndentStringBuilder) super.deleteAll(ch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteAll(String str) {
- return (IndentStringBuilder) super.deleteAll(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteAll(StrMatcher matcher) {
- return (IndentStringBuilder) super.deleteAll(matcher);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteCharAt(int index) {
- return (IndentStringBuilder) super.deleteCharAt(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteFirst(char ch) {
- return (IndentStringBuilder) super.deleteFirst(ch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteFirst(String str) {
- return (IndentStringBuilder) super.deleteFirst(str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder deleteFirst(StrMatcher matcher) {
- return (IndentStringBuilder) super.deleteFirst(matcher);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder ensureCapacity(int capacity) {
- return (IndentStringBuilder) super.ensureCapacity(capacity);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!super.equals(obj)) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final IndentStringBuilder other = (IndentStringBuilder) obj;
- if (indentLevel != other.indentLevel) {
- return false;
- }
- if (indentText == null) {
- if (other.indentText != null) {
- return false;
- }
- } else if (!indentText.equals(other.indentText)) {
- return false;
- }
- if (newLine == null) {
- if (other.newLine != null) {
- return false;
- }
- } else if (!newLine.equals(other.newLine)) {
- return false;
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + indentLevel;
- result = prime * result + ((indentText == null) ? 0 : indentText.hashCode());
- result = prime * result + ((newLine == null) ? 0 : newLine.hashCode());
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, boolean value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, char value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, char[] chars) {
- return (IndentStringBuilder) super.insert(index, chars);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, char[] chars, int offset, int length) {
- return (IndentStringBuilder) super.insert(index, chars, offset, length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, double value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, float value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, int value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, long value) {
- return (IndentStringBuilder) super.insert(index, value);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, Object obj) {
- return (IndentStringBuilder) super.insert(index, obj);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder insert(int index, String str) {
- return (IndentStringBuilder) super.insert(index, str);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder minimizeCapacity() {
- return (IndentStringBuilder) super.minimizeCapacity();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replace(int startIndex, int endIndex, String replaceStr) {
- return (IndentStringBuilder) super.replace(startIndex, endIndex, replaceStr);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replace(StrMatcher matcher, String replaceStr, int startIndex, int endIndex,
- int replaceCount) {
- return (IndentStringBuilder) super.replace(matcher, replaceStr, startIndex, endIndex, replaceCount);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceAll(char search, char replace) {
- return (IndentStringBuilder) super.replaceAll(search, replace);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceAll(String searchStr, String replaceStr) {
- return (IndentStringBuilder) super.replaceAll(searchStr, replaceStr);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceAll(StrMatcher matcher, String replaceStr) {
- return (IndentStringBuilder) super.replaceAll(matcher, replaceStr);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceFirst(char search, char replace) {
- return (IndentStringBuilder) super.replaceFirst(search, replace);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceFirst(String searchStr, String replaceStr) {
- return (IndentStringBuilder) super.replaceFirst(searchStr, replaceStr);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder replaceFirst(StrMatcher matcher, String replaceStr) {
- return (IndentStringBuilder) super.replaceFirst(matcher, replaceStr);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder reverse() {
- return (IndentStringBuilder) super.reverse();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder setCharAt(int index, char ch) {
- return (IndentStringBuilder) super.setCharAt(index, ch);
- }
-
- /**
- * インデント1個分に使用するテキストを設定する。
- * @param indentText インデント1個分に使用するテキスト
- * @return this, to enable chaining
- */
- public IndentStringBuilder setIndentText(String indentText) {
- this.indentText = indentText;
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder setLength(int length) {
- return (IndentStringBuilder) super.setLength(length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder setNewLineText(String newLine) {
- return (IndentStringBuilder) super.setNewLineText(newLine);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder setNullText(String nullText) {
- return (IndentStringBuilder) super.setNullText(nullText);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public IndentStringBuilder trim() {
- return (IndentStringBuilder) super.trim();
- }
-
- private String getIndent() {
- return StringUtils.repeat(indentText, indentLevel);
- }
-}
Deleted: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DomainUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DomainUtil.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/DomainUtil.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,31 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/16
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.utils.model;
-
-
-/**
- * TODO for daisuke
- *
- * @author daisuke
- */
-public class DomainUtil {
-
- private DomainUtil() {
- }
-}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/model/EqualsUtil.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -49,7 +49,7 @@
import org.jiemamy.utils.gtree.text.Emitter;
/**
- * TODO for daisuke
+ * 2つのオブジェクトの比較を行うユーティリティクラス。
*
* @author daisuke
*/
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AbstractProblem.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -52,41 +52,31 @@
}
- /**
- * {@inheritDoc}
- */
public boolean canQuickFix() {
return false;
}
- /**
- * {@inheritDoc}
- */
public String getErrorCode() {
return errorCode;
}
- /**
- * {@inheritDoc}
- */
public String getMessage() {
return getMessage(Locale.getDefault());
}
- /**
- * {@inheritDoc}
- */
public String getMessage(Locale locale) {
return messages.getMessage(locale, arguments);
}
- /**
- * {@inheritDoc}
- */
public void quickFix(RootModel rootModel) {
throw new CannotFixException();
}
+ @Override
+ public String toString() {
+ return errorCode + " " + getMessage();
+ }
+
/**
* エラーメッセージを登録する。
*
@@ -105,5 +95,4 @@
protected void setArguments(Object[] arguments) {
this.arguments = arguments;
}
-
}
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ColumnValidator.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -25,6 +25,7 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.ColumnModel;
+import org.jiemamy.model.attribute.constraint.LocalKeyModel;
import org.jiemamy.model.attribute.constraint.PrimaryKeyModel;
import org.jiemamy.model.attribute.constraint.UniqueKeyModel;
import org.jiemamy.model.entity.TableModel;
@@ -43,9 +44,6 @@
*/
public class ColumnValidator extends AbstractValidator {
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
@@ -62,11 +60,11 @@
UniqueKeyModel uniqueKey = column.getUniqueKey();
if (uniqueKey != null && uniqueKey.getKeyColumns().size() != 1) {
- // UNDONE
+ result.add(new MultiKeyColumnProblem(column, uniqueKey));
}
PrimaryKeyModel primaryKey = column.getPrimaryKey();
if (primaryKey != null && primaryKey.getKeyColumns().size() != 1) {
- // UNDONE
+ result.add(new MultiKeyColumnProblem(column, primaryKey));
}
index++;
}
@@ -91,9 +89,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
@@ -116,9 +111,29 @@
});
}
+ public Severity getSeverity() {
+ return Severity.ERROR;
+ }
+
+ }
+
+ static class MultiKeyColumnProblem extends AbstractProblem {
+
/**
- * {@inheritDoc}
+ * インスタンスを生成する。
+ *
+ * @param column
+ * @param key
*/
+ public MultiKeyColumnProblem(ColumnModel column, LocalKeyModel key) {
+ super("X0000"); // TODO エラーコード設定
+ registerMessage(Locale.JAPAN, "カラム{0}のカラムキー制約カラム{1}の構成カラムが複数で構成されています");
+ setArguments(new Object[] {
+ column.getName(),
+ key.getName() != null ? key.getName() : key.getId().toString()
+ });
+ }
+
public Severity getSeverity() {
return Severity.ERROR;
}
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/ForeignKeyValidator.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -19,6 +19,7 @@
package org.jiemamy.validator.impl;
import java.util.Collection;
+import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,28 +56,62 @@
for (ForeignKeyModel fkModel : RootModelUtil.getAllForeignKeys(rootModel)) {
if (fkModel.getKeyColumns().size() != fkModel.getReferenceColumns().size()) {
logger.error("fk(" + fkModel.getId() + ") size error");
- // TODO keyColumnsとreferenceColumnsのサイズ不一致
- result.add(new AbstractProblem("A") {
-
- public Severity getSeverity() {
- return null;
- }
-
- });
+ result.add(new ReferenceMappingProblem(fkModel));
}
if (ForeignKeyUtil.getReferenceKeyConstraint(fkModel) == null) {
logger.error("fk(" + fkModel.getId() + ") reference error");
- // TODO 対応するキーがないProblem
- result.add(new AbstractProblem("B") {
-
- public Severity getSeverity() {
- return null;
- }
-
- });
+ result.add(new ReferenceKeyProblem(fkModel));
}
}
return result;
}
+
+
+ static class ReferenceKeyProblem extends AbstractProblem {
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param fkModel
+ */
+ public ReferenceKeyProblem(ForeignKeyModel fkModel) {
+ super("X0000"); // TODO エラーコード設定
+ registerMessage(Locale.JAPAN, "外部キー{0}が参照するカラムはキーになっていません");
+ setArguments(new Object[] {
+ fkModel.getName() != null ? fkModel.getName() : fkModel.getId(),
+ fkModel.getKeyColumns().size(),
+ fkModel.getReferenceColumns().size()
+ });
+ }
+
+ public Severity getSeverity() {
+ return Severity.ERROR;
+ }
+
+ }
+
+ static class ReferenceMappingProblem extends AbstractProblem {
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param fkModel
+ */
+ public ReferenceMappingProblem(ForeignKeyModel fkModel) {
+ super("X0000"); // TODO エラーコード設定
+ registerMessage(Locale.JAPAN, "外部キー{0}のkeyColumnsサイズ({1})とreferenceColumnsサイズ({2})が一致していません");
+ setArguments(new Object[] {
+ fkModel.getName() != null ? fkModel.getName() : fkModel.getId(),
+ fkModel.getKeyColumns().size(),
+ fkModel.getReferenceColumns().size()
+ });
+ }
+
+ public Severity getSeverity() {
+ return Severity.ERROR;
+ }
+
+ }
+
}
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/IndexValidator.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -75,11 +75,6 @@
}
- /**
- * TODO for daisuke
- *
- * @author daisuke
- */
static class IllegalIndexColumnRefProblem extends AbstractProblem {
/**
@@ -90,12 +85,10 @@
*/
private IllegalIndexColumnRefProblem(TableModel tableModel, IndexModel indexModel, ColumnRef columnRef) {
super("X0000"); // TODO エラーコード設定
- registerMessage(Locale.JAPAN, "テーブル{0}({1})にインデックス{2}({3})が参照するカラム{4}は存在しません");
+ registerMessage(Locale.JAPAN, "テーブル{0}にインデックス{1}が参照するカラム{2}は存在しません");
setArguments(new Object[] {
tableModel.getName(),
- tableModel.getId().toString(),
- indexModel.getName(),
- indexModel.getId().toString(),
+ indexModel.getName() != null ? indexModel.getName() : indexModel.getId().toString(),
columnRef.getReferenceId().toString()
});
}
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/KeyConstraintValidator.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -49,9 +49,6 @@
private static Logger logger = LoggerFactory.getLogger(KeyConstraintValidator.class);
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
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-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/impl/TableValidator.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -40,9 +40,6 @@
*/
public class TableValidator extends AbstractValidator {
- /**
- * {@inheritDoc}
- */
@Override
public Collection<Problem> validate(RootModel rootModel) {
Collection<Problem> result = super.validate(rootModel);
@@ -74,9 +71,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.ERROR;
}
@@ -97,9 +91,6 @@
});
}
- /**
- * {@inheritDoc}
- */
public Severity getSeverity() {
return Severity.WARN;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/xml/JiemamyNamespaceContext.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/xml/JiemamyNamespaceContext.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/xml/JiemamyNamespaceContext.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -24,7 +24,7 @@
import javax.xml.namespace.NamespaceContext;
/**
- * TODO for daisuke
+ * Jiemamy用の{@link NamespaceContext}実装クラス。
*
* @author daisuke
*/
Deleted: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/IndentStringBuilderTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/IndentStringBuilderTest.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/IndentStringBuilderTest.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,140 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/07/12
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.utils;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.apache.commons.lang.SystemUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * {@link IndentStringBuilder}のテストクラス。
- * @author daisuke
- */
-public class IndentStringBuilderTest {
-
- private static final String NL = SystemUtils.LINE_SEPARATOR;
-
- private IndentStringBuilder builder;
-
-
- /**
- * インデントテスト2。
- */
- @Test
- public void rest03_インデントテスト2() {
- builder.append("line1").appendNewLine(+1);
- builder.append("line2").appendNewLine(+1);
- builder.append("line3").appendNewLine(-1);
- builder.append("line4").appendNewLine(+1);
- builder.append("line5").appendNewLine(+1);
- builder.append("line6").appendNewLine();
-
- StringBuilder expect = new StringBuilder();
- expect.append("line1").append(NL);
- expect.append(" line2").append(NL);
- expect.append(" line3").append(NL);
- expect.append(" line4").append(NL);
- expect.append(" line5").append(NL);
- expect.append(" line6").append(NL);
- expect.append(" "); // FIXME 最後に空白入るのはいけてないな。
-
- assertThat(builder.toString(), is(expect.toString()));
- }
-
- /**
- * setup.
- * @throws Exception
- */
- @Before
- public void setUp() throws Exception {
- builder = new IndentStringBuilder();
- }
-
- /**
- * teardown.
- * @throws Exception
- */
- @After
- public void tearDown() throws Exception {
- builder = null;
- }
-
- /**
- * 基本テスト。
- */
- @Test
- public void test01_基本テスト() {
- builder.append("line1").appendNewLine();
- builder.append("line2").appendNewLine();
- builder.append("line3").appendNewLine();
-
- StringBuilder expect = new StringBuilder();
- expect.append("line1").append(NL);
- expect.append("line2").append(NL);
- expect.append("line3").append(NL);
-
- assertThat(builder.toString(), is(expect.toString()));
- }
-
- /**
- * インデントテスト1。
- */
- @Test
- public void test02_インデントテスト1() {
- builder.append("line1").appendNewLine(+1);
- builder.append("line2").appendNewLine(-1);
- builder.append("line3").appendNewLine();
-
- StringBuilder expect = new StringBuilder();
- expect.append("line1").append(NL);
- expect.append(" line2").append(NL);
- expect.append("line3").append(NL);
-
- assertThat(builder.toString(), is(expect.toString()));
- }
-
- /**
- * マイナスインデントは空文字列。
- */
- @Test
- public void test04_マイナスインデントは空文字列() {
- builder.append("line1").appendNewLine(+1);
- builder.append("line2").appendNewLine(-1);
- builder.append("line3").appendNewLine(-1);
- builder.append("line4").appendNewLine(+1);
- builder.append("line5").appendNewLine(+1);
- builder.append("line6").appendNewLine(-1);
- builder.append("line7").appendNewLine();
-
- StringBuilder expect = new StringBuilder();
- expect.append("line1").append(NL);
- expect.append(" line2").append(NL);
- expect.append("line3").append(NL);
- expect.append("line4").append(NL); // ここで indent = -1
- expect.append("line5").append(NL);
- expect.append(" line6").append(NL);
- expect.append("line7").append(NL);
-
- assertThat(builder.toString(), is(expect.toString()));
- }
-}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/XpathUtilTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/XpathUtilTest.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/XpathUtilTest.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -34,7 +34,7 @@
import org.w3c.dom.Document;
/**
- * TODO for daisuke
+ * {@link XpathUtil}のテストクラス。
*
* @author daisuke
*/
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/EqualsUtilTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/EqualsUtilTest.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/EqualsUtilTest.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -39,7 +39,7 @@
/**
- * TODO for daisuke
+ * {@link EqualsUtil#equals(Object, Object)}のテスト。
*
* @throws Exception
*/
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/impl/AbstractIdentifierValidatorTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/impl/AbstractIdentifierValidatorTest.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/validator/impl/AbstractIdentifierValidatorTest.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -29,7 +29,7 @@
import org.jiemamy.dialect.validator.ReservedWordsProvider;
/**
- * TODO for daisuke
+ * {@link AbstractIdentifierValidator}のテストクラス。
*
* @author daisuke
*/
@@ -40,6 +40,7 @@
/**
* setup
+ *
* @throws java.lang.Exception
*/
@Before
@@ -49,6 +50,7 @@
/**
* teardown
+ *
* @throws java.lang.Exception
*/
@After
@@ -58,6 +60,7 @@
/**
* バリデータ動作テスト。
+ *
* @throws Exception
*/
@Test
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StandardEngine.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StandardEngine.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StandardEngine.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -22,7 +22,7 @@
import org.jiemamy.model.AdapterType;
/**
- * TODO for daisuke
+ * MySQLのストレージエンジンを表す列挙型。
*
* @author daisuke
*/
Modified: artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StorageEngine.java
===================================================================
--- artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StorageEngine.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ artemis/trunk/jiemamy-dialect-mysql/src/main/java/org/jiemamy/dialect/mysql/adapter/StorageEngine.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -19,7 +19,7 @@
package org.jiemamy.dialect.mysql.adapter;
/**
- * MySQLのストレージエンジン。
+ * MySQLのストレージエンジンを表すインターフェイス。
*
* @author daisuke
*/
Modified: vesta/trunk/org.jiemamy.eclipse/plugin.xml
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/plugin.xml 2009-02-22 13:26:25 UTC (rev 2708)
+++ vesta/trunk/org.jiemamy.eclipse/plugin.xml 2009-02-22 14:27:41 UTC (rev 2709)
@@ -62,11 +62,6 @@
<!--
<extension
- point="org.jiemamy.eclipse.dialects">
- <dialect
- class="org.jiemamy.core.extension.dialect.std.Sql99Dialect"/>
- </extension>
- <extension
point="org.jiemamy.eclipse.validators">
<validator
class="org.jiemamy.eclipse.editor.validator.EntityIdentifierValidator" />
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/21
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
package org.jiemamy.eclipse.editor.dialog.foreignkey;
import java.util.ArrayList;
@@ -38,7 +56,6 @@
/**
* 外部キー設定ダイアログ
*
- * @author takezoe
* @author daisuke
*/
public class ForeignKeyEditDialog extends Dialog {
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -224,8 +224,7 @@
return null;
case 1:
- // FIXME false固定
- return /*ColumnUtil.isPartOfPrimaryKeyColumns(column)*/false ? ir.get(Images.ICON_PK) : null;
+ return ColumnUtil.isPartOfPrimaryKeyColumns(column) ? ir.get(Images.ICON_PK) : null;
case 4:
// FIXME ここ、何を表示するんだっけ PKだっけ? ↑にあるじゃん。。
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -20,7 +20,6 @@
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandListener;
-import org.jiemamy.editcommand.CommandProcessor;
/**
* コマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
@@ -44,13 +43,6 @@
void fireCommandProcess(Command command);
/**
- * TODO for daisuke
- *
- * @return
- */
- CommandProcessor getCommandProcessor();
-
- /**
* リスなを削除する。
*
* @param listener
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-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/Jiemamy.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -266,9 +266,6 @@
this.classLoader = classLoader;
}
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
// TODO キャスト安全性の根拠提示
public T getInstance(String fqcn) throws ClassNotFoundException {
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/AdapterType.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/AdapterType.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/AdapterType.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -19,7 +19,7 @@
package org.jiemamy.model;
/**
- * TODO for daisuke
+ * アダプタの種類をあらわす列挙型。
*
* @author daisuke
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModel.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/ColumnCheckModel.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -19,7 +19,7 @@
package org.jiemamy.model.attribute.constraint;
/**
- * TODO for daisuke
+ * カラムに対して指定されるチェック制約のモデルインターフェイス。
*
* @author daisuke
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModel.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/attribute/constraint/TableCheckModel.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -19,7 +19,7 @@
package org.jiemamy.model.attribute.constraint;
/**
- * TODO for daisuke
+ * テーブルに対して指定されるチェック制約のモデルインターフェイス。
*
* @author daisuke
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java 2009-02-22 13:26:25 UTC (rev 2708)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/Adaptable.java 2009-02-22 14:27:41 UTC (rev 2709)
@@ -70,8 +70,6 @@
* また、その場合そのアダプタは、同一性判別のため{@link Object#equals(Object)}メソッドをオーバーライド
* していなければならない。</p>
*
- * THINK どっちか一方にしたいよな。アノテーション。両方ついてた、とか避けたいし。
- *
* @param adapter 登録するアダプタ
* @throws UnsupportedOperationException
* @throws IllegalArgumentException 引数に{@code null}を与えた場合