svnno****@sourc*****
svnno****@sourc*****
2008年 9月 11日 (木) 14:18:22 JST
Revision: 1911
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1911
Author: daisuke_m
Date: 2008-09-11 14:18:22 +0900 (Thu, 11 Sep 2008)
Log Message:
-----------
Taskタグ消化。/
javadoc追加。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/exception/DataTypeNotFoundException.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java
artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java
artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -50,9 +50,8 @@
/** DIコンテナ */
public S2Container container;
- // FIXME DIしたい。
/** テスト対象のエクスポータ */
- public Exporter exporter/* = new SqlExporter()*/;
+ public Exporter exporter;
/**
Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -40,7 +40,7 @@
import org.jiemamy.core.utils.processor.root.GetTableProcessor;
/**
- * TODO for daisuke
+ * {@link DatabaseImporter}のテストクラス。
* @author daisuke
*/
@RunWith(Seasar2.class)
@@ -55,6 +55,7 @@
/**
+ * setup
* @throws java.lang.Exception
*/
@Before
@@ -74,6 +75,7 @@
}
/**
+ * teardown
* @throws java.lang.Exception
*/
@After
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/MustBeMulti.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -20,6 +20,9 @@
/**
* bacchusからartemisへの拡張にあたって、足りていない情報を定数で与えるためのクラス。
+ *
+ * <p>将来、動的に動作すべき箇所が参照しており、そのあかつきには消されなければならないクラス。</p>
+ *
* @author daisuke
*/
public class MustBeMulti {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/exception/DataTypeNotFoundException.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/exception/DataTypeNotFoundException.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/exception/DataTypeNotFoundException.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -35,16 +35,6 @@
* @category instance creation
*/
public DataTypeNotFoundException(Dialect dialect, String typeName) {
- super(typeName + " is not found in " + dialect + ".");
+ super("\"" + typeName + "\" is not found in " + dialect + ".");
}
-
- /**
- * コンストラクタ。
- * @param typeName 型名
- * @category instance creation
- */
- public DataTypeNotFoundException(String typeName) {
- super(typeName + " is not found in [dialect name (TODO)]."); // TODO for daisuke
- }
-
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/mapping/SpecialDataTypeMapping.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -26,6 +26,7 @@
import org.jiemamy.core.exception.DataTypeNotFoundException;
import org.jiemamy.core.exception.IllegalDataTypeImplementationException;
import org.jiemamy.core.exception.IllegalDialectImplementation;
+import org.jiemamy.core.extension.dialect.Dialect;
import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
import org.jiemamy.core.model.typedef.datatype.DataType;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
@@ -39,10 +40,21 @@
*/
public class SpecialDataTypeMapping implements DataTypeMapping {
+ private Dialect dialect;
+
private List<Class<? extends AbstractDataType>> classes = CollectionsUtil.newArrayList();
/**
+ * コンストラクタ。
+ * @param dialect
+ * @category instance creation
+ */
+ public SpecialDataTypeMapping(Dialect dialect) {
+ this.dialect = dialect;
+ }
+
+ /**
* {@inheritDoc}
*/
public List<Class<? extends AbstractDataType>> getAllModelingDataTypes() {
@@ -127,10 +139,18 @@
}
}
}
- throw new DataTypeNotFoundException(typeName);
+ throw new DataTypeNotFoundException(getDialect(), typeName);
}
/**
+ * dialectを取得する。
+ * @return dialect
+ */
+ protected Dialect getDialect() {
+ return dialect;
+ }
+
+ /**
* 与えられたアダプタが持つ情報を、自分のアダプタにコピーする。
*
* <p>自分が同一のアダプタを持たない場合、その情報は破棄される。</p>
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/extension/dialect/validator/AbstractIdentifierValidator.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,9 +21,8 @@
import java.util.Arrays;
import java.util.regex.Pattern;
-
/**
- * TODO for daisuke
+ * {@link IdentifierValidator}の抽象実装。
* @author daisuke
*/
public abstract class AbstractIdentifierValidator implements IdentifierValidator {
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/interpreter/DatabaseReader.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -24,6 +24,8 @@
import java.sql.SQLException;
import java.util.List;
+import org.seasar.framework.util.tiger.CollectionsUtil;
+
import org.jiemamy.core.extension.dialect.DatabaseReadingContext;
import org.jiemamy.core.extension.dialect.Dialect;
import org.jiemamy.core.utils.ForEachUtil;
@@ -91,7 +93,7 @@
* @return ビジターに依存した、実行結果
* @throws SQLException
*/
- public <T>T readRelations(Connection connection, AbstractResultSetVisitor<T> visitor) throws SQLException {
+ public <T>List<T> readRelations(Connection connection, AbstractResultSetVisitor<T> visitor) throws SQLException {
dialect.getAdvisor().setUpRead(connection);
String schema = ctx.getValue("schema"); // DatabaseImporter.SCHEMA
@@ -99,12 +101,13 @@
List<String> entityNames = readEnities(connection, new EntityNamesVisitor());
+ List<T> result = CollectionsUtil.newArrayList();
for (String entityName : entityNames) {
ResultSet relations = meta.getImportedKeys(null, schema, entityName);
- ForEachUtil.accept(relations, visitor);
+ result.add(ForEachUtil.accept(relations, visitor));
}
dialect.getAdvisor().tearDownRead(connection);
- return null; // FIXME 複数やるから、Tを単純に返せないな。
+ return result;
}
}
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/constraint/ConstraintUtil.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -19,16 +19,16 @@
package org.jiemamy.core.model.typedef.constraint;
/**
- * TODO for daisuke
+ * 制約モデル用ユーティリティクラス。
* @author daisuke
*/
public class ConstraintUtil {
/**
- * TODO for daisuke
+ * 2つの制約をマージする。
* @param a
* @param b
- * @return
+ * @return マージされた制約
*/
public static ConstraintSetModel marge(ConstraintSetModel a, ConstraintSetModel b) {
ConstraintSetModel constraints = new ConstraintSetModel();
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/utils/processor/entity/table/AddInheritedColumnsProcessorTest.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -46,7 +46,7 @@
/**
- * TODO for daisuke
+ * setup
* @throws java.lang.Exception
*/
@Before
@@ -64,7 +64,7 @@
}
/**
- * TODO for daisuke
+ * teardown
* @throws java.lang.Exception
*/
@After
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -60,7 +60,7 @@
*/
public abstract class AbstractDialect implements Dialect {
- private SpecialDataTypeMapping dataTypeMapping = new SpecialDataTypeMapping();
+ private SpecialDataTypeMapping dataTypeMapping = new SpecialDataTypeMapping(this);
private Quoter quoter;
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.quoter.Quoter;
/**
- * TODO for daisuke
+ * {@link Quoter}のデフォルト実装。
* @author daisuke
*/
public class DefaultQuoter implements Quoter {
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.validator.AbstractIdentifierValidator;
/**
- * TODO for daisuke
+ * 一般Dialectに対する識別子バリデータ。
* @author daisuke
*/
public class GenericValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/AbstractDialectTest.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -47,7 +47,7 @@
import org.jiemamy.dialect.test.DbConnectionTest;
/**
- * TODO for daisuke
+ * {@link AbstractDialect}のテストクラス。
* @author daisuke
*/
@RunWith(Seasar2.class)
@@ -66,7 +66,7 @@
/**
- * TODO for daisuke
+ * setup
* @throws java.lang.Exception
*/
@Before
@@ -87,7 +87,7 @@
}
/**
- * TODO for daisuke
+ * teardown
* @throws java.lang.Exception
*/
@After
Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.validator.AbstractIdentifierValidator;
/**
- * TODO for daisuke
+ * MySQL用識別子バリデータ。
* @author daisuke
*/
public class MySqlIdentifierValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -27,9 +27,237 @@
public class MySqlReservedWords implements ReservedWordsProvider {
private static final String[] RESERVED_WORDS = {
- // UNDONE
- "FOO",
- "BAR"
+ "ACCESSIBLE",
+ "ADD",
+ "ALL",
+ "ALTER",
+ "ANALYZE",
+ "AND",
+ "AS",
+ "ASC",
+ "ASENSITIVE",
+ "BEFORE",
+ "BETWEEN",
+ "BIGINT",
+ "BINARY",
+ "BLOB",
+ "BOTH",
+ "BY",
+ "CALL",
+ "CASCADE",
+ "CASE",
+ "CHANGE",
+ "CHAR",
+ "CHARACTER",
+ "CHECK",
+ "COLLATE",
+ "COLUMN",
+ "CONDITION",
+ "CONSTRAINT",
+ "CONTINUE",
+ "CONVERT",
+ "CREATE",
+ "CROSS",
+ "CURRENT_DATE",
+ "CURRENT_TIME",
+ "CURRENT_TIMESTAMP",
+ "CURRENT_USER",
+ "CURSOR",
+ "DATABASE",
+ "DATABASES",
+ "DAY_HOUR",
+ "DAY_MICROSECOND",
+ "DAY_MINUTE",
+ "DAY_SECOND",
+ "DEC",
+ "DECIMAL",
+ "DECLARE",
+ "DEFAULT",
+ "DELAYED",
+ "DELETE",
+ "DESC",
+ "DESCRIBE",
+ "DETERMINISTIC",
+ "DISTINCT",
+ "DISTINCTROW",
+ "DIV",
+ "DOUBLE",
+ "DROP",
+ "DUAL",
+ "EACH",
+ "ELSE",
+ "ELSEIF",
+ "ENCLOSED",
+ "ESCAPED",
+ "EXISTS",
+ "EXIT",
+ "EXPLAIN",
+ "FALSE",
+ "FETCH",
+ "FLOAT",
+ "FLOAT4",
+ "FLOAT8",
+ "FOR",
+ "FORCE",
+ "FOREIGN",
+ "FROM",
+ "FULLTEXT",
+ "GRANT",
+ "GROUP",
+ "HAVING",
+ "HIGH_PRIORITY",
+ "HOUR_MICROSECOND",
+ "HOUR_MINUTE",
+ "HOUR_SECOND",
+ "IF",
+ "IGNORE",
+ "IN",
+ "INDEX",
+ "INFILE",
+ "INNER",
+ "INOUT",
+ "INSENSITIVE",
+ "INSERT",
+ "INT",
+ "INT1",
+ "INT2",
+ "INT3",
+ "INT4",
+ "INT8",
+ "INTEGER",
+ "INTERVAL",
+ "INTO",
+ "IS",
+ "ITERATE",
+ "JOIN",
+ "KEY",
+ "KEYS",
+ "KILL",
+ "LEADING",
+ "LEAVE",
+ "LEFT",
+ "LIKE",
+ "LIMIT",
+ "LINEAR",
+ "LINES",
+ "LOAD",
+ "LOCALTIME",
+ "LOCALTIMESTAMP",
+ "LOCK",
+ "LONG",
+ "LONGBLOB",
+ "LONGTEXT",
+ "LOOP",
+ "LOW_PRIORITY",
+ "MASTER_SSL_VERIFY_SERVER_CERT",
+ "MATCH",
+ "MEDIUMBLOB",
+ "MEDIUMINT",
+ "MEDIUMTEXT",
+ "MIDDLEINT",
+ "MINUTE_MICROSECOND",
+ "MINUTE_SECOND",
+ "MOD",
+ "MODIFIES",
+ "NATURAL",
+ "NOT",
+ "NO_WRITE_TO_BINLOG",
+ "NULL",
+ "NUMERIC",
+ "ON",
+ "OPTIMIZE",
+ "OPTION",
+ "OPTIONALLY",
+ "OR",
+ "ORDER",
+ "OUT",
+ "OUTER",
+ "OUTFILE",
+ "PRECISION",
+ "PRIMARY",
+ "PROCEDURE",
+ "PURGE",
+ "RANGE",
+ "READ",
+ "READS",
+ "READ_ONLY",
+ "READ_WRITE",
+ "REAL",
+ "REFERENCES",
+ "REGEXP",
+ "RELEASE",
+ "RENAME",
+ "REPEAT",
+ "REPLACE",
+ "REQUIRE",
+ "RESTRICT",
+ "RETURN",
+ "REVOKE",
+ "RIGHT",
+ "RLIKE",
+ "SCHEMA",
+ "SCHEMAS",
+ "SECOND_MICROSECOND",
+ "SELECT",
+ "SENSITIVE",
+ "SEPARATOR",
+ "SET",
+ "SHOW",
+ "SMALLINT",
+ "SPATIAL",
+ "SPECIFIC",
+ "SQL",
+ "SQLEXCEPTION",
+ "SQLSTATE",
+ "SQLWARNING",
+ "SQL_BIG_RESULT",
+ "SQL_CALC_FOUND_ROWS",
+ "SQL_SMALL_RESULT",
+ "SSL",
+ "STARTING",
+ "STRAIGHT_JOIN",
+ "TABLE",
+ "TERMINATED",
+ "THEN",
+ "TINYBLOB",
+ "TINYINT",
+ "TINYTEXT",
+ "TO",
+ "TRAILING",
+ "TRIGGER",
+ "TRUE",
+ "UNDO",
+ "UNION",
+ "UNIQUE",
+ "UNLOCK",
+ "UNSIGNED",
+ "UPDATE",
+ "USAGE",
+ "USE",
+ "USING",
+ "UTC_DATE",
+ "UTC_TIME",
+ "UTC_TIMESTAMP",
+ "VALUES",
+ "VARBINARY",
+ "VARCHAR",
+ "VARCHARACTER",
+ "VARYING",
+ "WHEN",
+ "WHERE",
+ "WHILE",
+ "WITH",
+ "WRITE",
+ "X509",
+ "XOR",
+ "YEAR_MONTH",
+ "ZEROFILL",
+ "ACCESSIBLE",
+ "LINEAR",
+ "MASTER_SSL_VERIFY_SERVER_CERT",
+ "RANGE",
+ "READ_ONLY",
+ "READ_WRITE"
};
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.validator.AbstractIdentifierValidator;
/**
- * TODO for daisuke
+ * PostgreSQL用識別子バリデータ。
* @author daisuke
*/
public class PostgresqlIdentifierValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.quoter.Quoter;
/**
- * TODO for daisuke
+ * PostgreSQL用 {@link Quoter}実装。
* @author daisuke
*/
class PostgresqlQuoter implements Quoter {
Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -21,7 +21,7 @@
import org.jiemamy.core.extension.dialect.validator.AbstractIdentifierValidator;
/**
- * TODO for daisuke
+ * 標準SQL99用 識別子バリデータ。
* @author daisuke
*/
public class Sql99IdentifierValidator extends AbstractIdentifierValidator {
Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/JmContributor.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -103,6 +103,7 @@
*/
@Override
public void contributeToToolBar(IToolBarManager toolBarManager) {
+ // コピペ関連アクションの追加
toolBarManager.add(getActionRegistry().getAction(ActionFactory.DELETE.getId()));
toolBarManager.add(getActionRegistry().getAction(ActionFactory.UNDO.getId()));
toolBarManager.add(getActionRegistry().getAction(ActionFactory.REDO.getId()));
@@ -123,12 +124,14 @@
toolBarManager.add(new Separator());
+ // ズーム関連アクションの追加
toolBarManager.add(getActionRegistry().getAction(GEFActionConstants.ZOOM_IN));
toolBarManager.add(getActionRegistry().getAction(GEFActionConstants.ZOOM_OUT));
toolBarManager.add(new ZoomComboContributionItem(getPage()));
toolBarManager.add(new Separator());
+ // 表示モード切替コンボの追加
toolBarManager.add(new ControlContribution("jp.xet.jiemamy.eclipse.displayMode") {
/**
Modified: artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java
===================================================================
--- artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2008-09-10 17:08:38 UTC (rev 1910)
+++ artemis/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/MultiDiagramEditor.java 2008-09-11 05:18:22 UTC (rev 1911)
@@ -51,7 +51,7 @@
import org.jiemamy.serializer.JiemamySerializer;
/**
- * TODO for daisuke
+ * マルチページ構成のダイアグラムエディタクラス。
* @author daisuke
*/
public class MultiDiagramEditor extends MultiPageEditorPart implements IResourceChangeListener {