svnno****@sourc*****
svnno****@sourc*****
2009年 2月 8日 (日) 23:14:33 JST
Revision: 2634
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2634
Author: daisuke_m
Date: 2009-02-08 23:14:33 +0900 (Sun, 08 Feb 2009)
Log Message:
-----------
不要なメソッドを削除。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java 2009-02-08 12:55:29 UTC (rev 2633)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java 2009-02-08 14:14:33 UTC (rev 2634)
@@ -258,18 +258,6 @@
tableModel.getAttributes().add(checkModel);
}
- private void parseCheckConstraints(Element tableElement, TableModel tableModel) {
- NodeList checkNodeList = XpathUtil.getNodes(tableElement, "core:attributes/core:check");
- Iterable<Node> checkIterableNodeList = new IterableNodeList(checkNodeList);
- for (Node checkNode : checkIterableNodeList) {
- if ((checkNode instanceof Element) == false) {
- logger.warn("unexpected node: " + checkNode.getNodeType());
- continue;
- }
- parseCheckConstraint((Element) checkNode, tableModel);
- }
- }
-
private void parseColumn(Element columnElement, TableModel tableModel) {
ColumnModel columnModel = factory.newModel(ColumnModel.class, DomUtil.getUUID(columnElement, CoreQName.ID));
columnModel.setName(XpathUtil.getText(columnElement, "core:name/text()"));
@@ -282,17 +270,6 @@
tableModel.getAttributes().add(columnModel);
}
- private void parseColumns(Element tableElement, TableModel tableModel) {
- NodeList columnNodeList = XpathUtil.getNodes(tableElement, "core:attributes/core:column");
- Iterable<Node> columnIterableNodeList = new IterableNodeList(columnNodeList);
- for (Node columnNode : columnIterableNodeList) {
- if ((columnNode instanceof Element) == false) {
- continue;
- }
- parseColumn((Element) columnNode, tableModel);
- }
- }
-
private void parseDataSetSection(RootModel rootModel) {
NodeList dataSetNodeList = XpathUtil.getNodes(document, "/core:rootModel/core:dataSets/core:dataSet");
Iterable<Node> dataSetIterableNodeList = new IterableNodeList(dataSetNodeList);
@@ -460,17 +437,6 @@
tableModel.getAttributes().add(fkModel);
}
- private void parseForeignKeys(Element tableElement, TableModel tableModel) {
- NodeList fkNodeList = XpathUtil.getNodes(tableElement, "core:attributes/core:foreignKey");
- Iterable<Node> fkIterableNodeList = new IterableNodeList(fkNodeList);
- for (Node fkNode : fkIterableNodeList) {
- if ((fkNode instanceof Element) == false) {
- continue;
- }
- parseForeignKey((Element) fkNode, tableModel);
- }
- }
-
private void parseNotNullConstraint(Element nnElement, TableModel tableModel) {
NotNullConstraintModel nnModel =
factory.newModel(NotNullConstraintModel.class, DomUtil.getUUID(nnElement, CoreQName.ID));
@@ -484,17 +450,6 @@
tableModel.getAttributes().add(nnModel);
}
- private void parseNotNullConstraints(Element tableElement, TableModel tableModel) {
- NodeList nnNodeList = XpathUtil.getNodes(tableElement, "core:attributes/core:notNull");
- Iterable<Node> nnIterableNodeList = new IterableNodeList(nnNodeList);
- for (Node nnNode : nnIterableNodeList) {
- if ((nnNode instanceof Element) == false) {
- continue;
- }
- parseNotNullConstraint((Element) nnNode, tableModel);
- }
- }
-
private void parsePrimaryKey(Element pkElement, TableModel tableModel) {
PrimaryKeyModel pkModel = factory.newModel(PrimaryKeyModel.class, DomUtil.getUUID(pkElement, CoreQName.ID));
pkModel.setName(XpathUtil.getTextContent(pkElement, "core:name"));
@@ -512,18 +467,6 @@
tableModel.getAttributes().add(pkModel);
}
- private void parsePrimaryKeys(Element tableElement, TableModel tableModel) {
- NodeList pkNodeList = XpathUtil.getNodes(tableElement, "core:attributes/core:primaryKey");
- Iterable<Node> pkIterableNodeList = new IterableNodeList(pkNodeList);
- for (Node pkNode : pkIterableNodeList) {
- if ((pkNode instanceof Element) == false) {
- logger.warn("unexpected node: " + pkNode.getNodeType());
- continue;
- }
- parsePrimaryKey((Element) pkNode, tableModel);
- }
- }
-
private RootModel parseRoot() {
Element rootElement = document.getDocumentElement();
@@ -575,17 +518,6 @@
tableModel.getAttributes().add(ukModel);
}
- private void parseUniqueKeys(Element tableElement, TableModel tableModel) {
- NodeList ukNodeList = XpathUtil.getNodes(tableElement, "core:attributes/uniqueKey");
- Iterable<Node> ukIterableNodeList = new IterableNodeList(ukNodeList);
- for (Node ukNode : ukIterableNodeList) {
- if ((ukNode instanceof Element) == false) {
- continue;
- }
- parseUniqueKey((Element) ukNode, tableModel);
- }
- }
-
private ViewModel parseView(Element viewElement) {
ViewModel viewModel = factory.newModel(ViewModel.class, DomUtil.getUUID(viewElement, CoreQName.ID));
viewModel.setName(XpathUtil.getText(viewElement, "core:name/text()"));