commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945654 [10/13] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram: ./ META-INF/ src/org/apache/commons/scxml/diagram/edit/commands/ src/org/apache/commons/scxml/diagram/edit/helpers/ src/org/...
Date Tue, 18 May 2010 13:57:12 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditorUtil.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditorUtil.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditorUtil.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditorUtil.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml.ScxmlFactory;
-import org.apache.commons.scxml.ServiceTemplate;
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.ScxmlFactory;
+import org.apache.commons.scxml.modeling.ServiceTemplate;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.OperationHistoryFactory;
 import org.eclipse.core.resources.IFile;
@@ -202,10 +202,10 @@ public class ScxmlDiagramEditorUtil {
 
 				try {
 					modelResource
-							.save(org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorUtil
+							.save(org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorUtil
 									.getSaveOptions());
 					diagramResource
-							.save(org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorUtil
+							.save(org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorUtil
 									.getSaveOptions());
 				} catch (IOException e) {
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdateCommand.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdateCommand.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdateCommand.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdateCommand.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.util.Iterator;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdater.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdater.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdater.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramUpdater.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,115 +23,115 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.scxml.Anchor;
-import org.apache.commons.scxml.Content;
-import org.apache.commons.scxml.Data;
-import org.apache.commons.scxml.DataModel;
-import org.apache.commons.scxml.Donedata;
-import org.apache.commons.scxml.Else;
-import org.apache.commons.scxml.ElseIf;
-import org.apache.commons.scxml.ExecutableContent;
-import org.apache.commons.scxml.FinalState;
-import org.apache.commons.scxml.Finalize;
-import org.apache.commons.scxml.HistoryState;
-import org.apache.commons.scxml.If;
-import org.apache.commons.scxml.InitialState;
-import org.apache.commons.scxml.Invoke;
-import org.apache.commons.scxml.NamedElement;
-import org.apache.commons.scxml.OnEntry;
-import org.apache.commons.scxml.OnExit;
-import org.apache.commons.scxml.Parallel;
-import org.apache.commons.scxml.Param;
-import org.apache.commons.scxml.Script;
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.Send;
-import org.apache.commons.scxml.ServiceTemplate;
-import org.apache.commons.scxml.State;
-import org.apache.commons.scxml.Translation;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AnchorEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Assign2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Cancel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.CancelEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Content2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Content3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Content4EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Content5EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataDataCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataModelEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DonedataEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ElseEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ElseIfEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalizeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.If2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfIfCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfIfCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Log2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.LogEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntry2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntry3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExit2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExit3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Param2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Param3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Param4EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Param5EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Raise2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.RaiseEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Script2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Script3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ScriptEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Send2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendSendCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendSendCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ValidateEditPart;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.Anchor;
+import org.apache.commons.scxml.modeling.Content;
+import org.apache.commons.scxml.modeling.Data;
+import org.apache.commons.scxml.modeling.DataModel;
+import org.apache.commons.scxml.modeling.Donedata;
+import org.apache.commons.scxml.modeling.Else;
+import org.apache.commons.scxml.modeling.ElseIf;
+import org.apache.commons.scxml.modeling.ExecutableContent;
+import org.apache.commons.scxml.modeling.FinalState;
+import org.apache.commons.scxml.modeling.Finalize;
+import org.apache.commons.scxml.modeling.HistoryState;
+import org.apache.commons.scxml.modeling.If;
+import org.apache.commons.scxml.modeling.InitialState;
+import org.apache.commons.scxml.modeling.Invoke;
+import org.apache.commons.scxml.modeling.NamedElement;
+import org.apache.commons.scxml.modeling.OnEntry;
+import org.apache.commons.scxml.modeling.OnExit;
+import org.apache.commons.scxml.modeling.Parallel;
+import org.apache.commons.scxml.modeling.Param;
+import org.apache.commons.scxml.modeling.Script;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.Send;
+import org.apache.commons.scxml.modeling.ServiceTemplate;
+import org.apache.commons.scxml.modeling.State;
+import org.apache.commons.scxml.modeling.Translation;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfIfCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfIfCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.LogEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ScriptEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateEditPart;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDocumentProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDocumentProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDocumentProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDocumentProvider.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.io.IOException;
 import java.util.ArrayList;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDomainModelElementTester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDomainModelElementTester.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDomainModelElementTester.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDomainModelElementTester.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
-import org.apache.commons.scxml.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlInitDiagramFileAction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlInitDiagramFileAction.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlInitDiagramFileAction.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlInitDiagramFileAction.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLinkDescriptor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLinkDescriptor.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLinkDescriptor.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLinkDescriptor.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLoadResourceAction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLoadResourceAction.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLoadResourceAction.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlLoadResourceAction.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
 import org.eclipse.emf.edit.ui.action.LoadResourceAction;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlMatchingStrategy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlMatchingStrategy.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlMatchingStrategy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlMatchingStrategy.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.ui.IEditorInput;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNewDiagramFileWizard.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNewDiagramFileWizard.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNewDiagramFileWizard.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNewDiagramFileWizard.java Tue May 18 13:56:59 2010
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.OperationHistoryFactory;
 import org.eclipse.core.resources.IFile;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNodeDescriptor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNodeDescriptor.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNodeDescriptor.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlNodeDescriptor.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import org.eclipse.emf.ecore.EObject;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlPaletteFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlPaletteFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlPaletteFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlPaletteFactory.java Tue May 18 13:56:59 2010
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.gef.Tool;
 import org.eclipse.gef.palette.PaletteContainer;
 import org.eclipse.gef.palette.PaletteGroup;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlUriEditorInputTester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlUriEditorInputTester.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlUriEditorInputTester.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlUriEditorInputTester.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.emf.common.ui.URIEditorInput;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlVisualIDRegistry.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlVisualIDRegistry.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlVisualIDRegistry.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlVisualIDRegistry.java Tue May 18 13:56:59 2010
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.part;
+package org.apache.commons.scxml.modeling.diagram.part;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.ServiceTemplate;
-import org.apache.commons.scxml.diagram.edit.parts.*;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ServiceTemplate;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.*;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
@@ -50,7 +50,7 @@ public class ScxmlVisualIDRegistry {
 				return -1;
 			}
 		}
-		return org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry
+		return org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry
 				.getVisualID(view.getType());
 	}
 
@@ -115,14 +115,14 @@ public class ScxmlVisualIDRegistry {
 		if (domainElement == null) {
 			return -1;
 		}
-		String containerModelID = org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry
+		String containerModelID = org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry
 				.getModelID(containerView);
 		if (!ServiceTemplateEditPart.MODEL_ID.equals(containerModelID)) {
 			return -1;
 		}
 		int containerVisualID;
 		if (ServiceTemplateEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry
+			containerVisualID = org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry
 					.getVisualID(containerView);
 		} else {
 			if (containerView instanceof Diagram) {
@@ -720,14 +720,14 @@ public class ScxmlVisualIDRegistry {
 	 * @generated
 	 */
 	public static boolean canCreateNode(View containerView, int nodeVisualID) {
-		String containerModelID = org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry
+		String containerModelID = org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry
 				.getModelID(containerView);
 		if (!ServiceTemplateEditPart.MODEL_ID.equals(containerModelID)) {
 			return false;
 		}
 		int containerVisualID;
 		if (ServiceTemplateEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry
+			containerVisualID = org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry
 					.getVisualID(containerView);
 		} else {
 			if (containerView instanceof Diagram) {

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramAppearancePreferencePage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramAppearancePreferencePage.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramAppearancePreferencePage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramAppearancePreferencePage.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramConnectionsPreferencePage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramConnectionsPreferencePage.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramConnectionsPreferencePage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramConnectionsPreferencePage.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramGeneralPreferencePage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramGeneralPreferencePage.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramGeneralPreferencePage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramGeneralPreferencePage.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPreferenceInitializer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPreferenceInitializer.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPreferenceInitializer.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPreferenceInitializer.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPrintingPreferencePage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPrintingPreferencePage.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPrintingPreferencePage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramPrintingPreferencePage.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramRulersAndGridPreferencePage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramRulersAndGridPreferencePage.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramRulersAndGridPreferencePage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/preferences/DiagramRulersAndGridPreferencePage.java Tue May 18 13:56:59 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.preferences;
+package org.apache.commons.scxml.modeling.diagram.preferences;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ElementInitializers.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ElementInitializers.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ElementInitializers.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ElementInitializers.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
 /**
  * @generated

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlEditPartProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlEditPartProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlEditPartProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlEditPartProvider.java Tue May 18 13:56:59 2010
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
 import java.lang.ref.WeakReference;
 
-import org.apache.commons.scxml.diagram.edit.parts.ScxmlEditPartFactory;
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ScxmlEditPartFactory;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartFactory;
 import org.eclipse.gmf.runtime.common.core.service.IOperation;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlElementTypes.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlElementTypes.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlElementTypes.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlElementTypes.java Tue May 18 13:56:59 2010
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlIconProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlIconProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlIconProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlIconProvider.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlModelingAssistantProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlModelingAssistantProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlModelingAssistantProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlModelingAssistantProvider.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,36 +23,36 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ContentContentCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataDataCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.If2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryOnEntryCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelParallelCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendSendCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendSendCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartmentEditPart;
-import org.apache.commons.scxml.diagram.part.Messages;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.Messages;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlParserProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlParserProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlParserProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlParserProvider.java Tue May 18 13:56:59 2010
@@ -14,49 +14,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.parts.AnchorType2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AnchorTypeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignDataid2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignDataidEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignExpr2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignExprEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.CancelSendid2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.CancelSendidEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataIdEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.DataModelSchemaEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ElseIfCondEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateId2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalStateIdEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateId2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateIdEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfCond2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.IfCondEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeTypeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.LogExpr2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.LogExprEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelId2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelId3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParallelIdEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamName2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamName3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamName4EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamName5EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ParamNameEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.RaiseEvent2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.RaiseEventEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendEvent2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.SendEventEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateId2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateId3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateIdEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.TranslationEventEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ValidateSchema2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.ValidateSchemaEditPart;
-import org.apache.commons.scxml.diagram.parsers.MessageFormatParser;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorType2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorTypeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataidEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExpr2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExprEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendidEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelSchemaEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfCondEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateId2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateId2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCond2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCondEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeTypeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.LogExpr2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.LogExprEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelId2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelId3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamNameEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEvent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEventEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEvent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEventEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateId2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateId3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEventEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateSchema2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateSchemaEditPart;
+import org.apache.commons.scxml.modeling.diagram.parsers.MessageFormatParser;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlViewProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlViewProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlViewProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ScxmlViewProvider.java Tue May 18 13:56:59 2010
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.providers;
+package org.apache.commons.scxml.modeling.diagram.providers;
 
-import org.apache.commons.scxml.diagram.edit.parts.*;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.diagram.view.factories.*;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.*;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.view.factories.*;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlPropertySection.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlPropertySection.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlPropertySection.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlPropertySection.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.sheet;
+package org.apache.commons.scxml.modeling.diagram.sheet;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlSheetLabelProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlSheetLabelProvider.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlSheetLabelProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ScxmlSheetLabelProvider.java Tue May 18 13:56:59 2010
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.sheet;
+package org.apache.commons.scxml.modeling.diagram.sheet;
 
-import org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorGroup;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorGroup;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.gef.EditPart;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AnchorType2EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorType2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java Tue May 18 13:56:59 2010
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.AnchorEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AnchorTypeEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorTypeEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.Assign2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignDataid2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignExpr2EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExpr2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java Tue May 18 13:56:59 2010
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.AssignDataidEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.AssignExprEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataidEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExprEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.scxml.diagram.edit.parts.Cancel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.CancelSendid2EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java?rev=945654&r1=945185&r2=945654&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java Tue May 18 13:56:59 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.view.factories;
+package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;
 import java.util.List;



Mime
View raw message