svnno****@sourc*****
svnno****@sourc*****
2008年 11月 5日 (水) 19:12:32 JST
Revision: 2083
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2083
Author: daisuke_m
Date: 2008-11-05 19:12:32 +0900 (Wed, 05 Nov 2008)
Log Message:
-----------
依存性の整理。 /
古い実装の削除。 /
refactor
Modified Paths:
--------------
artemis/trunk/org.jiemamy.serializer/.classpath
artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF
artemis/trunk/org.jiemamy.serializer/build.properties
artemis/trunk/org.jiemamy.serializer/pom.xml
artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/DataWriter.java
artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/XMLWriter.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java
Added Paths:
-----------
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerImpl2.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/converter/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl2/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/connection/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/dataset/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeStickyModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeTableModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeViewModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/index/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/presentation/
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeColumnModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeInheritanceColumnModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/constraint/
artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/core/model/
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.serializer/.classpath
===================================================================
--- artemis/trunk/org.jiemamy.serializer/.classpath 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/.classpath 2008-11-05 10:12:32 UTC (rev 2083)
@@ -4,10 +4,6 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.jiemamy.irenka"/>
Modified: artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/META-INF/MANIFEST.MF 2008-11-05 10:12:32 UTC (rev 2083)
@@ -3,24 +3,9 @@
Bundle-Name: Jiemamy Serializer
Bundle-SymbolicName: org.jiemamy.serializer
Bundle-Version: 0.2.0.SNAPSHOT
-Bundle-ClassPath: .,
- lib/dom4j-1.6.1.jar,
- lib/xml-apis-1.0.b2.jar,
- lib/xpp3_min-1.1.4c.jar,
- lib/xstream-1.3.jar
+Bundle-ClassPath: .
Bundle-Vendor: Jiemamy Project
-Export-Package: org.jiemamy.core.model,
- org.jiemamy.serializer,
- org.jiemamy.serializer.converter,
- org.jiemamy.serializer.impl,
- org.jiemamy.serializer.model,
- org.jiemamy.serializer.model.connection,
- org.jiemamy.serializer.model.dataset,
- org.jiemamy.serializer.model.node,
- org.jiemamy.serializer.model.node.index,
- org.jiemamy.serializer.model.presentation,
- org.jiemamy.serializer.model.typedef,
- org.jiemamy.serializer.model.typedef.constraint,
+Export-Package: org.jiemamy.serializer,
org.jiemamy.serializer.swap
Require-Bundle: org.jiemamy.spec.core,
org.jiemamy.spec.view,
Modified: artemis/trunk/org.jiemamy.serializer/build.properties
===================================================================
--- artemis/trunk/org.jiemamy.serializer/build.properties 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/build.properties 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,11 +1,7 @@
#Mon Jul 21 18:29:05 JST 2008
bin.includes = .,\
META-INF/,\
- LICENSE.txt,\
- lib/dom4j-1.6.1.jar,\
- lib/xml-apis-1.0.b2.jar,\
- lib/xpp3_min-1.1.4c.jar,\
- lib/xstream-1.3.jar
+ LICENSE.txt
output..=target/classes/
source..=src/main/java/,src/main/resources/,src/test/java/,src/test/resources/
javacCustomEncodings.. = src[UTF-8]
Modified: artemis/trunk/org.jiemamy.serializer/pom.xml
===================================================================
--- artemis/trunk/org.jiemamy.serializer/pom.xml 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/pom.xml 2008-11-05 10:12:32 UTC (rev 2083)
@@ -169,16 +169,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.jiemamy.spec.core</artifactId>
<version>${project.version}</version>
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/DataWriter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/DataWriter.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/DataWriter.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -81,7 +81,6 @@
* Create a new data writer for standard output.
*/
public DataWriter() {
- super();
}
/**
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/XMLWriter.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/XMLWriter.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/com/megginson/sax/XMLWriter.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -10,7 +10,8 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -246,13 +247,13 @@
*/
public class XMLWriter extends XMLFilterImpl {
- private final Attributes EMPTY_ATTS = new AttributesImpl();
+ private static final Attributes EMPTY_ATTS = new AttributesImpl();
- private Hashtable<String, String> prefixTable;
+ private Map<String, String> prefixTable;
- private Hashtable<String, Boolean> forcedDeclTable;
+ private Map<String, Boolean> forcedDeclTable;
- private Hashtable<String, String> doneDeclTable;
+ private Map<String, String> doneDeclTable;
private int elementLevel = 0;
@@ -886,7 +887,8 @@
prefix = qName.substring(0, i);
}
}
- for (; prefix == null || nsSupport.getURI(prefix) != null; prefix = "__NS" + ++prefixCounter) {
+ while (prefix == null || nsSupport.getURI(prefix) != null) {
+ prefix = "__NS" + ++prefixCounter;
}
nsSupport.declarePrefix(prefix, uri);
doneDeclTable.put(uri, prefix);
@@ -898,9 +900,7 @@
* Namespaces all appear.
*/
private void forceNSDecls() {
- Enumeration<String> prefixes = forcedDeclTable.keys();
- while (prefixes.hasMoreElements()) {
- String prefix = prefixes.nextElement();
+ for (String prefix : forcedDeclTable.keySet()) {
doPrefix(prefix, null, true);
}
}
@@ -915,9 +915,9 @@
private void init(Writer writer) {
setOutput(writer);
nsSupport = (new NamespaceSupport());
- prefixTable = (new Hashtable<String, String>());
- forcedDeclTable = (new Hashtable<String, Boolean>());
- doneDeclTable = (new Hashtable<String, String>());
+ prefixTable = (new HashMap<String, String>());
+ forcedDeclTable = (new HashMap<String, Boolean>());
+ doneDeclTable = (new HashMap<String, String>());
}
/**
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/DomainModelDxo.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/25
- *
- * 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.core.model;
-
-import org.jiemamy.serializer.model.typedef.SerializeDomainModel;
-import org.jiemamy.spec.model.DomainModel;
-
-/**
- * {@llink DomainModel}と{@link SerializeDomainModel}を相互変換するコンバータ。
- *
- * @author j5ik2o
- */
-public interface DomainModelDxo {
-
- /**
- * DomainModelからSerializeDomainModelに変換する。
- * @param domainModel 変換元モデル
- * @return SerializeDomainModel
- */
- SerializeDomainModel convert(DomainModel domainModel);
-
- /**
- * SerializeDomainModelからDomainModelに変換する。
- * @param serializeDomainModel 変換元モデル
- * @return 変換先モデル
- */
- DomainModel convert(SerializeDomainModel serializeDomainModel);
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/ForeignKeyModelDxo.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,44 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/03
- *
- * 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.core.model;
-
-import org.jiemamy.serializer.model.connection.SerializeForeignKeyModel;
-import org.jiemamy.spec.model.connection.ForeignKeyModel;
-
-/**
- * TODO junichi
- * @author junichi
- */
-public interface ForeignKeyModelDxo {
-
- /**
- * TODO for junichi
- * @param rootModel
- * @return SerializeForeignKeyModel 変換後のモデル
- */
- SerializeForeignKeyModel convert(ForeignKeyModel rootModel);
-
- /**
- * TODO for junichi
- * @param serializeForeignKeyModel
- * @return ForeignKeyModel 変換後のモデル
- */
- ForeignKeyModel convert(SerializeForeignKeyModel serializeForeignKeyModel);
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/core/model/RootModelDxo.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,46 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/25
- *
- * 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.core.model;
-
-import org.jiemamy.serializer.model.SerializeRootModel;
-import org.jiemamy.spec.model.RootModel;
-
-/**
- * {@link RootModel}用のDxoインターフェイス。
- *
- * @author j5ik2o
- */
-public interface RootModelDxo {
-
- /**
- * {@link RootModel}から{@link SerializeRootModel}に変換する。
- *
- * @param rootModel 変換元モデル
- * @return SerializeRootModel 変換後モデル
- */
- SerializeRootModel convert(RootModel rootModel);
-
- /**
- * SerializeRootModelからRootModelに変換する。
- *
- * @param serializeRootModel 変換元モデル
- * @return rootModel 変換先モデル
- */
- RootModel convert(SerializeRootModel serializeRootModel);
-}
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerFactory.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -18,7 +18,6 @@
*/
package org.jiemamy.serializer;
-import org.jiemamy.serializer.impl2.JiemamySerializerImpl2;
/**
* JiemamySerializerのインスタンスを生成するためのファクトリ。
Copied: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerImpl2.java (from rev 2060, artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/impl2/JiemamySerializerImpl2.java)
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerImpl2.java (rev 0)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerImpl2.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/10/13
+ *
+ * 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 java.io.InputStream;
+
+import org.apache.commons.lang.SerializationException;
+
+import org.jiemamy.spec.model.RootModel;
+
+/**
+ * TODO for daisuke
+ * @author daisuke
+ */
+public class JiemamySerializerImpl2 implements JiemamySerializer {
+
+ /**
+ * {@inheritDoc}
+ */
+ public RootModel deserialize(InputStream in) throws SerializationException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InputStream serialize(RootModel rootModel) throws SerializationException {
+ return new ModelInputStream(rootModel);
+ }
+
+}
Property changes on: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/JiemamySerializerImpl2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/AbstractSerializeModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,73 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * {@link AbstractModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ SuppressWarnings("serial")
-public abstract class AbstractSerializeModel implements Serializable {
-
- /** ID属性 */
- @XStreamAsAttribute
- private UUID id;
-
-
- /**
- * ID属性を取得する。
- * @return ID属性
- */
- public UUID getId() {
- return id;
- }
-
- /**
- * モデルが初期化済みかどうかを調べる。
- * @return 初期化済みであれば <code>true</code>
- */
- public boolean isInitialized() {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * 新規アダプタを登録する。
- * @param adapter
- */
- public void registerAdapter(Object adapter) {
-
- }
-
- /**
- * ID属性を設定する。
- * @param id ID属性
- */
- public void setId(UUID id) {
- this.id = id;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/SerializeRootModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,241 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model;
-
-import java.util.List;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.serializer.model.connection.AbstractSerializeConnectionModel;
-import org.jiemamy.serializer.model.dataset.SerializeInsertDataSetModel;
-import org.jiemamy.serializer.model.node.AbstractSerializeNodeModel;
-import org.jiemamy.serializer.model.presentation.SerializeDiagramPresentationModel;
-import org.jiemamy.serializer.model.typedef.SerializeDomainModel;
-import org.jiemamy.spec.model.RootModel;
-
-/**
- * {@link RootModel}に対応するシリアライズ用のモデル。
- *
- * @author daisuke
- * @author j5ik2o
- */
- ＠ XStreamAlias("rootModel")
- ＠ SuppressWarnings("serial")
-public class SerializeRootModel extends AbstractSerializeModel {
-
- /** Dialectクラス名 */
- private String dialectClassName;
-
- /** 開始スクリプト */
- private String beginScript;
-
- /** 終了スクリプト */
- private String endScript;
-
- /** 説明文 */
- private String description;
-
- /** スキーマ名 */
- private String schemaName;
-
- /** ドメインのリスト */
- private List<SerializeDomainModel> domains = CollectionsUtil.newArrayList();
-
- /** ノードのリスト */
- private List<AbstractSerializeNodeModel> nodes = CollectionsUtil.newArrayList();
-
- /**
- * コネクションのリスト
- */
- private List<AbstractSerializeConnectionModel> connections = CollectionsUtil.newArrayList();
-
- /**
- * ダイアグラム表現（レイアウト等）のリスト
- */
- private List<SerializeDiagramPresentationModel> diagramPresentations = CollectionsUtil.newArrayList();
-
- /**
- * INSERTデータセット
- */
- private List<SerializeInsertDataSetModel> insertDataSet = CollectionsUtil.newArrayList();
-
-
- /**
- * 開始スクリプトを取得する。
- * @return 開始スクリプト
- */
- public String getBeginScript() {
- return beginScript;
- }
-
- /**
- * コネクションのリストを取得する。
- * @return コネクションのリスト
- */
- public List<AbstractSerializeConnectionModel> getConnections() {
- return connections;
- }
-
- /**
- * 説明文を取得する。
- * @return 説明文
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * ダイアグラム表現（レイアウト等）のリストを取得する。
- * @return ダイアグラム表現（レイアウト等）のリスト
- */
- public List<SerializeDiagramPresentationModel> getDiagramPresentations() {
- return diagramPresentations;
- }
-
- /**
- * Dialectクラス名を取得する。
- * @return Dialectクラス名
- */
- public String getDialectClassName() {
- return dialectClassName;
- }
-
- /**
- * ドメインのリストを取得する。
- * @return ドメインのリスト
- */
- public List<SerializeDomainModel> getDomains() {
- return domains;
- }
-
- /**
- * 終了スクリプトを取得する。
- * @return 終了スクリプト
- */
- public String getEndScript() {
- return endScript;
- }
-
- /**
- * INSERTデータセット
- * @return INSERTデータセット
- */
- public List<SerializeInsertDataSetModel> getInsertDataSet() {
- return insertDataSet;
- }
-
- /**
- * ノードのリストを取得する。
- * @return ノードのリスト
- */
- public List<AbstractSerializeNodeModel> getNodes() {
- return nodes;
- }
-
- /**
- * スキーマ名を取得する。
- * @return スキーマ名
- */
- public String getSchemaName() {
- return schemaName;
- }
-
- /**
- * 開始スクリプトを設定する。
- * @param beginScript 開始スクリプト
- */
- public void setBeginScript(String beginScript) {
- this.beginScript = beginScript;
- }
-
- /**
- * コネクションのリストを設定する。
- * @param connections コネクションのリスト
- */
- public void setConnections(List<AbstractSerializeConnectionModel> connections) {
- this.connections = connections;
- }
-
- /**
- * 説明文を設定する。
- * @param description 説明文
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * ダイアグラム表現（レイアウト等）のリスト
- * @param diagramPresentations ダイアグラム表現（レイアウト等）のリスト
- */
- public void setDiagramPresentations(List<SerializeDiagramPresentationModel> diagramPresentations) {
- this.diagramPresentations = diagramPresentations;
- }
-
- /**
- * Dialectクラス名を設定する。
- * @param dialectClassName Dialectクラス名
- */
- public void setDialectClassName(String dialectClassName) {
- this.dialectClassName = dialectClassName;
- }
-
- /**
- * ドメインのリストを設定する。
- * @param domains ドメインのリスト
- */
- public void setDomains(List<SerializeDomainModel> domains) {
- this.domains = domains;
- }
-
- /**
- * 終了スクリプトを設定する。
- * @param endScript 終了スクリプト
- */
- public void setEndScript(String endScript) {
- this.endScript = endScript;
- }
-
- /**
- * INSERTデータセット
- * @param insertDataSet INSERTデータセット
- */
- public void setInsertDataSet(List<SerializeInsertDataSetModel> insertDataSet) {
- this.insertDataSet = insertDataSet;
- }
-
- /**
- * ノードのリストを設定する。
- * @param nodes ノードのリスト
- */
- public void setNodes(List<AbstractSerializeNodeModel> nodes) {
- this.nodes = nodes;
- }
-
- /**
- * スキーマ名を設定する。
- * @param schemaName スキーマ名
- */
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
- }
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeEntityModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,126 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/21
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.node;
-
-import org.jiemamy.spec.model.node.AbstractEntityModel;
-
-/**
- * {@link AbstractEntityModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ SuppressWarnings("serial")
-public abstract class AbstractSerializeEntityModel extends AbstractSerializeNodeModel {
-
- /** 名前 */
- private String name;
-
- /** 論理名 */
- private String logicalName;
-
- /** 開始スクリプト */
- private String beginScript;
-
- /** 終了スクリプト */
- private String endScript;
-
- /** 説明文 */
- private String description;
-
-
- /**
- * 開始スクリプトを取得する。
- * @return 開始スクリプト
- */
- public String getBeginScript() {
- return beginScript;
- }
-
- /**
- * 説明文を取得する。
- * @return 説明文
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * 終了スクリプトを取得する。
- * @return 終了スクリプト
- */
- public String getEndScript() {
- return endScript;
- }
-
- /**
- * 論理名を取得する。
- * @return 論理名
- */
- public String getLogicalName() {
- return logicalName;
- }
-
- /**
- * 名前を取得する。
- * @return 名前
- */
- public String getName() {
- return name;
- }
-
- /**
- * 開始スクリプトを設定する。
- * @param beginScript 開始スクリプト
- */
- public void setBeginScript(String beginScript) {
- this.beginScript = beginScript;
- }
-
- /**
- * 説明文を設定する。
- * @param description 説明文
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * 終了スクリプトを設定する。
- * @param endScript 終了スクリプト
- */
- public void setEndScript(String endScript) {
- this.endScript = endScript;
- }
-
- /**
- * 論理名を設定する。
- * @param logicalName 論理名
- */
- public void setLogicalName(String logicalName) {
- this.logicalName = logicalName;
- }
-
- /**
- * 名前を設定する。
- * @param name 名前
- */
- public void setName(String name) {
- this.name = name;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/AbstractSerializeNodeModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,75 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/21
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.node;
-
-import java.util.List;
-
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.serializer.model.AbstractSerializeModel;
-import org.jiemamy.spec.model.connection.AbstractConnectionModel;
-
-/**
- * AbstractNodeModelに対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ SuppressWarnings("serial")
-public abstract class AbstractSerializeNodeModel extends AbstractSerializeModel {
-
- /** このモデルを接続先とする関係のリスト */
- private List<AbstractConnectionModel> sourceConnections = CollectionsUtil.newArrayList();
-
- /** このモデルを接続元とする関係のリスト */
- private List<AbstractConnectionModel> targetConnections = CollectionsUtil.newArrayList();
-
-
- /**
- * このモデルを接続先とする関係のリストを取得する。
- * @return このモデルを接続先とする関係のリスト
- */
- public Iterable<AbstractConnectionModel> getSourceConnections() {
- return sourceConnections;
- }
-
- /**
- * このモデルを接続元とする関係のリストを取得する。
- * @return このモデルを接続元とする関係のリスト
- */
- public Iterable<AbstractConnectionModel> getTargetConnections() {
- return targetConnections;
- }
-
- /**
- * このモデルを接続先とする関係のリストを
- * @param sourceConnections このモデルを接続先とする関係のリスト
- */
- public void setSourceConnections(List<AbstractConnectionModel> sourceConnections) {
- this.sourceConnections = sourceConnections;
- }
-
- /**
- * このモデルを接続元とする関係のリストを設定する。
- * @param targetConnections このモデルを接続元とする関係のリスト
- */
- public void setTargetConnections(List<AbstractConnectionModel> targetConnections) {
- this.targetConnections = targetConnections;
- }
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeIndexModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,35 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/21
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.node;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.jiemamy.serializer.model.AbstractSerializeModel;
-import org.jiemamy.spec.model.index.IndexModel;
-
-/**
- * {@link IndexModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("indexModel")
- ＠ SuppressWarnings("serial")
-public class SerializeIndexModel extends AbstractSerializeModel {
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeStickyModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeStickyModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeStickyModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/21
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.node;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.jiemamy.spec.model.node.StickyModel;
-
-/**
- * {@link StickyModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("stickyModel")
- ＠ SuppressWarnings("serial")
-public class SerializeStickyModel extends AbstractSerializeNodeModel {
-
- /** 内容文 */
- private String contents;
-
-
- /**
- * 内容文を取得する。
- * @return 内容文
- */
- public String getContents() {
- return contents;
- }
-
- /**
- * 内容文を設定する。
- * @param contents 内容文
- */
- public void setContents(String contents) {
- this.contents = contents;
- }
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeTableModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeTableModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeTableModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,98 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/21
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.node;
-
-import java.util.List;
-
-import javax.swing.table.TableModel;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.serializer.model.typedef.SerializeColumnModel;
-import org.jiemamy.serializer.model.typedef.constraint.SerializeCheckConstraintModel;
-
-/**
- * {@link TableModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("tableModel")
- ＠ SuppressWarnings("serial")
-public class SerializeTableModel extends AbstractSerializeEntityModel {
-
- /** カラムのリスト */
- private List<SerializeColumnModel> columns = CollectionsUtil.newArrayList();
-
- /** インデックスのリスト */
- private List<SerializeIndexModel> indexes = CollectionsUtil.newArrayList();
-
- /** テーブルCHECK制約のリスト */
- private List<SerializeCheckConstraintModel> checks = CollectionsUtil.newArrayList();
-
-
- /**
- * テーブルCHECK制約のリストを取得する。
- * @return テーブルCHECK制約のリスト
- */
- public List<SerializeCheckConstraintModel> getChecks() {
- return checks;
- }
-
- /**
- * カラムのリストを取得する。
- * @return カラムのリスト
- */
- public List<SerializeColumnModel> getColumns() {
- return columns;
- }
-
- /**
- * インデックスのリストを取得する。
- * @return インデックスのリスト
- */
- public List<SerializeIndexModel> getIndexes() {
- return indexes;
- }
-
- /**
- * テーブルCHECK制約のリストを設定する。
- * @param checks テーブルCHECK制約のリスト
- */
- public void setChecks(List<SerializeCheckConstraintModel> checks) {
- this.checks = checks;
- }
-
- /**
- * カラムのリストを設定する。
- * @param columns カラムのリスト
- */
- public void setColumns(List<SerializeColumnModel> columns) {
- this.columns = columns;
- }
-
- /**
- * インデックスのリストを設定する。
- * @param indexes インデックスのリスト
- */
- public void setIndexes(List<SerializeIndexModel> indexes) {
- this.indexes = indexes;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeViewModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeViewModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/node/SerializeViewModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/04
- *
- * 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.model.node;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.jiemamy.spec.model.node.ViewModel;
-
-/**
- * {@link ViewModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("viewModel")
- ＠ SuppressWarnings("serial")
-public class SerializeViewModel extends AbstractSerializeEntityModel {
-
- /** VIEW定義SELECT文 */
- private String definition;
-
-
- /**
- * VIEW定義SELECT文を取得する。
- * @return VIEW定義SELECT文
- */
- public String getDefinition() {
- return definition;
- }
-
- /**
- * VIEW定義SELECT文を設定する。
- * @param definition VIEW定義SELECT文
- */
- public void setDefinition(String definition) {
- this.definition = definition;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,2 +0,0 @@
-package org.jiemamy.serializer.model;
-
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeColumnModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeColumnModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.jiemamy.spec.model.ColumnModel;
-
-/**
- * {@link ColumnModel}に対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("columnModel")
- ＠ SuppressWarnings("serial")
-public class SerializeColumnModel extends SerializeTypeDefModel {
-
- /** 代表カラムかどうか */
- private boolean representation;
-
-
- /**
- * 代表カラムかどうかを取得する。
- * @return 代表カラムかどうか
- */
- public boolean isRepresentation() {
- return representation;
- }
-
- /**
- * 代表カラムかどうかを設定する。
- * @param representation 代表カラムかどうか
- */
- public void setRepresentation(boolean representation) {
- this.representation = representation;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeDomainModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,79 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import java.util.List;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-import org.jiemamy.spec.Processor;
-import org.jiemamy.spec.model.JiemamyModel;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * DomainModelに対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("domainModel")
- ＠ SuppressWarnings("serial")
-public class SerializeDomainModel extends SerializeTypeDefModel implements DataType {
-
- /**
- * {@inheritDoc}
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public <T>T getAdapter(Class<T> adapter) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Object> getAdapters() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasAdapter(Class<?> adapter) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unused")
- public <R, T extends JiemamyModel, E extends Exception>R process(Processor<T, R, E> processor) throws E {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeInheritanceColumnModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeInheritanceColumnModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeInheritanceColumnModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-/**
- * InheritanceColumnModelに対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ XStreamAlias("inheritanceColumnModel")
- ＠ SuppressWarnings("serial")
-public class SerializeInheritanceColumnModel extends SerializeColumnModel {
-
- /** 基底カラム */
- private SerializeColumnModel superColumn;
-
-
- /**
- * 基底カラムを取得する。
- * @return 基底カラム
- */
- public SerializeColumnModel getSuperColumn() {
- return superColumn;
- }
-
- /**
- * 基底カラムを設定する。
- * @param superColumn 基底カラム
- */
- public void setSuperColumn(SerializeColumnModel superColumn) {
- this.superColumn = superColumn;
- }
-}
Deleted: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java 2008-11-05 09:55:34 UTC (rev 2082)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/typedef/SerializeTypeDefModel.java 2008-11-05 10:12:32 UTC (rev 2083)
@@ -1,208 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/19
- *
- * This file is part of Jiemamy-core.
- *
- * 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.model.typedef;
-
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-import org.jiemamy.serializer.model.AbstractSerializeModel;
-import org.jiemamy.serializer.model.typedef.constraint.SerializeConstraintsModel;
-import org.jiemamy.spec.model.datatype.DataType;
-
-/**
- * TypeDefModelに対応するシリアライズ用のモデル。
- *
- * @author j5ik2o
- */
- ＠ SuppressWarnings("serial")
-public class SerializeTypeDefModel extends AbstractSerializeModel {
-
- /** 物理名 */
- @XStreamAsAttribute
- private String name;
-
- /** 論理名 */
- @XStreamAsAttribute
- private String logicalName;
-
- /** 型 */
- private DataType dataType;
-
- /** 型オプション文字列 */
- private String size;
-
- /** デフォルト値 */
- private String defaultValue;
-
- /** 制約 */
- private SerializeConstraintsModel constraints = new SerializeConstraintsModel();
-
- /** 単純インデックスの有無 */
- private boolean simpleIndex;
-
- /** 自由文字列 */
- private String freeString;
-
- /** 説明文 */
- private String description;
-
-
- /**
- * 制約を取得する。
- * @return 制約
- */
- public SerializeConstraintsModel getConstraints() {
- return constraints;
- }
-
- /**
- * 型を取得する。
- * @return 型
- */
- public DataType getDataType() {
- return dataType;
- }
-
- /**
- * デフォルト値を取得する。
- * @return デフォルト値
- */
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * 説明文を取得する。
- * @return 説明文
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * 自由文字列を取得する。
- * @return 自由文字列
- */
- public String getFreeString() {
- return freeString;
- }
-
- /**
- * 論理名を取得する。
- * @return 論理名
- */
- public String getLogicalName() {
- return logicalName;
- }
-
- /**
- * 物理名を取得する。
- * @return 物理名
- */
- public String getName() {
- return name;
- }
-
- /**
- * 型オプション文字列を取得する。
- * @return 型オプション文字列
- */
- public String getSize() {
- return size;
- }
-
- /**
- * 単純インデックスの有無を取得する。
- * @return 単純インデックスの有無
- */
- public boolean isSimpleIndex() {
- return simpleIndex;
- }
-
- /**
- * 制約を設定する。
- * @param constraints 制約
- */
- public void setConstraints(SerializeConstraintsModel constraints) {
- this.constraints = constraints;
- }
-
- /**
- * 型を設定する。
- * @param dataType 型
- */
- public void setDataType(DataType dataType) {
- this.dataType = dataType;
- }
-
- /**
- * デフォルト値を設定する。
- * @param defaultValue デフォルト値
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * 説明文を設定する。
- * @param description 説明文
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * 自由文字列を設定する。
- * @param freeString 自由文字列
- */
- public void setFreeString(String freeString) {
- this.freeString = freeString;
- }
-
- /**
- * 論理名を設定する。
- * @param logicalName 論理名
- */
- public void setLogicalName(String logicalName) {
- this.logicalName = logicalName;
- }
-
- /**
- * 物理名を設定する。
- * @param name 物理名
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * 単純インデックスの有無を設定する。
- * @param simpleIndex 単純インデックスの有無
- */
- public void setSimpleIndex(boolean simpleIndex) {
- this.simpleIndex = simpleIndex;
- }
-
- /**
- * 型オプション文字列を設定する。
- * @param size 型オプション文字列
- */
- public void setSize(String size) {
- this.size = size;
- }
-}