commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945654 [9/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/a...
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/edit/policies/ServiceTemplateItemSemanticEditPolicy.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/edit/policies/ServiceTemplateItemSemanticEditPolicy.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/edit/policies/ServiceTemplateItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ServiceTemplateItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.commands.DataModelCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.FinalStateCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InitialStateCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.ParallelCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.ScriptCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.StateCreateCommand;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.DataModelCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalStateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialStateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ParallelCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ScriptCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.StateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/State2ItemSemanticEditPolicy.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/edit/policies/State2ItemSemanticEditPolicy.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/edit/policies/State2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/State2ItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.TranslationReorientCommand;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/State3ItemSemanticEditPolicy.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/edit/policies/State3ItemSemanticEditPolicy.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/edit/policies/State3ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/State3ItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.TranslationReorientCommand;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartment3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateItemSemanticEditPolicy.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/edit/policies/StateItemSemanticEditPolicy.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/edit/policies/StateItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.TranslationReorientCommand;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.StateStateCompartmentEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+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.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2CanonicalEditPolicy.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/edit/policies/StateStateCompartment2CanonicalEditPolicy.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/edit/policies/StateStateCompartment2CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2CanonicalEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,19 +23,19 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.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/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.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/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.commands.Anchor2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.FinalState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.HistoryStateCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InitialState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InvokeCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnEntryCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnExitCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.Parallel2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.State3CreateCommand;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntryCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3CanonicalEditPolicy.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/edit/policies/StateStateCompartment3CanonicalEditPolicy.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/edit/policies/StateStateCompartment3CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3CanonicalEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,19 +23,19 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.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/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.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/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.commands.Anchor2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.FinalState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.HistoryStateCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InitialState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InvokeCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnEntryCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnExitCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.Parallel2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.State3CreateCommand;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntryCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentCanonicalEditPolicy.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/edit/policies/StateStateCompartmentCanonicalEditPolicy.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/edit/policies/StateStateCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentCanonicalEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,19 +23,19 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.parts.Anchor2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentItemSemanticEditPolicy.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/edit/policies/StateStateCompartmentItemSemanticEditPolicy.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/edit/policies/StateStateCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentItemSemanticEditPolicy.java Tue May 18 13:56:59 2010
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.scxml.diagram.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.ScxmlPackage;
-import org.apache.commons.scxml.diagram.edit.commands.Anchor2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.FinalState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.HistoryStateCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InitialState2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.InvokeCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnEntryCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.OnExitCreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.Parallel2CreateCommand;
-import org.apache.commons.scxml.diagram.edit.commands.State3CreateCommand;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntryCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/TranslationItemSemanticEditPolicy.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/edit/policies/TranslationItemSemanticEditPolicy.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/edit/policies/TranslationItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/TranslationItemSemanticEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Validate2ItemSemanticEditPolicy.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/edit/policies/Validate2ItemSemanticEditPolicy.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/edit/policies/Validate2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Validate2ItemSemanticEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ValidateItemSemanticEditPolicy.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/edit/policies/ValidateItemSemanticEditPolicy.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/edit/policies/ValidateItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ValidateItemSemanticEditPolicy.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.edit.policies;
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlAbstractNavigatorItem.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/navigator/ScxmlAbstractNavigatorItem.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/navigator/ScxmlAbstractNavigatorItem.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlAbstractNavigatorItem.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -41,7 +41,7 @@ public abstract class ScxmlAbstractNavig
 
 					public Object getAdapter(Object adaptableObject,
 							Class adapterType) {
-						if (adaptableObject instanceof org.apache.commons.scxml.diagram.navigator.ScxmlAbstractNavigatorItem
+						if (adaptableObject instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlAbstractNavigatorItem
 								&& adapterType == ITabbedPropertySheetPageContributor.class) {
 							return propertySheetPageContributor;
 						}
@@ -52,7 +52,7 @@ public abstract class ScxmlAbstractNavig
 						return supportedTypes;
 					}
 				},
-				org.apache.commons.scxml.diagram.navigator.ScxmlAbstractNavigatorItem.class);
+				org.apache.commons.scxml.modeling.diagram.navigator.ScxmlAbstractNavigatorItem.class);
 	}
 
 	/**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlDomainNavigatorContentProvider.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/navigator/ScxmlDomainNavigatorContentProvider.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/navigator/ScxmlDomainNavigatorContentProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlDomainNavigatorContentProvider.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
 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/navigator/ScxmlDomainNavigatorItem.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/navigator/ScxmlDomainNavigatorItem.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/navigator/ScxmlDomainNavigatorItem.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlDomainNavigatorItem.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -40,8 +40,8 @@ public class ScxmlDomainNavigatorItem ex
 
 					public Object getAdapter(Object adaptableObject,
 							Class adapterType) {
-						if (adaptableObject instanceof org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem) {
-							org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem domainNavigatorItem = (org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem) adaptableObject;
+						if (adaptableObject instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem) {
+							org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem domainNavigatorItem = (org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem) adaptableObject;
 							EObject eObject = domainNavigatorItem.getEObject();
 							if (adapterType == EObject.class) {
 								return eObject;
@@ -60,7 +60,7 @@ public class ScxmlDomainNavigatorItem ex
 						return supportedTypes;
 					}
 				},
-				org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem.class);
+				org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem.class);
 	}
 
 	/**
@@ -113,12 +113,12 @@ public class ScxmlDomainNavigatorItem ex
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if (obj instanceof org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem) {
+		if (obj instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem) {
 			return EcoreUtil
 					.getURI(getEObject())
 					.equals(
 							EcoreUtil
-									.getURI(((org.apache.commons.scxml.diagram.navigator.ScxmlDomainNavigatorItem) obj)
+									.getURI(((org.apache.commons.scxml.modeling.diagram.navigator.ScxmlDomainNavigatorItem) obj)
 											.getEObject()));
 		}
 		return super.equals(obj);

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlDomainNavigatorLabelProvider.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/navigator/ScxmlDomainNavigatorLabelProvider.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/navigator/ScxmlDomainNavigatorLabelProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlDomainNavigatorLabelProvider.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorActionProvider.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/navigator/ScxmlNavigatorActionProvider.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/navigator/ScxmlNavigatorActionProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorActionProvider.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.diagram.part.Messages;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditor;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.Messages;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditor;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.emf.common.util.URI;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorContentProvider.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/navigator/ScxmlNavigatorContentProvider.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/navigator/ScxmlNavigatorContentProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorContentProvider.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,91 +22,91 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
-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.part.Messages;
-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.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.part.Messages;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorGroup.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/navigator/ScxmlNavigatorGroup.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/navigator/ScxmlNavigatorGroup.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorGroup.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -94,8 +94,8 @@ public class ScxmlNavigatorGroup extends
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if (obj instanceof org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorGroup) {
-			org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorGroup anotherGroup = (org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorGroup) obj;
+		if (obj instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorGroup) {
+			org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorGroup anotherGroup = (org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorGroup) obj;
 			if (getGroupName().equals(anotherGroup.getGroupName())) {
 				return getParent().equals(anotherGroup.getParent());
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorItem.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/navigator/ScxmlNavigatorItem.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/navigator/ScxmlNavigatorItem.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorItem.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -35,9 +35,9 @@ public class ScxmlNavigatorItem extends 
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
 
 			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adaptableObject instanceof org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorItem
+				if (adaptableObject instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem
 						&& (adapterType == View.class || adapterType == EObject.class)) {
-					return ((org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorItem) adaptableObject)
+					return ((org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem) adaptableObject)
 							.getView();
 				}
 				return null;
@@ -46,7 +46,7 @@ public class ScxmlNavigatorItem extends 
 			public Class[] getAdapterList() {
 				return supportedTypes;
 			}
-		}, org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorItem.class);
+		}, org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem.class);
 	}
 
 	/**
@@ -86,12 +86,12 @@ public class ScxmlNavigatorItem extends 
 	 * @generated
 	 */
 	public boolean equals(Object obj) {
-		if (obj instanceof org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorItem) {
+		if (obj instanceof org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem) {
 			return EcoreUtil
 					.getURI(getView())
 					.equals(
 							EcoreUtil
-									.getURI(((org.apache.commons.scxml.diagram.navigator.ScxmlNavigatorItem) obj)
+									.getURI(((org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem) obj)
 											.getView()));
 		}
 		return super.equals(obj);

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorLabelProvider.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/navigator/ScxmlNavigatorLabelProvider.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/navigator/ScxmlNavigatorLabelProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorLabelProvider.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
-import org.apache.commons.scxml.ServiceTemplate;
-import org.apache.commons.scxml.diagram.edit.parts.*;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.ServiceTemplate;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.*;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorLinkHelper.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/navigator/ScxmlNavigatorLinkHelper.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/navigator/ScxmlNavigatorLinkHelper.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorLinkHelper.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramEditorPlugin;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.ui.URIEditorInput;
 import org.eclipse.emf.common.util.URI;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorSorter.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/navigator/ScxmlNavigatorSorter.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/navigator/ScxmlNavigatorSorter.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ScxmlNavigatorSorter.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.navigator;
+package org.apache.commons.scxml.modeling.diagram.navigator;
 
-import org.apache.commons.scxml.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
 import org.eclipse.jface.viewers.ViewerSorter;
 
 /**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/AbstractParser.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/parsers/AbstractParser.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/parsers/AbstractParser.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/AbstractParser.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.parsers;
+package org.apache.commons.scxml.modeling.diagram.parsers;
 
 import java.util.Arrays;
 
-import org.apache.commons.scxml.diagram.part.Messages;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+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.common.notify.Notification;
 import org.eclipse.emf.ecore.EAttribute;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/CompositeParser.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/parsers/CompositeParser.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/parsers/CompositeParser.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/CompositeParser.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.parsers;
+package org.apache.commons.scxml.modeling.diagram.parsers;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/MessageFormatParser.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/parsers/MessageFormatParser.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/parsers/MessageFormatParser.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/parsers/MessageFormatParser.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.parsers;
+package org.apache.commons.scxml.modeling.diagram.parsers;
 
 import java.text.FieldPosition;
 import java.text.MessageFormat;
 import java.text.ParsePosition;
 
-import org.apache.commons.scxml.diagram.part.Messages;
-import org.apache.commons.scxml.diagram.part.ScxmlDiagramEditorPlugin;
+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.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/part/DeleteElementAction.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/DeleteElementAction.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/DeleteElementAction.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/DeleteElementAction.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/DiagramEditorContextMenuProvider.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/DiagramEditorContextMenuProvider.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/DiagramEditorContextMenuProvider.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/DiagramEditorContextMenuProvider.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;
 import org.eclipse.emf.transaction.util.TransactionUtil;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/Messages.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/Messages.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/Messages.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/Messages.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.osgi.util.NLS;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelElementSelectionPage.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/ModelElementSelectionPage.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/ModelElementSelectionPage.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/ModelElementSelectionPage.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;
 import org.eclipse.emf.ecore.util.FeatureMap;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlCreationWizard.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/ScxmlCreationWizard.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/ScxmlCreationWizard.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/ScxmlCreationWizard.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.lang.reflect.InvocationTargetException;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlCreationWizardPage.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/ScxmlCreationWizardPage.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/ScxmlCreationWizardPage.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/ScxmlCreationWizardPage.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.IPath;
 import org.eclipse.core.runtime.Path;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramActionBarContributor.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/ScxmlDiagramActionBarContributor.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/ScxmlDiagramActionBarContributor.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/ScxmlDiagramActionBarContributor.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.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditor.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/ScxmlDiagramEditor.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/ScxmlDiagramEditor.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/ScxmlDiagramEditor.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.navigator.ScxmlNavigatorItem;
+import org.apache.commons.scxml.modeling.diagram.navigator.ScxmlNavigatorItem;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IWorkspaceRoot;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ScxmlDiagramEditorPlugin.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/ScxmlDiagramEditorPlugin.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/ScxmlDiagramEditorPlugin.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/ScxmlDiagramEditorPlugin.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.ArrayList;
 import java.util.List;



Mime
View raw message