commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945691 [10/39] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src: main/java/org.apache.commons.scxml.diagram/ main/java/org.apache.commons.scxml.diagram/META-INF/ main/java/org.apache.commons.scxml.diagram/icons/obj16/ main/java/org....
Date Tue, 18 May 2010 15:13:31 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/parts/WrappingLabel4EditPart.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/parts/WrappingLabel4EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel4EditPart.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/parts/WrappingLabel4EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel4EditPart exte
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -242,8 +226,8 @@ public class WrappingLabel4EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -323,8 +307,9 @@ public class WrappingLabel4EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Else_2004, getParserElement(), parserHint);
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Else_2004, getParserElement(),
+					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
 		return parser;
@@ -336,7 +321,7 @@ public class WrappingLabel4EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -430,8 +415,8 @@ public class WrappingLabel4EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel5EditPart.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/parts/WrappingLabel5EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel5EditPart.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/parts/WrappingLabel5EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel5EditPart exte
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -242,8 +226,8 @@ public class WrappingLabel5EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -323,8 +307,8 @@ public class WrappingLabel5EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Script_2015, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Script_2015, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -337,7 +321,7 @@ public class WrappingLabel5EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel5EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel6EditPart.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/parts/WrappingLabel6EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel6EditPart.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/parts/WrappingLabel6EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel6EditPart exte
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -242,8 +226,8 @@ public class WrappingLabel6EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -323,8 +307,8 @@ public class WrappingLabel6EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.OnExit_2016, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.OnExit_2016, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -337,7 +321,7 @@ public class WrappingLabel6EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel6EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel7EditPart.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/parts/WrappingLabel7EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel7EditPart.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/parts/WrappingLabel7EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel7EditPart exte
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -242,8 +226,8 @@ public class WrappingLabel7EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -323,8 +307,8 @@ public class WrappingLabel7EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Script_2025, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Script_2025, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -337,7 +321,7 @@ public class WrappingLabel7EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel7EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel8EditPart.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/parts/WrappingLabel8EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel8EditPart.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/parts/WrappingLabel8EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel8EditPart exte
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -242,8 +226,8 @@ public class WrappingLabel8EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -323,8 +307,8 @@ public class WrappingLabel8EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Finalize_2027, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Finalize_2027, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -337,7 +321,7 @@ public class WrappingLabel8EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel8EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel9EditPart.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/parts/WrappingLabel9EditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabel9EditPart.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/parts/WrappingLabel9EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -238,8 +222,8 @@ public class WrappingLabel9EditPart exte
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -319,8 +303,8 @@ public class WrappingLabel9EditPart exte
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.InitialState_2030, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.InitialState_2030, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -333,7 +317,7 @@ public class WrappingLabel9EditPart exte
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -427,8 +411,8 @@ public class WrappingLabel9EditPart exte
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabelEditPart.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/parts/WrappingLabelEditPart.java?rev=945691&r1=945690&r2=945691&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/parts/WrappingLabelEditPart.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/parts/WrappingLabelEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -238,8 +222,8 @@ public class WrappingLabelEditPart exten
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -319,8 +303,8 @@ public class WrappingLabelEditPart exten
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.InitialState_1002, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.InitialState_1002, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -333,7 +317,7 @@ public class WrappingLabelEditPart exten
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -427,8 +411,8 @@ public class WrappingLabelEditPart exten
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

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/Anchor2ItemSemanticEditPolicy.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/Anchor2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Anchor2ItemSemanticEditPolicy.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/Anchor2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class Anchor2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/AnchorItemSemanticEditPolicy.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/AnchorItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/AnchorItemSemanticEditPolicy.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/AnchorItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class AnchorItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/Assign2ItemSemanticEditPolicy.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/Assign2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Assign2ItemSemanticEditPolicy.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/Assign2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class Assign2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/AssignItemSemanticEditPolicy.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/AssignItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/AssignItemSemanticEditPolicy.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/AssignItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class AssignItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/Cancel2ItemSemanticEditPolicy.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/Cancel2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Cancel2ItemSemanticEditPolicy.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/Cancel2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class Cancel2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/CancelItemSemanticEditPolicy.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/CancelItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/CancelItemSemanticEditPolicy.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/CancelItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class CancelItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/Content2ItemSemanticEditPolicy.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/Content2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Content2ItemSemanticEditPolicy.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/Content2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -33,7 +17,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Content2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -57,12 +41,12 @@ public class Content2ItemSemanticEditPol
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ContentContentCompartment2EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case Content2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

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/Content3ItemSemanticEditPolicy.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/Content3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Content3ItemSemanticEditPolicy.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/Content3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -33,7 +17,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Content3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -57,12 +41,12 @@ public class Content3ItemSemanticEditPol
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ContentContentCompartment3EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case Content2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

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/Content4ItemSemanticEditPolicy.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/Content4ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Content4ItemSemanticEditPolicy.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/Content4ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -33,7 +17,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Content4ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -57,12 +41,12 @@ public class Content4ItemSemanticEditPol
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ContentContentCompartment4EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case Content2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

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/Content5ItemSemanticEditPolicy.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/Content5ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/Content5ItemSemanticEditPolicy.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/Content5ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -33,7 +17,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Content5ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -57,12 +41,12 @@ public class Content5ItemSemanticEditPol
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ContentContentCompartment5EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case Content2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

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/ContentContentCompartment2CanonicalEditPolicy.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/ContentContentCompartment2CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment2CanonicalEditPolicy.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/ContentContentCompartment2CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
@@ -23,11 +7,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
-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.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -48,10 +32,10 @@ public class ContentContentCompartment2C
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getContentContentCompartment_5006SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -60,7 +44,7 @@ public class ContentContentCompartment2C
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case Content2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
@@ -83,7 +67,7 @@ public class ContentContentCompartment2C
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getContent_Content());
 		}
 		return myFeaturesToSynchronize;

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/ContentContentCompartment2ItemSemanticEditPolicy.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/ContentContentCompartment2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment2ItemSemanticEditPolicy.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/ContentContentCompartment2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -26,15 +10,15 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class ContentContentCompartment2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());
 			}
 			return getGEFWrapper(new Content2CreateCommand(req));

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/ContentContentCompartment3CanonicalEditPolicy.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/ContentContentCompartment3CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment3CanonicalEditPolicy.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/ContentContentCompartment3CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
@@ -23,11 +7,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
-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.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -48,10 +32,10 @@ public class ContentContentCompartment3C
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getContentContentCompartment_5011SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -60,7 +44,7 @@ public class ContentContentCompartment3C
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case Content2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
@@ -83,7 +67,7 @@ public class ContentContentCompartment3C
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getContent_Content());
 		}
 		return myFeaturesToSynchronize;

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/ContentContentCompartment3ItemSemanticEditPolicy.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/ContentContentCompartment3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment3ItemSemanticEditPolicy.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/ContentContentCompartment3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -26,15 +10,15 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class ContentContentCompartment3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());
 			}
 			return getGEFWrapper(new Content2CreateCommand(req));

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/ContentContentCompartment4CanonicalEditPolicy.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/ContentContentCompartment4CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment4CanonicalEditPolicy.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/ContentContentCompartment4CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
@@ -23,11 +7,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
-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.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -48,10 +32,10 @@ public class ContentContentCompartment4C
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getContentContentCompartment_5019SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -60,7 +44,7 @@ public class ContentContentCompartment4C
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case Content2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
@@ -83,7 +67,7 @@ public class ContentContentCompartment4C
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getContent_Content());
 		}
 		return myFeaturesToSynchronize;

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/ContentContentCompartment4ItemSemanticEditPolicy.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/ContentContentCompartment4ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment4ItemSemanticEditPolicy.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/ContentContentCompartment4ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -26,15 +10,15 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class ContentContentCompartment4ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());
 			}
 			return getGEFWrapper(new Content2CreateCommand(req));

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/ContentContentCompartment5CanonicalEditPolicy.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/ContentContentCompartment5CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment5CanonicalEditPolicy.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/ContentContentCompartment5CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Collection;
@@ -23,11 +7,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
-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.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -48,10 +32,10 @@ public class ContentContentCompartment5C
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getContentContentCompartment_5026SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -60,7 +44,7 @@ public class ContentContentCompartment5C
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case Content2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
@@ -83,7 +67,7 @@ public class ContentContentCompartment5C
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getContent_Content());
 		}
 		return myFeaturesToSynchronize;

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/ContentContentCompartment5ItemSemanticEditPolicy.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/ContentContentCompartment5ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&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/ContentContentCompartment5ItemSemanticEditPolicy.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/ContentContentCompartment5ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -26,15 +10,15 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class ContentContentCompartment5ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());
 			}
 			return getGEFWrapper(new Content2CreateCommand(req));



Mime
View raw message