svnno****@sourc*****
svnno****@sourc*****
2008年 12月 14日 (日) 22:56:57 JST
Revision: 2258
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2258
Author: daisuke_m
Date: 2008-12-14 22:56:57 +0900 (Sun, 14 Dec 2008)
Log Message:
-----------
リネーム修正漏れ。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
Added Paths:
-----------
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2008-12-12 13:54:47 UTC (rev 2257)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java 2008-12-14 13:56:57 UTC (rev 2258)
@@ -18,7 +18,7 @@
import org.jiemamy.composer.ImportContext;
import org.jiemamy.composer.Importer;
import org.jiemamy.dialect.Dialect;
-import org.jiemamy.dialect.generic.GeneralDialect;
+import org.jiemamy.dialect.generic.GenericDialect;
import org.jiemamy.exception.GenericModelingModeException;
import org.jiemamy.exception.ImportException;
import org.jiemamy.exception.TooManyElementsException;
@@ -90,7 +90,7 @@
Connection connection = null;
try {
- if (dialect instanceof GeneralDialect) {
+ if (dialect instanceof GenericDialect) {
throw new GenericModelingModeException();
}
Deleted: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java 2008-12-12 13:54:47 UTC (rev 2257)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java 2008-12-14 13:56:57 UTC (rev 2258)
@@ -1,112 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/07
- *
- * 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.generic;
-
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.util.List;
-
-import org.jiemamy.dialect.ConnectionAdvisor;
-import org.jiemamy.dialect.DataTypeResolver;
-import org.jiemamy.dialect.DefaultConnectionAdvisor;
-import org.jiemamy.dialect.DefaultDataTypeResolver;
-import org.jiemamy.dialect.DefaultQuoter;
-import org.jiemamy.dialect.Dialect;
-import org.jiemamy.dialect.IdentifierValidator;
-import org.jiemamy.dialect.Quoter;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.AbstractEntityModel;
-import org.jiemamy.model.sql.SqlStatement;
-
-/**
- * 全てのSQL方言に対応し得る、最大公約数的なSQL方言実装クラス。
- * @author daisuke
- */
-public class GeneralDialect implements Dialect {
-
- private Quoter quoter = new DefaultQuoter();
-
- private DataTypeResolver dataTypeResolver = new DefaultDataTypeResolver(this);
-
- private IdentifierValidator validator = new GenericValidator();
-
- private ConnectionAdvisor advisor = new DefaultConnectionAdvisor();
-
-
- /**
- * コンストラクタ。
- * @category instance creation
- */
- public GeneralDialect() {
- }
-
- /**
- * {@inheritDoc}
- */
- public AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * {@inheritDoc}
- */
- public ConnectionAdvisor getAdvisor() {
- assert advisor != null;
- return advisor;
- }
-
- /**
- * {@inheritDoc}
- */
- public DataTypeResolver getDataTypeResolver() {
- assert dataTypeResolver != null;
- return dataTypeResolver;
- }
-
- /**
- * {@inheritDoc}
- */
- public Quoter getQuoter() {
- assert quoter != null;
- return quoter;
- }
-
- /**
- * {@inheritDoc}
- */
- public IdentifierValidator getValidator() {
- assert validator != null;
- return validator;
- }
-
- /**
- * {@inheritDoc}
- */
- public RootModel toRootModel(List<SqlStatement> statements) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * {@inheritDoc}
- */
- public List<SqlStatement> toStatements(RootModel rootModel) {
- throw new UnsupportedOperationException();
- }
-
-}
Copied: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java (from rev 2257, artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java)
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java (rev 0)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java 2008-12-14 13:56:57 UTC (rev 2258)
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/07
+ *
+ * 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.generic;
+
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.util.List;
+
+import org.jiemamy.dialect.ConnectionAdvisor;
+import org.jiemamy.dialect.DataTypeResolver;
+import org.jiemamy.dialect.DefaultConnectionAdvisor;
+import org.jiemamy.dialect.DefaultDataTypeResolver;
+import org.jiemamy.dialect.DefaultQuoter;
+import org.jiemamy.dialect.Dialect;
+import org.jiemamy.dialect.IdentifierValidator;
+import org.jiemamy.dialect.Quoter;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.node.AbstractEntityModel;
+import org.jiemamy.model.sql.SqlStatement;
+
+/**
+ * 全てのSQL方言に対応し得る、最大公約数的なSQL方言実装クラス。
+ * @author daisuke
+ */
+public class GenericDialect implements Dialect {
+
+ private Quoter quoter = new DefaultQuoter();
+
+ private DataTypeResolver dataTypeResolver = new DefaultDataTypeResolver(this);
+
+ private IdentifierValidator validator = new GenericValidator();
+
+ private ConnectionAdvisor advisor = new DefaultConnectionAdvisor();
+
+
+ /**
+ * コンストラクタ。
+ * @category instance creation
+ */
+ public GenericDialect() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConnectionAdvisor getAdvisor() {
+ assert advisor != null;
+ return advisor;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DataTypeResolver getDataTypeResolver() {
+ assert dataTypeResolver != null;
+ return dataTypeResolver;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Quoter getQuoter() {
+ assert quoter != null;
+ return quoter;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public IdentifierValidator getValidator() {
+ assert validator != null;
+ return validator;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public RootModel toRootModel(List<SqlStatement> statements) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<SqlStatement> toStatements(RootModel rootModel) {
+ throw new UnsupportedOperationException();
+ }
+
+}
Property changes on: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericDialect.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java 2008-12-12 13:54:47 UTC (rev 2257)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java 2008-12-14 13:56:57 UTC (rev 2258)
@@ -28,7 +28,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.jiemamy.dialect.generic.GeneralDialect;
+import org.jiemamy.dialect.generic.GenericDialect;
import org.jiemamy.model.datatype.DataType;
import org.jiemamy.model.datatype.DataTypeDescriptor;
import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;
@@ -40,12 +40,12 @@
import org.jiemamy.model.datatype.adapter.TimezonedDataTypeAdapter;
/**
- * {@link GeneralDialect}のテストクラス。
+ * {@link GenericDialect}のテストクラス。
* @author daisuke
*/
public class GenericDialectTest {
- private GeneralDialect dialect;
+ private GenericDialect dialect;
/**
@@ -54,7 +54,7 @@
*/
@Before
public void setUp() throws Exception {
- dialect = new GeneralDialect();
+ dialect = new GenericDialect();
}
/**