[Jiemamy-notify:1556] commit [2764] EDIT, GEF, XMLの3コマンドを区別するよう、javadocを修正。 / refactor

svnno****@sourc***** svnno****@sourc*****
2009年 3月 2日 (月) 00:32:52 JST

• 前の記事 [Jiemamy-notify:1555] commit [2763] dataSets要素下に、1つ以上のdataSet要素を要求していたので、0でも許可するように変更。
• 次の記事 [Jiemamy-notify:1557] commit [2765] InvocationTargetExceptionの時は原因がわかりにくいので、printStackTrace () しておく。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 2764
          http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2764
Author:   daisuke_m
Date:     2009-03-02 00:32:52 +0900 (Mon, 02 Mar 2009)

Log Message:
-----------
EDIT, GEF, XMLの3コマンドを区別するよう、javadocを修正。 / refactor

Modified Paths:
--------------
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CloseCommandImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/NullCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/OpenCommandImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/package-info.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java
    artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java
    artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamTest.java
    artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamTest.java
    artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java
    artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java
    artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java
    artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java
    artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/Messages.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/package-info.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
    zeus/trunk/jiemamy-spec-diff/src/main/java/org/jiemamy/diff/Diff.java

Added Paths:
-----------
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommandException.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/XmlCommandContext.java

Removed Paths:
-------------
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java
    zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java


-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/EventBrokerImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -33,7 +33,7 @@
 import org.jiemamy.utils.LogMarker;
 
 /**
- * コマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
+ * EDITコマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
  * 
  * <p>{@link Command}が実行されたタイミングで、{@link #listeners}として保持している{@link CommandListener}の中で,
  * {@link Command#getTarget()}を監視する必要があるものにイベントを通知する。</p>

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CloseCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CloseCommandImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CloseCommandImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,7 +19,7 @@
 package org.jiemamy.command;
 
 /**
- * モデルに対する操作終了を表すコマンド。
+ * モデルに対する操作終了を表すXMLコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/CommandContextImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -22,54 +22,54 @@
 import org.jiemamy.utils.EssentialStack;
 
 /**
- * コマンド実行のコンテキスト（履歴というか状況というか）を保持するクラス。
+ * XMLコマンド実行のコンテキスト（履歴というか状況というか）を保持するクラス。
  * 
  * @author daisuke
  */
-public class CommandContextImpl implements CommandContext {
+public class CommandContextImpl implements XmlCommandContext {
 	
-	private EssentialStack<JiemamyCommand> commandStack = new ArrayEssentialStack<JiemamyCommand>();
+	private EssentialStack<JiemamyXmlCommand> commandStack = new ArrayEssentialStack<JiemamyXmlCommand>();
 	
 
-	public void begin(OpenCommand command) throws JiemamyCommandException {
+	public void begin(OpenCommand command) throws JiemamyXmlCommandException {
 		if (isOpen()) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		commandStack.push(command);
 		assert isOpen();
 	}
 	
-	public void begin(StartElementCommand command) throws JiemamyCommandException {
+	public void begin(StartElementCommand command) throws JiemamyXmlCommandException {
 		if (isOpen() == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		commandStack.push(command);
 		assert isOpen();
 	}
 	
-	public void end(CloseCommand command) throws JiemamyCommandException {
+	public void end(CloseCommand command) throws JiemamyXmlCommandException {
 		if (isOpen() == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
-		JiemamyCommand pop = commandStack.pop();
+		JiemamyXmlCommand pop = commandStack.pop();
 		if (pop instanceof OpenCommand == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		
 		assert isOpen() == false;
 	}
 	
-	public StartElementCommand end(EndElementCommand command) throws JiemamyCommandException {
+	public StartElementCommand end(EndElementCommand command) throws JiemamyXmlCommandException {
 		if (isOpen() == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
-		JiemamyCommand pop = commandStack.pop();
+		JiemamyXmlCommand pop = commandStack.pop();
 		if (pop instanceof StartElementCommand == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		StartElementCommand start = (StartElementCommand) pop;
 		if (start.getQName().equals(command.getQName()) == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		
 		assert isOpen();
@@ -81,9 +81,9 @@
 		return commandStack.isEmpty() == false;
 	}
 	
-	public DataCommand popData() throws JiemamyCommandException {
+	public DataCommand popData() throws JiemamyXmlCommandException {
 		if (isOpen() == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		DataCommand dataCommand;
 		if (commandStack.peek() instanceof DataCommand) {
@@ -91,7 +91,7 @@
 		} else if (commandStack.peek() instanceof StartElementCommand) {
 			return new DataCommandImpl(null);
 		} else {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		
 		assert isOpen();
@@ -99,9 +99,9 @@
 		return dataCommand;
 	}
 	
-	public void pushData(DataCommand command) throws JiemamyCommandException {
+	public void pushData(DataCommand command) throws JiemamyXmlCommandException {
 		if (isOpen() == false) {
-			throw new JiemamyCommandException();
+			throw new JiemamyXmlCommandException();
 		}
 		commandStack.push(command);
 		assert isOpen();

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/DataCommandImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,7 +19,7 @@
 package org.jiemamy.command;
 
 /**
- * モデルの実データを表すコマンド。
+ * モデルの実データを表すXMLコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/EndElementCommandImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -23,7 +23,7 @@
 import org.jiemamy.xml.JiemamyQName;
 
 /**
- * モデルの要素データ定義の終了を表すコマンド。
+ * モデルの要素データ定義の終了を表すXMLコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/NullCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/NullCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/NullCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,10 +19,10 @@
 package org.jiemamy.command;
 
 /**
- * 何もしないダミーコマンド。
+ * 何もしないダミーXMLコマンド。
  * 
  * @author daisuke
  */
-public class NullCommand implements JiemamyCommand {
+public class NullCommand implements JiemamyXmlCommand {
 	
 }

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/ObjectCommandDestination.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -32,9 +32,9 @@
  */
 public class ObjectCommandDestination implements CommandDestination {
 	
-	private CommandContext ctx = new CommandContextImpl();
+	private XmlCommandContext ctx = new CommandContextImpl();
 	
-	/** {@link JiemamyCommand}を適用した{@link RootModel} */
+	/** {@link JiemamyXmlCommand}を適用した{@link RootModel} */
 	private RootModel rootModel;
 	
 	private Jiemamy jiemamy;
@@ -59,7 +59,7 @@
 		this.rootModel = rootModel;
 	}
 	
-	public void apply(JiemamyCommand command) throws JiemamyCommandException {
+	public void apply(JiemamyXmlCommand command) throws JiemamyXmlCommandException {
 		if (command instanceof OpenCommand) {
 			OpenCommand openCommand = (OpenCommand) command;
 			ctx.begin(openCommand);
@@ -93,10 +93,10 @@
 	}
 	
 	/**
-	 * {@link JiemamyCommand}を適用した{@link RootModel}を取得する。
+	 * {@link JiemamyXmlCommand}を適用した{@link RootModel}を取得する。
 	 * 
-	 * @return {@link JiemamyCommand}を適用した{@link RootModel}
-	 * @throws IllegalStateException コマンドがOpenされた後、まだCloseされていない場合。
+	 * @return {@link JiemamyXmlCommand}を適用した{@link RootModel}
+	 * @throws IllegalStateException XMLコマンドがOpenされた後、まだCloseされていない場合。
 	 */
 	public RootModel getRootModel() {
 		if (ctx.isOpen()) {

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/OpenCommandImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/OpenCommandImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/OpenCommandImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,7 +19,7 @@
 package org.jiemamy.command;
 
 /**
- * モデルに対する操作開始を表すコマンド。
+ * モデルに対する操作開始を表すXMLコマンド。
  * 
  * @author daisuke
  */

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-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StartElementCommandImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -28,7 +28,7 @@
 import org.jiemamy.xml.JiemamyQName;
 
 /**
- * モデルの要素データ定義の開始を表すコマンド。
+ * モデルの要素データ定義の開始を表すXMLコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandDestination.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -54,12 +54,12 @@
 		this.xmlWriter = xmlWriter;
 	}
 	
-	public void apply(JiemamyCommand command) throws JiemamyCommandException {
+	public void apply(JiemamyXmlCommand command) throws JiemamyXmlCommandException {
 		if (command instanceof OpenCommand) {
 			try {
 				xmlWriter.add(EVENT_FACTORY.createStartDocument(CharEncoding.UTF_8, "1.0", false));
 			} catch (XMLStreamException e) {
-				throw new JiemamyCommandException(e);
+				throw new JiemamyXmlCommandException(e);
 			}
 		} else if (command instanceof StartElementCommand) {
 			StartElementCommand startCommand = (StartElementCommand) command;
@@ -67,7 +67,7 @@
 				Iterator<Attribute> attributes = new AttributeIterator(startCommand.getAttributes());
 				xmlWriter.add(EVENT_FACTORY.createStartElement(startCommand.getQName(), attributes, null));
 			} catch (XMLStreamException e) {
-				throw new JiemamyCommandException(e);
+				throw new JiemamyXmlCommandException(e);
 			}
 		} else if (command instanceof DataCommand) {
 			DataCommand dataCommand = (DataCommand) command;
@@ -77,7 +77,7 @@
 				try {
 					xmlWriter.add(characters);
 				} catch (XMLStreamException e) {
-					throw new JiemamyCommandException(e);
+					throw new JiemamyXmlCommandException(e);
 				}
 			}
 		} else if (command instanceof EndElementCommand) {
@@ -85,13 +85,13 @@
 			try {
 				xmlWriter.add(EVENT_FACTORY.createEndElement(endCommand.getQName(), null));
 			} catch (XMLStreamException e) {
-				throw new JiemamyCommandException(e);
+				throw new JiemamyXmlCommandException(e);
 			}
 		} else if (command instanceof CloseCommand) {
 			try {
 				xmlWriter.add(EVENT_FACTORY.createEndDocument());
 			} catch (XMLStreamException e) {
-				throw new JiemamyCommandException(e);
+				throw new JiemamyXmlCommandException(e);
 			}
 		}
 	}

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-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/StaxCommandSource.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -34,7 +34,7 @@
 import org.jiemamy.utils.StaxUtil;
 
 /**
- * コマンドを生成するファクトリクラス。
+ * XMLコマンドを生成するファクトリクラス。
  * 
  * @author daisuke
  */
@@ -54,7 +54,7 @@
 		this.xmlEvent = xmlEvent;
 	}
 	
-	public JiemamyCommand getCommand() {
+	public JiemamyXmlCommand getCommand() {
 		logger.info("Type: " + StaxUtil.toEventTypeEnum(xmlEvent.getEventType()).toString());
 		
 		switch (xmlEvent.getEventType()) {

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/package-info.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/package-info.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/command/package-info.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -1,7 +1,7 @@
 /**
- * Jiemamyコマンドの実装を提供するパッケージ。
+ * Jiemamy XMLコマンドの実装を提供するパッケージ。
  * 
- * <p>このパッケージは、同パッケージで定義されたJiemamyコマンド仕様のリファレンス実装を含む。</p>
+ * <p>このパッケージは、同パッケージで定義されたJiemamy XMLコマンド仕様のリファレンス実装を含む。</p>
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/CommandProcessorImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -88,7 +88,7 @@
 	}
 	
 	/**
-	 * {@link ColumnModel}を{@link TableModel}に追加するコマンドを実行する。
+	 * {@link ColumnModel}を{@link TableModel}に追加するEDITコマンドを実行する。
 	 * 
 	 * @param newColumnCommand
 	 */
@@ -102,7 +102,7 @@
 	}
 	
 	/**
-	 * {@link ColumnRef}のリストに{@link ColumnModel}を追加するコマンドを実行する。
+	 * {@link ColumnRef}のリストに{@link ColumnModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -115,7 +115,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}に{@link DataSetModel}を追加するコマンドを実行する。
+	 * {@link RootModel}に{@link DataSetModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -124,7 +124,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}に{@link DomainModel}を追加するコマンドを実行する。
+	 * {@link RootModel}に{@link DomainModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -133,7 +133,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}に{@link EntityModel}を追加するコマンドを実行する。
+	 * {@link RootModel}に{@link EntityModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -142,7 +142,7 @@
 	}
 	
 	/**
-	 * {@link TableModel}に{@link ForeignKeyModel}を追加するコマンドを実行する。
+	 * {@link TableModel}に{@link ForeignKeyModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param newForeignKeyCommand
 	 */
@@ -156,7 +156,7 @@
 	}
 	
 	/**
-	 * {@link TableModel}に{@link PrimaryKeyModel}を追加するコマンドを実行する。
+	 * {@link TableModel}に{@link PrimaryKeyModel}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param newPrimaryKeyCommand
 	 */
@@ -189,7 +189,7 @@
 	}
 	
 	/**
-	 * {@link TableModel}から{@link ColumnModel}を削除するコマンドを実行する。
+	 * {@link TableModel}から{@link ColumnModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param deleteColumnCommand
 	 */
@@ -203,7 +203,7 @@
 	}
 	
 	/**
-	 * {@link ColumnRef}のリストから{@link ColumnModel}を削除するコマンドを実行する。
+	 * {@link ColumnRef}のリストから{@link ColumnModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -216,7 +216,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}から{@link DataSetModel}を削除するコマンドを実行する。
+	 * {@link RootModel}から{@link DataSetModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -225,7 +225,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}から{@link DomainModel}を削除するコマンドを実行する。
+	 * {@link RootModel}から{@link DomainModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -234,7 +234,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}から{@link EntityModel}を削除するコマンドを実行する。
+	 * {@link RootModel}から{@link EntityModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param command
 	 */
@@ -243,7 +243,7 @@
 	}
 	
 	/**
-	 * {@link TableModel}から{@link ForeignKeyModel}を削除するコマンドを実行する。
+	 * {@link TableModel}から{@link ForeignKeyModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param deleteForeignKeyCommand
 	 */
@@ -257,7 +257,7 @@
 	}
 	
 	/**
-	 * {@link TableModel}から{@link PrimaryKeyModel}を削除するコマンドを実行する。
+	 * {@link TableModel}から{@link PrimaryKeyModel}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param deletePrimaryKeyCommand
 	 */
@@ -271,7 +271,7 @@
 	}
 	
 	/**
-	 * モデルの属性を変更するコマンドを実行します。
+	 * モデルの属性を変更するEDITコマンドを実行します。
 	 * 
 	 * @param command
 	 */
@@ -297,7 +297,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}に{@link JiemamyElement}を追加するコマンドを実行する。
+	 * {@link RootModel}に{@link JiemamyElement}を追加するEDITコマンドを実行する。
 	 * 
 	 * @param <T> 
 	 * @param command
@@ -311,7 +311,7 @@
 	}
 	
 	/**
-	 * {@link RootModel}から{@link JiemamyElement}を削除するコマンドを実行する。
+	 * {@link RootModel}から{@link JiemamyElement}を削除するEDITコマンドを実行する。
 	 * 
 	 * @param <T> 
 	 * @param command

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractAddToRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.RootModel;
 
 /**
- * {@link RootModel}に{@link JiemamyElement}を追加するコマンドの抽象クラス。
+ * {@link RootModel}に{@link JiemamyElement}を追加するEDITコマンドの抽象クラス。
  * 
  * @param <T> 追加対象の要素の型
  * @see AbstractDeleteFromRootCommand

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AbstractDeleteFromRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.RootModel;
 
 /**
- * {@link RootModel}から{@link JiemamyElement}を削除するコマンドの抽象クラス。
+ * {@link RootModel}から{@link JiemamyElement}を削除するEDITコマンドの抽象クラス。
  * 
  * @param <T> 削除対象の要素
  * @see AbstractAddToRootCommand

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link ColumnModel}を{@link TableModel}に追加するコマンド。
+ * {@link ColumnModel}を{@link TableModel}に追加するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddColumnToColumnRefListCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.attribute.ColumnRef;
 
 /**
- * {@link ColumnRef}のリストに{@link ColumnModel}を追加するコマンド。
+ * {@link ColumnRef}のリストに{@link ColumnModel}を追加するEDITコマンド。
  * 
  * @author shin1ogawa
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDataSetToRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,7 +25,7 @@
 import org.jiemamy.model.dataset.DataSetModel;
 
 /**
- * {@link RootModel}に{@link DataSetModel}を追加するコマンド。
+ * {@link RootModel}に{@link DataSetModel}を追加するEDITコマンド。
  * 
  * @see DeleteDataSetFromRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddDomainToRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,7 +25,7 @@
 import org.jiemamy.model.datatype.DomainModel;
 
 /**
- * {@link RootModel}に{@link DomainModel}を追加するコマンド。
+ * {@link RootModel}に{@link DomainModel}を追加するEDITコマンド。
  * 
  * @see DeleteDomainFromRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddEntityToRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.entity.EntityModel;
 
 /**
- * {@link RootModel}に{@link AbstractEntityModel}を追加するコマンド。
+ * {@link RootModel}に{@link AbstractEntityModel}を追加するEDITコマンド。
  * 
  * @see DeleteEntityFromRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddForeignKeyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link TableModel}に{@link ForeignKeyModel}を追加するコマンド。
+ * {@link TableModel}に{@link ForeignKeyModel}を追加するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/AddPrimaryKeyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link TableModel}に{@link PrimaryKeyModel}を追加するコマンド。
+ * {@link TableModel}に{@link PrimaryKeyModel}を追加するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link TableModel}から{@link ColumnModel}を削除するコマンド。
+ * {@link TableModel}から{@link ColumnModel}を削除するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteColumnFromColumnRefListCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.attribute.ColumnRef;
 
 /**
- * {@link ColumnRef}のリストから{@link ColumnModel}を削除するコマンド。
+ * {@link ColumnRef}のリストから{@link ColumnModel}を削除するEDITコマンド。
  * 
  * @author shin1ogawa
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDataSetFromRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,7 +25,7 @@
 import org.jiemamy.model.dataset.DataSetModel;
 
 /**
- * {@link RootModel}から{@link DataSetModel}を削除するコマンド。
+ * {@link RootModel}から{@link DataSetModel}を削除するEDITコマンド。
  * 
  * @see AddDataSetToRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteDomainFromRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,7 +25,7 @@
 import org.jiemamy.model.datatype.DomainModel;
 
 /**
- * {@link RootModel}から{@link DomainModel}を削除するコマンド。
+ * {@link RootModel}から{@link DomainModel}を削除するEDITコマンド。
  * 
  * @see AddDomainToRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteEntityFromRootCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.entity.EntityModel;
 
 /**
- * {@link RootModel}から{@link JiemamyElement}を削除するコマンド。
+ * {@link RootModel}から{@link JiemamyElement}を削除するEDITコマンド。
  * 
  * @see AddEntityToRootCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeleteForeignKeyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link TableModel}から{@link ForeignKeyModel}を削除するコマンド。
+ * {@link TableModel}から{@link ForeignKeyModel}を削除するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/DeletePrimaryKeyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,7 +24,7 @@
 import org.jiemamy.model.entity.TableModel;
 
 /**
- * {@link TableModel}から{@link PrimaryKeyModel}を削除するコマンド。
+ * {@link TableModel}から{@link PrimaryKeyModel}を削除するEDITコマンド。
  * 
  * @author daisuke
  */

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/editcommand/impl/ModifyModelPropertyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -28,7 +28,7 @@
 import org.jiemamy.utils.model.JiemamyPropertyUtil;
 
 /**
- * モデルの属性を変更するコマンド。
+ * モデルの属性を変更するEDITコマンド。
  * 
  * @param <T> 
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/facade/JiemamyFacadeImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -45,10 +45,10 @@
 	protected final Jiemamy jiemamy;
 	
 	/** TODO for daisuke */
-	protected Stack<Command> undoStack = new Stack<Command>();
+	protected final Stack<Command> undoStack = new Stack<Command>();
 	
 	/** TODO for daisuke */
-	protected Stack<Command> redoStack = new Stack<Command>();
+	protected final Stack<Command> redoStack = new Stack<Command>();
 	
 	private final CommandProcessor commandProcessor;
 	
@@ -76,6 +76,12 @@
 		undoStack.push(command.getNegateCommand());
 	}
 	
+	/**
+	 * TODO for daisuke
+	 * 
+	 * @param table
+	 * @param foreignKey
+	 */
 	public void addForeignKey(TableModel table, ForeignKeyModel foreignKey) {
 		AddForeignKeyCommand command = new AddForeignKeyCommand(table, foreignKey);
 		command.execute(getCommandProcessor());
@@ -95,6 +101,11 @@
 		undoStack.push(command.getNegateCommand());
 	}
 	
+	/**
+	 * TODO for daisuke
+	 * 
+	 * @param entity
+	 */
 	public void removeEntity(EntityModel entity) {
 		DeleteEntityFromRootCommand command =
 				new DeleteEntityFromRootCommand(jiemamy.getFactory().getRootModel(), entity);
@@ -102,6 +113,12 @@
 		undoStack.push(command.getNegateCommand());
 	}
 	
+	/**
+	 * TODO for daisuke
+	 * 
+	 * @param table
+	 * @param foreignKey
+	 */
 	public void removeForeignKey(TableModel table, ForeignKeyModel foreignKey) {
 		DeleteForeignKeyCommand command = new DeleteForeignKeyCommand(table, foreignKey);
 		command.execute(getCommandProcessor());
@@ -123,7 +140,9 @@
 	
 	/**
 	 * Commandを処理するための{@link CommandProcessor}を返す。
+	 * 
 	 * <p>FacadeImplの拡張のためのCommandを処理するために、拡張されたCommandProcessorが必要になる場合があるため。</p>
+	 * 
 	 * @return the commandProcessor
 	 */
 	protected CommandProcessor getCommandProcessor() {

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/DialectCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -20,7 +20,7 @@
 
 import org.jiemamy.command.DataCommandImpl;
 import org.jiemamy.command.EndElementCommandImpl;
-import org.jiemamy.command.JiemamyCommand;
+import org.jiemamy.command.JiemamyXmlCommand;
 import org.jiemamy.command.StartElementCommandImpl;
 import org.jiemamy.utils.EssentialQueue;
 import org.jiemamy.utils.Resolvable;
@@ -28,11 +28,11 @@
 import org.jiemamy.xml.CoreQName;
 
 /**
- * {@link Resolvable}な状態のDialectを表すコマンド。
+ * {@link Resolvable}な状態のDialectを表すXMLコマンド。
  * 
  * @author daisuke
  */
-public class DialectCommand implements Resolvable<JiemamyCommand> {
+public class DialectCommand implements Resolvable<JiemamyXmlCommand> {
 	
 	private final String dialectId;
 	
@@ -46,8 +46,8 @@
 		this.dialectId = dialectId;
 	}
 	
-	public EssentialQueue<JiemamyCommand> resolve() {
-		EssentialQueue<JiemamyCommand> queue = new ResolvableQueue<JiemamyCommand>();
+	public EssentialQueue<JiemamyXmlCommand> resolve() {
+		EssentialQueue<JiemamyXmlCommand> queue = new ResolvableQueue<JiemamyXmlCommand>();
 		queue.enqueue(new StartElementCommandImpl(CoreQName.DIALECT));
 		queue.enqueue(new DataCommandImpl(dialectId));
 		queue.enqueue(new EndElementCommandImpl(CoreQName.DIALECT));

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/command/RootModelCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.apache.commons.lang.Validate;
 
 import org.jiemamy.command.EndElementCommandImpl;
-import org.jiemamy.command.JiemamyCommand;
+import org.jiemamy.command.JiemamyXmlCommand;
 import org.jiemamy.command.StartElementCommandImpl;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.utils.EssentialQueue;
@@ -35,11 +35,11 @@
 import org.jiemamy.xml.CoreQName;
 
 /**
- * {@link Resolvable}な状態の {@link RootModel}を表すコマンド。
+ * {@link Resolvable}な状態の {@link RootModel}を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public class RootModelCommand implements Resolvable<JiemamyCommand> {
+public class RootModelCommand implements Resolvable<JiemamyXmlCommand> {
 	
 	private final RootModel rootModel;
 	
@@ -55,11 +55,11 @@
 		this.rootModel = rootModel;
 	}
 	
-	public EssentialQueue<JiemamyCommand> resolve() {
+	public EssentialQueue<JiemamyXmlCommand> resolve() {
 		Map<QName, String> attributes = new HashMap<QName, String>();
 		attributes.put(CoreQName.ID.getQName(), rootModel.getId().toString());
 		
-		ResolvableQueue<JiemamyCommand> queue = new ResolvableQueue<JiemamyCommand>();
+		ResolvableQueue<JiemamyXmlCommand> queue = new ResolvableQueue<JiemamyXmlCommand>();
 		queue.enqueue(new StartElementCommandImpl(CoreQName.ROOT_MODEL, attributes));
 		queue.enqueue(new DialectCommand(rootModel.getDialectClassName()));
 		queue.enqueue(new EndElementCommandImpl(CoreQName.ROOT_MODEL));

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,7 +25,7 @@
 
 import org.jiemamy.command.CloseCommandImpl;
 import org.jiemamy.command.EndElementCommandImpl;
-import org.jiemamy.command.JiemamyCommand;
+import org.jiemamy.command.JiemamyXmlCommand;
 import org.jiemamy.command.JiemamyCommandInputStream;
 import org.jiemamy.command.OpenCommandImpl;
 import org.jiemamy.command.StartElementCommandImpl;
@@ -35,7 +35,7 @@
 import org.jiemamy.utils.ResolvableQueue;
 
 /**
- * {@link RootModel}の内容を{@link JiemamyCommand}として読み出す、Reader実装。
+ * {@link RootModel}の内容を{@link JiemamyXmlCommand}として読み出す、Reader実装。
  * 
  * <p>
  * </p>
@@ -72,7 +72,7 @@
 	
 	private RootModel rootModel;
 	
-	private ResolvableQueue<JiemamyCommand> queue = new ResolvableQueue<JiemamyCommand>();
+	private ResolvableQueue<JiemamyXmlCommand> queue = new ResolvableQueue<JiemamyXmlCommand>();
 	
 	private boolean closed;
 	
@@ -99,7 +99,7 @@
 		return queue.isEmpty() == false;
 	}
 	
-	public JiemamyCommand nextCommand() {
+	public JiemamyXmlCommand nextCommand() {
 		checkClosed();
 		checkNext();
 		

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,14 +19,14 @@
 package org.jiemamy.internal.serializer.stax;
 
 import org.jiemamy.Jiemamy;
-import org.jiemamy.command.JiemamyCommand;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommand;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.JiemamyCommandOutputStream;
 import org.jiemamy.command.ObjectCommandDestination;
 import org.jiemamy.model.RootModel;
 
 /**
- * {@link JiemamyCommand}の内容を{@link RootModel}に書き出す為の、Command stream実装クラス。
+ * {@link JiemamyXmlCommand}の内容を{@link RootModel}に書き出す為の、Command stream実装クラス。
  * 
  * @author daisuke
  */
@@ -66,7 +66,7 @@
 		return dest.getRootModel();
 	}
 	
-	public void write(JiemamyCommand command) throws JiemamyCommandException {
+	public void write(JiemamyXmlCommand command) throws JiemamyXmlCommandException {
 		checkClosed();
 		dest.apply(command);
 	}

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventReaderAdapter.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -25,8 +25,8 @@
 import org.apache.commons.lang.Validate;
 
 import org.jiemamy.command.CommandSource;
-import org.jiemamy.command.JiemamyCommand;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommand;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.JiemamyCommandInputStream;
 import org.jiemamy.command.StaxCommandSource;
 
@@ -51,11 +51,11 @@
 		this.xmlEventReader = xmlEventReader;
 	}
 	
-	public void close() throws JiemamyCommandException {
+	public void close() throws JiemamyXmlCommandException {
 		try {
 			xmlEventReader.close();
 		} catch (XMLStreamException e) {
-			throw new JiemamyCommandException(e);
+			throw new JiemamyXmlCommandException(e);
 		}
 	}
 	
@@ -63,13 +63,13 @@
 		return xmlEventReader.hasNext();
 	}
 	
-	public JiemamyCommand nextCommand() throws JiemamyCommandException {
+	public JiemamyXmlCommand nextCommand() throws JiemamyXmlCommandException {
 		try {
 			XMLEvent xmlEvent = xmlEventReader.nextEvent();
 			CommandSource source = new StaxCommandSource(xmlEvent);
 			return source.getCommand();
 		} catch (XMLStreamException e) {
-			throw new JiemamyCommandException(e);
+			throw new JiemamyXmlCommandException(e);
 		}
 	}
 }

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/serializer/stax/XmlEventWriterAdapter.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -24,8 +24,8 @@
 
 import org.apache.commons.lang.Validate;
 
-import org.jiemamy.command.JiemamyCommand;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommand;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.JiemamyCommandOutputStream;
 import org.jiemamy.command.StaxCommandDestination;
 
@@ -48,15 +48,15 @@
 		dest = new StaxCommandDestination(eventWriter);
 	}
 	
-	public void close() throws JiemamyCommandException {
+	public void close() throws JiemamyXmlCommandException {
 		try {
 			dest.getXmlWriter().close();
 		} catch (XMLStreamException e) {
-			throw new JiemamyCommandException(e);
+			throw new JiemamyXmlCommandException(e);
 		}
 	}
 	
-	public void write(JiemamyCommand command) throws JiemamyCommandException {
+	public void write(JiemamyXmlCommand command) throws JiemamyXmlCommandException {
 		Validate.notNull(command);
 		dest.apply(command);
 	}

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/constraint/DeferrabilityImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -33,7 +33,7 @@
 	/**
 	 * 遅延評価可能性
 	 * 
-	 * <p>遅延不可の制約は各コマンドの後すぐに検査される。
+	 * <p>遅延不可の制約は各SQL文の後すぐに検査される。
 	 * 遅延可能な制約の検査は、トランザクションの終了時まで遅延させることができる。</p>
 	 */
 	private boolean deferrable;

Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyStaxSerializer.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -35,7 +35,7 @@
 import org.apache.commons.lang.Validate;
 
 import org.jiemamy.Jiemamy;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.JiemamyCommandInputStream;
 import org.jiemamy.command.JiemamyCommandOutputStream;
 import org.jiemamy.internal.serializer.stax.JiemamyCommandInputStreamImpl;
@@ -51,7 +51,7 @@
 public class JiemamyStaxSerializer implements JiemamySerializer {
 	
 	/**
-	 * Copy models from a {@link JiemamyCommandException} to a {@link JiemamyCommandOutputStream}. And close both.
+	 * Copy models from a {@link JiemamyXmlCommandException} to a {@link JiemamyCommandOutputStream}. And close both.
 	 * 
 	 * @param input resource which send models
 	 * @param output resource which recieve models
@@ -63,20 +63,20 @@
 			while (input.hasNext()) {
 				output.write(input.nextCommand());
 			}
-		} catch (JiemamyCommandException e) {
+		} catch (JiemamyXmlCommandException e) {
 			throw new SerializationException(e);
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
-				} catch (JiemamyCommandException e) {
+				} catch (JiemamyXmlCommandException e) {
 					// ignore
 				}
 			}
 			if (output != null) {
 				try {
 					output.close();
-				} catch (JiemamyCommandException e) {
+				} catch (JiemamyXmlCommandException e) {
 					// ignore
 				}
 			}

Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamTest.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandInputStreamTest.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -40,9 +40,9 @@
 import org.jiemamy.command.CloseCommand;
 import org.jiemamy.command.DataCommand;
 import org.jiemamy.command.EndElementCommand;
-import org.jiemamy.command.JiemamyCommand;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommand;
 import org.jiemamy.command.JiemamyCommandInputStream;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.OpenCommand;
 import org.jiemamy.command.StartElementCommand;
 import org.jiemamy.model.RootModel;
@@ -101,7 +101,7 @@
 			expectedClasses.add(CloseCommand.class);
 		}
 		
-		List<JiemamyCommand> actual = asList(stream);
+		List<JiemamyXmlCommand> actual = asList(stream);
 		
 		int index = 0;
 		for (Class<?> expectedClass : expectedClasses) {
@@ -138,7 +138,7 @@
 				});
 		JiemamyCommandInputStream stream = new XmlEventReaderAdapter(xmlEventReader);
 		
-		List<Class<? extends JiemamyCommand>> expectedClasses = CollectionsUtil.newArrayList();
+		List<Class<? extends JiemamyXmlCommand>> expectedClasses = CollectionsUtil.newArrayList();
 		{
 			// <?xml version='1.0' encoding='UTF-8'?>
 			expectedClasses.add(OpenCommand.class);
@@ -160,10 +160,10 @@
 			expectedClasses.add(CloseCommand.class);
 		}
 		
-		List<JiemamyCommand> actual = asList(stream);
+		List<JiemamyXmlCommand> actual = asList(stream);
 		
 		int index = 0;
-		for (Class<? extends JiemamyCommand> expectedClass : expectedClasses) {
+		for (Class<? extends JiemamyXmlCommand> expectedClass : expectedClasses) {
 			logger.info("expected" + index + " is " + expectedClass);
 			logger.info("actual  " + index + " is " + actual.get(index).getClass());
 			assertThat("error index=" + index, actual.get(index), instanceOf(expectedClass));
@@ -177,13 +177,13 @@
 	 * streamの内容を {@link List} として取得する。
 	 * 
 	 * @param stream
-	 * @return コマンドストリームのリスト
-	 * @throws JiemamyCommandException 読み出しに失敗した場合
+	 * @return XMLコマンドストリームのリスト
+	 * @throws JiemamyXmlCommandException 読み出しに失敗した場合
 	 */
-	private List<JiemamyCommand> asList(JiemamyCommandInputStream stream) throws JiemamyCommandException {
-		List<JiemamyCommand> result = CollectionsUtil.newArrayList();
+	private List<JiemamyXmlCommand> asList(JiemamyCommandInputStream stream) throws JiemamyXmlCommandException {
+		List<JiemamyXmlCommand> result = CollectionsUtil.newArrayList();
 		while (stream.hasNext()) {
-			JiemamyCommand command = stream.nextCommand();
+			JiemamyXmlCommand command = stream.nextCommand();
 			logger.info(ClassUtils.getShortClassName(command, "null"));
 			result.add(command);
 		}

Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamTest.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/serializer/stax/JiemamyCommandOutputStreamTest.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -44,7 +44,7 @@
 import org.jiemamy.command.CloseCommandImpl;
 import org.jiemamy.command.DataCommandImpl;
 import org.jiemamy.command.EndElementCommandImpl;
-import org.jiemamy.command.JiemamyCommandException;
+import org.jiemamy.command.JiemamyXmlCommandException;
 import org.jiemamy.command.JiemamyCommandOutputStream;
 import org.jiemamy.command.OpenCommandImpl;
 import org.jiemamy.command.StartElementCommandImpl;
@@ -132,9 +132,9 @@
 	 * テスト用 command stream を書き込む。
 	 * 
 	 * @param stream 書き込み先
-	 * @throws JiemamyCommandException 書き込みに失敗した場合
+	 * @throws JiemamyXmlCommandException 書き込みに失敗した場合
 	 */
-	private void writeTestDataTo(JiemamyCommandOutputStream stream) throws JiemamyCommandException {
+	private void writeTestDataTo(JiemamyCommandOutputStream stream) throws JiemamyXmlCommandException {
 		Map<QName, String> attributes = new HashMap<QName, String>();
 		attributes.put(new QName("id"), "ffffffff-ffff-ffff-ffff-ffffffffffff");
 		

Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -27,7 +27,7 @@
 import org.jiemamy.model.node.NodeAdapter;
 
 /**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link ConnectionAdapter}を追加するコマンド。
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link ConnectionAdapter}を追加するEDITコマンド。
  * 
  * @see DeleteConnectionViewCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.node.NodeAdapter;
 
 /**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link NodeProfile}を追加するコマンド。
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link NodeProfile}を追加するEDITコマンド。
  * 
  * @see DeleteNodeViewCommand
  * @author shin1ogawa
@@ -50,8 +50,7 @@
 	 * @param nodeAdapter ノードを識別するための{@link NodeAdapter}
 	 * @param nodeProfile ノードの見た目の情報を保持する{@link NodeProfile}
 	 */
-	public AddNodeViewCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter,
-			NodeProfile nodeProfile) {
+	public AddNodeViewCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter, NodeProfile nodeProfile) {
 		this.rootModel = rootModel;
 		this.diagramIndex = diagramIndex;
 		this.nodeAdapter = nodeAdapter;

Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -29,7 +29,7 @@
 import org.jiemamy.model.node.NodeAdapter;
 
 /**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するEDITコマンド。
  * 
  * @see AddConnectionViewCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -26,7 +26,7 @@
 import org.jiemamy.model.node.NodeAdapter;
 
 /**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するEDITコマンド。
  * 
  * @see AddNodeViewCommand
  * @author shin1ogawa

Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -41,7 +41,7 @@
 import org.jiemamy.model.node.NodeAdapter;
 
 /**
- * j-view用のコマンド実行ファサードクラス。
+ * j-view用のEDITコマンド実行ファサードクラス。
  * 
  * @author daisuke
  * @author shin1ogawa
@@ -58,7 +58,7 @@
 	 */
 	public JiemamyViewFacadeImpl(Jiemamy jiemamy) {
 		super(jiemamy);
-		// j-viewを対象としたコマンドを実行できるCommandProcessorの実装クラスをインスタンス化する。
+		// j-viewを対象としたEDITコマンドを実行できるCommandProcessorの実装クラスをインスタンス化する。
 		commandProcessor = new ViewCommandProcessorImpl(jiemamy.getEventBroker());
 	}
 	

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/FitNodeConstraintAction.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -33,7 +33,7 @@
 /**
  * ノードのサイズをフィット（デフォルトサイズに変更）させるアクション。
  * 
- * <p>TODO コマンド化し、undo可能にする。</p>
+ * <p>TODO GEFコマンド化し、undo可能にする。</p>
  * 
  * @author daisuke
  */

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -85,7 +85,6 @@
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -267,8 +266,8 @@
 	public Object getAdapter(Class adapter) {
 		if (adapter == ZoomManager.class) {
 			return ((ScalableRootEditPart) getGraphicalViewer().getRootEditPart()).getZoomManager();
-		} else if (adapter == IContentOutlinePage.class) {
-			return new DiagramOutlinePage(new org.eclipse.gef.ui.parts.TreeViewer()); // GEFツリービューワを使用
+//		} else if (adapter == IContentOutlinePage.class) {
+//			return new DiagramOutlinePage(new org.eclipse.gef.ui.parts.TreeViewer()); // GEFツリービューワを使用
 		}
 		return super.getAdapter(adapter);
 	}
@@ -527,9 +526,6 @@
 		/** ページをアウトラインとサムネイルに分離するコンポーネント */
 		private SashForm sash;
 		
-		/** アウトライン */
-		private Control outline;
-		
 		/** サムネイル */
 		private Canvas overview;
 		
@@ -555,7 +551,7 @@
 			sash = new SashForm(parent, SWT.VERTICAL);
 			
 			// sash上にコンストラクタで指定したビューワの作成
-			outline = viewer.createControl(sash);
+			Control outline = viewer.createControl(sash);
 			
 			configureOutlineViewer();
 			hookOutlineViewer();

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/Messages.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/Messages.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/wizard/Messages.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -33,9 +33,10 @@
 	/** データファイル新規作成Wizardのメッセージ */
 	public static String Wizard_Message;
 	
-//	public static String File_Extension_Error;
+	/** 拡張子にjer以外が指定された場合のエラーメッセージ */
+	public static String File_Extension_Error;
 	
-	private static final String BUNDLE_NAME = "org.jiemamy.eclipse.wizard.messages";
+	private static final String BUNDLE_NAME = Messages.class.getName().toLowerCase();
 	
 	static {
 		reloadMessages();

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-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/EventBroker.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -22,7 +22,7 @@
 import org.jiemamy.editcommand.CommandListener;
 
 /**
- * コマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
+ * EDITコマンドの実行を監視し、登録されている{@link CommandListener}にイベントを通知する。
  * 
  * @author shin1ogawa
  */
@@ -36,7 +36,7 @@
 	void addListener(CommandListener listener);
 	
 	/**
-	 * 実行されたコマンドをイベントとして通知する。
+	 * 実行されたEDITコマンドをイベントとして通知する。
 	 * 
 	 * @param command
 	 */

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CloseCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,10 +19,10 @@
 package org.jiemamy.command;
 
 /**
- * コマンドストリームの終了を表すコマンド。
+ * XMLコマンドストリームの終了を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public interface CloseCommand extends JiemamyCommand {
+public interface CloseCommand extends JiemamyXmlCommand {
 	
 }

Deleted: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -1,83 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/12/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.command;
-
-/**
- * コマンド実行状況（どのタグが開いているか、など）を保持するクラス。
- * 
- * @author daisuke
- */
-public interface CommandContext {
-	
-	/**
-	 * {@link OpenCommand}を記録する。
-	 * 
-	 * @param command {@link OpenCommand}
-	 * @throws JiemamyCommandException 
-	 */
-	void begin(OpenCommand command) throws JiemamyCommandException;
-	
-	/**
-	 * {@link StartElementCommand}を記録する。
-	 * 
-	 * @param command {@link StartElementCommand}
-	 * @throws JiemamyCommandException 
-	 */
-	void begin(StartElementCommand command) throws JiemamyCommandException;
-	
-	/**
-	 * {@link CloseCommand}を記録する。
-	 * 
-	 * @param command {@link CloseCommand}
-	 * @throws JiemamyCommandException 
-	 */
-	void end(CloseCommand command) throws JiemamyCommandException;
-	
-	/**
-	 * {@link EndElementCommand}を記録する。
-	 * 
-	 * @param command {@link EndElementCommand}
-	 * @return この終了コマンドに対応する開始コマンド
-	 * @throws JiemamyCommandException 
-	 */
-	StartElementCommand end(EndElementCommand command) throws JiemamyCommandException;
-	
-	/**
-	 * コマンドストリームが開いている（OpenCommandを受け、CloseCommandを受けていない状態）かどうか調べる。
-	 * 
-	 * @return コマンドストリームが開いていれば{@code true}
-	 */
-	boolean isOpen();
-	
-	/**
-	 * 直前に記録した{@link DataCommand}を取得する。
-	 * 
-	 * @return 直前に記録した{@link DataCommand}
-	 * @throws JiemamyCommandException 
-	 */
-	DataCommand popData() throws JiemamyCommandException;
-	
-	/**
-	 * {@link DataCommand}を記録する。
-	 * 
-	 * @param command {@link DataCommand}
-	 * @throws JiemamyCommandException 
-	 */
-	void pushData(DataCommand command) throws JiemamyCommandException;
-}

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandDestination.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,7 +19,7 @@
 package org.jiemamy.command;
 
 /**
- * {@link JiemamyCommand}を適用する、行き先リソース。
+ * {@link JiemamyXmlCommand}を適用する、行き先リソース。
  * 
  * @author daisuke
  */
@@ -28,8 +28,8 @@
 	/**
 	 * オブジェクトに対してcommandを実行する。
 	 * 
-	 * @param command 実行するコマンド
-	 * @throws JiemamyCommandException 
+	 * @param command 実行するXMLコマンド
+	 * @throws JiemamyXmlCommandException 
 	 */
-	void apply(JiemamyCommand command) throws JiemamyCommandException;
+	void apply(JiemamyXmlCommand command) throws JiemamyXmlCommandException;
 }

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandSource.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,17 +19,17 @@
 package org.jiemamy.command;
 
 /**
- * {@link JiemamyCommand}インスタンスを生成する元となるリソース。
+ * {@link JiemamyXmlCommand}インスタンスを生成する元となるリソース。
  * 
  * @author daisuke
  */
 public interface CommandSource {
 	
 	/**
-	 * コマンドを取得する。
+	 * XMLコマンドを取得する。
 	 * 
-	 * @return コマンド
+	 * @return XMLコマンド
 	 */
-	JiemamyCommand getCommand();
+	JiemamyXmlCommand getCommand();
 	
 }

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/DataCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,11 +19,11 @@
 package org.jiemamy.command;
 
 /**
- * モデル操作の内容を表すコマンド。
+ * モデル操作の内容を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public interface DataCommand extends JiemamyCommand {
+public interface DataCommand extends JiemamyXmlCommand {
 	
 	/**
 	 * 操作内容を示す文字列を取得する。

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/EndElementCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -21,11 +21,11 @@
 import javax.xml.namespace.QName;
 
 /**
- * モデル操作の終了を表すコマンド。
+ * モデル操作の終了を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public interface EndElementCommand extends JiemamyCommand {
+public interface EndElementCommand extends JiemamyXmlCommand {
 	
 	/**
 	 * 完全修飾名を取得する。

Deleted: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -1,28 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/12/15
- *
- * 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.command;
-
-/**
- * Jiemamyのモデル操作をあらわすコマンドオブジェクト。
- * 
- * @author daisuke
- */
-public interface JiemamyCommand {
-	
-}

Deleted: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -1,64 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2008/12/15
- *
- * 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.command;
-
-/**
- * コマンドの読み出し・書き出しに失敗した場合。
- * 
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class JiemamyCommandException extends Exception {
-	
-	/**
-	 * インスタンスを生成する。
-	 */
-	public JiemamyCommandException() {
-		super();
-	}
-	
-	/**
-	 * インスタンスを生成する。
-	 * 
-	 * @param message 例外メッセージ
-	 */
-	public JiemamyCommandException(String message) {
-		super(message);
-	}
-	
-	/**
-	 * インスタンスを生成する。
-	 * 
-	 * @param message 例外メッセージ
-	 * @param cause 起因例外
-	 */
-	public JiemamyCommandException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-	/**
-	 * インスタンスを生成する。
-	 * 
-	 * @param cause 起因例外
-	 */
-	public JiemamyCommandException(Throwable cause) {
-		super(cause);
-	}
-	
-}

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandInputStream.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -30,28 +30,28 @@
 	/**
 	 * Command streamをcloseし、リソースを破棄する。
 	 * 
-	 * @throws JiemamyCommandException 
+	 * @throws JiemamyXmlCommandException 
 	 * @throws IllegalStateException Writerが既にcloseされていた場合
 	 */
-	void close() throws JiemamyCommandException;
+	void close() throws JiemamyXmlCommandException;
 	
 	/**
-	 * 読み出せる次のコマンドがあるかどうか調べる。
+	 * 読み出せる次のXMLコマンドがあるかどうか調べる。
 	 * 
-	 * @return 次のコマンドがある場合{@code true}、無い場合{@code false}を返す
-	 * @throws JiemamyCommandException 
+	 * @return 次のXMLコマンドがある場合{@code true}、無い場合{@code false}を返す
+	 * @throws JiemamyXmlCommandException 
 	 * @throws IllegalStateException Command streamが既にcloseされていた場合
 	 */
-	boolean hasNext() throws JiemamyCommandException;
+	boolean hasNext() throws JiemamyXmlCommandException;
 	
 	/**
-	 * 読み出せる次のコマンドを取得する。
+	 * 読み出せる次のXMLコマンドを取得する。
 	 * 
-	 * @return コマンド
-	 * @throws JiemamyCommandException 
-	 * @throws NoSuchElementException 読み出せる次のコマンドが存在しない場合
+	 * @return XMLコマンド
+	 * @throws JiemamyXmlCommandException 
+	 * @throws NoSuchElementException 読み出せる次のXMLコマンドが存在しない場合
 	 * @throws IllegalStateException Command streamが既にcloseされていた場合
 	 */
-	JiemamyCommand nextCommand() throws JiemamyCommandException;
+	JiemamyXmlCommand nextCommand() throws JiemamyXmlCommandException;
 	
 }

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandOutputStream.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,9 +19,9 @@
 package org.jiemamy.command;
 
 /**
- * {@link JiemamyCommand}で表されるJiemamyのモデルの内容を書き出す、Writerのインターフェイス。
+ * {@link JiemamyXmlCommand}で表されるJiemamyのモデルの内容を書き出す、Writerのインターフェイス。
  * 
- * <p>TODO コマンド順番規約について</p>
+ * <p>TODO XMLコマンド順番規約について</p>
  * 
  * @author daisuke
  */
@@ -30,20 +30,20 @@
 	/**
 	 * Command streamをcloseし、リソースを破棄する。
 	 * 
-	 * @throws JiemamyCommandException 
+	 * @throws JiemamyXmlCommandException 
 	 * @throws IllegalStateException Command streamが既にcloseされていた場合
 	 */
-	void close() throws JiemamyCommandException;
+	void close() throws JiemamyXmlCommandException;
 	
 	/**
-	 * コマンドの内容をモデルに書き出す。
+	 * XMLコマンドの内容をモデルに書き出す。
 	 * 
-	 * @param command コマンド
-	 * @throws JiemamyCommandException 
-	 * @throws IllegalStateException コマンドの順番が規約に従っていなかった場合。
+	 * @param command XMLコマンド
+	 * @throws JiemamyXmlCommandException 
+	 * @throws IllegalStateException XMLコマンドの順番が規約に従っていなかった場合。
 	 * @throws IllegalStateException Command streamが既にcloseされていた場合
 	 * @throws IllegalArgumentException 引数に{@code null}を与えた場合
 	 */
-	void write(JiemamyCommand command) throws JiemamyCommandException;
+	void write(JiemamyXmlCommand command) throws JiemamyXmlCommandException;
 	
 }

Copied: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommand.java (from rev 2763, zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommand.java)
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommand.java	                        (rev 0)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2008/12/15
+ *
+ * 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.command;
+
+/**
+ * Jiemamyのモデル操作をあらわすXMLコマンドオブジェクト。
+ * 
+ * @author daisuke
+ */
+public interface JiemamyXmlCommand {
+	
+}

Copied: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommandException.java (from rev 2763, zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyCommandException.java)
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommandException.java	                        (rev 0)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/JiemamyXmlCommandException.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2008/12/15
+ *
+ * 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.command;
+
+/**
+ * XMLコマンドの読み出し・書き出しに失敗した場合。
+ * 
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class JiemamyXmlCommandException extends Exception {
+	
+	/**
+	 * インスタンスを生成する。
+	 */
+	public JiemamyXmlCommandException() {
+		super();
+	}
+	
+	/**
+	 * インスタンスを生成する。
+	 * 
+	 * @param message 例外メッセージ
+	 */
+	public JiemamyXmlCommandException(String message) {
+		super(message);
+	}
+	
+	/**
+	 * インスタンスを生成する。
+	 * 
+	 * @param message 例外メッセージ
+	 * @param cause 起因例外
+	 */
+	public JiemamyXmlCommandException(String message, Throwable cause) {
+		super(message, cause);
+	}
+	
+	/**
+	 * インスタンスを生成する。
+	 * 
+	 * @param cause 起因例外
+	 */
+	public JiemamyXmlCommandException(Throwable cause) {
+		super(cause);
+	}
+	
+}

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/OpenCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -19,10 +19,10 @@
 package org.jiemamy.command;
 
 /**
- * コマンドストリームの開始を表すコマンド。
+ * XMLコマンドストリームの開始を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public interface OpenCommand extends JiemamyCommand {
+public interface OpenCommand extends JiemamyXmlCommand {
 	
 }

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/StartElementCommand.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -23,11 +23,11 @@
 import javax.xml.namespace.QName;
 
 /**
- * モデル操作の開始を表すコマンド。
+ * モデル操作の開始を表すXMLコマンド。
  * 
  * @author daisuke
  */
-public interface StartElementCommand extends JiemamyCommand {
+public interface StartElementCommand extends JiemamyXmlCommand {
 	
 	/**
 	 * 属性マップを取得する。

Copied: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/XmlCommandContext.java (from rev 2763, zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/CommandContext.java)
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/XmlCommandContext.java	                        (rev 0)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/XmlCommandContext.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2008/12/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.command;
+
+/**
+ * XMLコマンド実行状況（どのタグが開いているか、など）を保持するクラス。
+ * 
+ * @author daisuke
+ */
+public interface XmlCommandContext {
+	
+	/**
+	 * {@link OpenCommand}を記録する。
+	 * 
+	 * @param command {@link OpenCommand}
+	 * @throws JiemamyXmlCommandException 
+	 */
+	void begin(OpenCommand command) throws JiemamyXmlCommandException;
+	
+	/**
+	 * {@link StartElementCommand}を記録する。
+	 * 
+	 * @param command {@link StartElementCommand}
+	 * @throws JiemamyXmlCommandException 
+	 */
+	void begin(StartElementCommand command) throws JiemamyXmlCommandException;
+	
+	/**
+	 * {@link CloseCommand}を記録する。
+	 * 
+	 * @param command {@link CloseCommand}
+	 * @throws JiemamyXmlCommandException 
+	 */
+	void end(CloseCommand command) throws JiemamyXmlCommandException;
+	
+	/**
+	 * {@link EndElementCommand}を記録する。
+	 * 
+	 * @param command {@link EndElementCommand}
+	 * @return この終了XMLコマンドに対応する開始XMLコマンド
+	 * @throws JiemamyXmlCommandException 
+	 */
+	StartElementCommand end(EndElementCommand command) throws JiemamyXmlCommandException;
+	
+	/**
+	 * XMLコマンドストリームが開いている（OpenCommandを受け、CloseCommandを受けていない状態）かどうか調べる。
+	 * 
+	 * @return XMLコマンドストリームが開いていれば{@code true}
+	 */
+	boolean isOpen();
+	
+	/**
+	 * 直前に記録した{@link DataCommand}を取得する。
+	 * 
+	 * @return 直前に記録した{@link DataCommand}
+	 * @throws JiemamyXmlCommandException 
+	 */
+	DataCommand popData() throws JiemamyXmlCommandException;
+	
+	/**
+	 * {@link DataCommand}を記録する。
+	 * 
+	 * @param command {@link DataCommand}
+	 * @throws JiemamyXmlCommandException 
+	 */
+	void pushData(DataCommand command) throws JiemamyXmlCommandException;
+}

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/package-info.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/package-info.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/command/package-info.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -1,7 +1,7 @@
 /**
- * Jiemamyモデルを操作する、コマンドパターンに基づくコマンドオブジェクトの仕様を定義するパッケージ。
+ * Jiemamyモデルを操作する、コマンドパターンに基づくXMLコマンドオブジェクトの仕様を定義するパッケージ。
  * 
- * <p>このパッケージは、Jiemamyモデルに対するコマンド仕様を規定するインターフェイスを含む。</p>
+ * <p>このパッケージは、Jiemamyモデルに対するXMLコマンド仕様を規定するインターフェイスを含む。</p>
  * 
  * <p>FIXME ドキュメンテーション時点で、仕様がまだ未確定である。</p>
  * 

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/Command.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -21,7 +21,7 @@
 import org.jiemamy.model.JiemamyElement;
 
 /**
- * モデルを編集するためのコマンドのインターフェース。
+ * モデルを編集するためのEDITコマンドのインターフェース。
  * 
  * <p>このインターフェイスの実装は、イミュータブルでなければならない。</p>
  * 
@@ -31,19 +31,19 @@
 public interface Command {
 	
 	/**
-	 * コマンドを実行する。
+	 * EDITコマンドを実行する。
 	 * 
-	 * @param commandProcessor コマンドプロセッサ
+	 * @param commandProcessor EDITコマンドプロセッサ
 	 */
 	void execute(CommandProcessor commandProcessor);
 	
 	/**
-	 * 取り消しコマンドを取得する。
+	 * 取り消しEDITコマンドを取得する。
 	 * 
 	 * <p>このメソッドは、 {@link #execute(CommandProcessor)}を実行前後、どちらでも、
-	 * 同じ効果をもたらす取り消しコマンドを返さなければならない。</p>
+	 * 同じ効果をもたらす取り消しEDITコマンドを返さなければならない。</p>
 	 * 
-	 * @return 取り消しコマンド
+	 * @return 取り消しEDITコマンド
 	 */
 	Command getNegateCommand();
 	

Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/editcommand/CommandListener.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -22,7 +22,7 @@
 import org.jiemamy.model.JiemamyElement;
 
 /**
- * コマンドが実行されたイベントの通知を受け取るリスナ。
+ * EDITコマンドが実行されたイベントの通知を受け取るリスナ。
  * 
  * @author shin1ogawa
  */

Modified: zeus/trunk/jiemamy-spec-diff/src/main/java/org/jiemamy/diff/Diff.java
===================================================================
--- zeus/trunk/jiemamy-spec-diff/src/main/java/org/jiemamy/diff/Diff.java	2009-03-01 15:06:46 UTC (rev 2763)
+++ zeus/trunk/jiemamy-spec-diff/src/main/java/org/jiemamy/diff/Diff.java	2009-03-01 15:32:52 UTC (rev 2764)
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.jiemamy.command.JiemamyCommand;
+import org.jiemamy.command.JiemamyXmlCommand;
 
 /**
  * TODO for daisuke
@@ -32,6 +32,6 @@
 	 * TODO for daisuke
 	 * @return
 	 */
-	List<JiemamyCommand> getDeltaCommands();
+	List<JiemamyXmlCommand> getDeltaCommands();
 	
 }

• 前の記事 [Jiemamy-notify:1555] commit [2763] dataSets要素下に、1つ以上のdataSet要素を要求していたので、0でも許可するように変更。
• 次の記事 [Jiemamy-notify:1557] commit [2765] InvocationTargetExceptionの時は原因がわかりにくいので、printStackTrace () しておく。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]