rename and move refactorimngs for proposal stuff

plugins/org.yakindu.base.xtext.utils.gmf/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.yakindu.base.xtext.utils.gmf.directedit,
  org.yakindu.base.xtext.utils.gmf.experimental,
  org.yakindu.base.xtext.utils.gmf.figures,
- org.yakindu.base.xtext.utils.gmf.proposals,
  org.yakindu.base.xtext.utils.gmf.resource,
  org.yakindu.base.xtext.utils.gmf.viewers
 Bundle-ActivationPolicy: lazy

plugins/org.yakindu.sct.domain.generic/src/org/yakindu/sct/domain/generic/modules/GenericEditorModule.java

@@ -12,13 +12,14 @@ package org.yakindu.sct.domain.generic.modules;
 
 import org.eclipse.xtext.service.AbstractGenericModule;
 import org.yakindu.sct.refactoring.proposals.RefactoringProposalProvider;
+import org.yakindu.sct.ui.editor.editor.proposals.SmartEditProposalProvider;
 import org.yakindu.sct.ui.editor.proposals.IEditProposalProvider;
-import org.yakindu.sct.ui.editor.proposals.SCTSmartEditProposalProvider;
 
 import com.google.inject.Binder;
 import com.google.inject.multibindings.Multibinder;
 
 /**
+ * This module registers services that are intended to be used by the graphical editor.
  * 
  * @author terfloth
  *
@@ -29,7 +30,7 @@ public class GenericEditorModule extends AbstractGenericModule {
 		super.configure(binder);
 		
 		Multibinder<IEditProposalProvider> proposalProviderBinder = Multibinder.newSetBinder(binder, IEditProposalProvider.class);
-	    proposalProviderBinder.addBinding().to(SCTSmartEditProposalProvider.class);
+	    proposalProviderBinder.addBinding().to(SmartEditProposalProvider.class);
 	    proposalProviderBinder.addBinding().to(RefactoringProposalProvider.class);
 	}
 

plugins/org.yakindu.sct.refactoring/META-INF/MANIFEST.MF

@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.yakindu.sct.model.stext;bundle-version="1.0.0",
  org.yakindu.base.xtext.utils.jface;bundle-version="1.0.0",
  org.yakindu.sct.model.resource;bundle-version="1.0.0",
- org.eclipse.core.expressions,
- org.yakindu.base.xtext.utils.gmf;bundle-version="2.1.2"
+ org.eclipse.core.expressions
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.yakindu.sct.refactoring.proposals,

plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/proposals/RefactoringBasedModification.java

@@ -13,9 +13,9 @@ package org.yakindu.sct.refactoring.proposals;
 import java.util.Collections;
 
 import org.eclipse.gmf.runtime.notation.View;
-import org.yakindu.base.xtext.utils.gmf.proposals.ISemanticModification;
 import org.yakindu.sct.refactoring.refactor.AbstractRefactoring;
 import org.yakindu.sct.refactoring.refactor.IRefactoring;
+import org.yakindu.sct.ui.editor.modifications.ISemanticModification;
 
 /**
  * Adapts the {@link ISemanticModification} interface to the

plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/proposals/RefactoringProposalProvider.java

@@ -14,8 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.gmf.runtime.notation.View;
-import org.yakindu.sct.ui.editor.editor.proposals.AddCompositeModification;
-import org.yakindu.sct.ui.editor.editor.proposals.AddOutgoingStateModification;
 import org.yakindu.sct.ui.editor.proposals.IEditProposal;
 import org.yakindu.sct.ui.editor.proposals.IEditProposalProvider;
 import org.yakindu.sct.ui.editor.proposals.ModificationBasedEditProposal;
@@ -34,14 +32,15 @@ public class RefactoringProposalProvider implements IEditProposalProvider {
 		proposals.add(new ModificationBasedEditProposal(
 				new ExtractSubdiagramModification(view), 
 				"Refactoring - Extract Subdiagram", 
-				"Extracts all sub regions into a sub diagram. " +
+				"Extracts all sub regions into a sub diagram.<br> " +
 				"Direct transitions into the diagram will be substituted by entries and outgoing transitions will be substituted using exit nodes. " +
-				"Sub diagrams are opened seperately." , 
+				"<i>Sub diagrams are opened seperately</i>." , 
 				null));
 		proposals.add(new ModificationBasedEditProposal(
 				new InlineSubdiagramModification(view), 
 				"Refactoring - Inline Subdiagram", 
-				"Inlines the existing subdiagram. The region includes an initial state.", null));
+				"Inlines the existing subdiagram. The region includes an initial state.", 
+				null));
 		
 		return proposals;
 	}

plugins/org.yakindu.sct.ui.editor/META-INF/MANIFEST.MF

@@ -60,6 +60,7 @@ Export-Package: org.yakindu.sct.ui.editor,
  org.yakindu.sct.ui.editor.editor.proposals,
  org.yakindu.sct.ui.editor.editparts,
  org.yakindu.sct.ui.editor.factories,
+ org.yakindu.sct.ui.editor.modifications,
  org.yakindu.sct.ui.editor.partitioning,
  org.yakindu.sct.ui.editor.policies,
  org.yakindu.sct.ui.editor.preferences,

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/proposals/AddCompositeModification.java

@@ -11,6 +11,7 @@
 package org.yakindu.sct.ui.editor.editor.proposals;
 
 import org.eclipse.gmf.runtime.notation.View;
+import org.yakindu.sct.ui.editor.modifications.StateTemplatesModification;
 
 /**
  * 

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/proposals/AddOutgoingStateModification.java

@@ -12,10 +12,10 @@ package org.yakindu.sct.ui.editor.editor.proposals;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.View;
-import org.yakindu.base.xtext.utils.gmf.proposals.AbstractSemanticModification;
 import org.yakindu.sct.model.sgraph.SGraphFactory;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Transition;
+import org.yakindu.sct.ui.editor.modifications.AbstractSemanticModification;
 
 /**
  * 

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/proposals/SCTSmartEditProposalProvider.java

@@ -8,14 +8,15 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.sct.ui.editor.proposals;
+package org.yakindu.sct.ui.editor.editor.proposals;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.gmf.runtime.notation.View;
-import org.yakindu.sct.ui.editor.editor.proposals.AddCompositeModification;
-import org.yakindu.sct.ui.editor.editor.proposals.AddOutgoingStateModification;
+import org.yakindu.sct.ui.editor.proposals.IEditProposal;
+import org.yakindu.sct.ui.editor.proposals.IEditProposalProvider;
+import org.yakindu.sct.ui.editor.proposals.ModificationBasedEditProposal;
 
 /**
  * This provider implementation provides the standard high level editing operations.
@@ -24,7 +25,7 @@ import org.yakindu.sct.ui.editor.editor.proposals.AddOutgoingStateModification;
  *  
  * @author terfloth
  */
-public class SCTSmartEditProposalProvider implements IEditProposalProvider {
+public class SmartEditProposalProvider implements IEditProposalProvider {
 
 	@Override
 	public List<IEditProposal> getProposals(View view) {

plugins/org.yakindu.base.xtext.utils.gmf/src/org/yakindu/base/xtext/utils/gmf/proposals/AbstractSemanticModification.java

@@ -8,7 +8,7 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.base.xtext.utils.gmf.proposals;
+package org.yakindu.sct.ui.editor.modifications;
 
 import java.util.Collections;
 

plugins/org.yakindu.base.xtext.utils.gmf/src/org/yakindu/base/xtext/utils/gmf/proposals/ISemanticModification.java

@@ -8,7 +8,7 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.base.xtext.utils.gmf.proposals;
+package org.yakindu.sct.ui.editor.modifications;
 
 import org.eclipse.gmf.runtime.notation.View;
 

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/proposals/StateTemplatesModification.java

@@ -8,7 +8,7 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.sct.ui.editor.editor.proposals;
+package org.yakindu.sct.ui.editor.modifications;
 
 import static org.eclipse.emf.ecore.util.EcoreUtil.getObjectByType;
 
@@ -28,7 +28,6 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
-import org.yakindu.base.xtext.utils.gmf.proposals.AbstractSemanticModification;
 import org.yakindu.sct.model.sgraph.Region;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.ui.editor.providers.SemanticHints;

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/proposals/ModificationBasedEditProposal.java

@@ -1,7 +1,7 @@
 package org.yakindu.sct.ui.editor.proposals;
 
 import org.eclipse.swt.graphics.Image;
-import org.yakindu.base.xtext.utils.gmf.proposals.ISemanticModification;
+import org.yakindu.sct.ui.editor.modifications.ISemanticModification;
 
 public class ModificationBasedEditProposal implements IEditProposal {