EDIT: Implemented scoping for other parts of the pipeline.

Author: tsaglam

src/main/java/jce/JavaCodeEcorification.java

@@ -41,10 +41,8 @@
  */
 public class JavaCodeEcorification {
     private static final Logger logger = LogManager.getLogger(JavaCodeEcorification.class.getName());
-    private final FieldEncapsulator fieldEncapsulator;
     private final GenModelGenerator genModelGenerator;
     private final ImportOrganizer importOrganizer;
-    private final InheritanceManipulator inheritanceManipulator;
     private final EcoreMetamodelExtraction metamodelGenerator;
     private final EcorificationProperties properties;
     private final WrapperGenerator wrapperGenerator;
@@ -57,14 +55,13 @@ public JavaCodeEcorification() {
         metamodelGenerator = new EcorificationExtraction(properties);
         genModelGenerator = new GenModelGenerator(properties);
         wrapperGenerator = new WrapperGenerator(properties);
-        fieldEncapsulator = new FieldEncapsulator(properties);
         importOrganizer = new ImportOrganizer(properties);
-        inheritanceManipulator = new InheritanceManipulator(properties);
     }
 
     /**
-     * Starts the ecorification for a specific Java project. Initializes the different steps of the Ecorification
-     * pipeline: The extraction of an Ecore metamodel, the Ecore model code generation, the wrapper generation and the
+     * Starts the ecorification for a specific Java project. Initializes the
+     * different steps of the Ecorification pipeline: The extraction of an Ecore
+     * metamodel, the Ecore model code generation, the wrapper generation and the
      * origin code adaption.
      * @param originalProject is the specific Java project as {@link IProject}.
      */
@@ -81,15 +78,16 @@ public void start(IProject originalProject) {
     }
 
     /**
-     * 5. Encapsulates all fields of the origin code. Removes public, non-static fields and their access methods,
-     * organizes all imports, manipulates the inheritance relations to extend the wrappers, creates default constructors
+     * 5. Encapsulates all fields of the origin code. Removes public, non-static
+     * fields and their access methods, organizes all imports, manipulates the
+     * inheritance relations to extend the wrappers, creates default constructors
      * where they are missing.
      */
     private void adaptOriginCode(GeneratedEcoreMetamodel metamodel, IProject project) {
-        fieldEncapsulator.manipulate(project);
+        new FieldEncapsulator(metamodel.getIntermediateModel(), properties).manipulate(project);
         new MemberRemover(metamodel, properties).manipulate(project);
         importOrganizer.manipulate(project);
-        inheritanceManipulator.manipulate(project);
+        new InheritanceManipulator(metamodel.getIntermediateModel(), properties).manipulate(project);
     }
 
     /**
@@ -98,15 +96,15 @@ private void adaptOriginCode(GeneratedEcoreMetamodel metamodel, IProject project
     private void buildFactories(GeneratedEcoreMetamodel metamodel, IProject project) {
         new FactoryRenamer(metamodel, properties).manipulate(project);
         new FactoryImplementationRenamer(metamodel, properties).manipulate(project);
-        new DefaultConstructorGenerator(properties).manipulate(project);
+        new DefaultConstructorGenerator(properties, metamodel.getIntermediateModel()).manipulate(project);
         new EcoreFactoryGenerator(properties).buildFactories(metamodel, project);
         new PackageImplFactoryCorrector(metamodel, properties).manipulate(project);
         new ClassExposer(properties).manipulate(project);
     }
 
     /**
-     * 1. Extracts a Ecore metamodel in form of an {@link GeneratedEcoreMetamodel} from the original {@link IProject}.
-     * Generates a {@link GenModel}.
+     * 1. Extracts a Ecore metamodel in form of an {@link GeneratedEcoreMetamodel}
+     * from the original {@link IProject}. Generates a {@link GenModel}.
      */
     private GeneratedEcoreMetamodel extractMetamodel(IProject originalProject) {
         GeneratedEcoreMetamodel metamodel = metamodelGenerator.extract(originalProject);
@@ -116,7 +114,8 @@ private GeneratedEcoreMetamodel extractMetamodel(IProject originalProject) {
     }
 
     /**
-     * 6. Finishes the ecorification: Organizes all imports, rebuilds the project and notifies the user.
+     * 6. Finishes the ecorification: Organizes all imports, rebuilds the project
+     * and notifies the user.
      */
     private void finish(IProject project) {
         importOrganizer.manipulate(project);
@@ -125,7 +124,8 @@ private void finish(IProject project) {
     }
 
     /**
-     * 3. Generates the wrappers, which are the classes that unify the origin code with the Ecore code.
+     * 3. Generates the wrappers, which are the classes that unify the origin code
+     * with the Ecore code.
      */
     private void generateWrappers(GeneratedEcoreMetamodel metamodel, IProject project) {
         XtendLibraryHelper.addXtendLibs(project, properties);
@@ -149,8 +149,9 @@ private IProject getProject(SavingInformation information) {
     }
 
     /**
-     * 4. Manipulates the imports of the Ecore code. Every Ecore interface and every correlating implementation class
-     * will use the origin code types instead of ecore code types.
+     * 4. Manipulates the imports of the Ecore code. Every Ecore interface and every
+     * correlating implementation class will use the origin code types instead of
+     * ecore code types.
      */
     private void manipulateEcoreImports(GeneratedEcoreMetamodel metamodel, IProject project) {
         new EcoreImportManipulator(metamodel, properties).manipulate(project); // 4. adapt imports

src/main/java/jce/codemanipulation/origin/ClassExposer.java

@@ -10,7 +10,8 @@
 import jce.util.jdt.ASTUtil;
 
 /**
- * Changes the visibility of default types and default inner classes of the origin code to public to make them visible.
+ * Changes the visibility of default types and default inner classes of the
+ * origin code to public to make them visible.
  * @author Timur Saglam
  */
 public class ClassExposer extends AbstractCodeManipulator {
@@ -25,7 +26,7 @@ public ClassExposer(EcorificationProperties properties) {
 
     @Override
     protected void manipulate(ICompilationUnit unit) throws JavaModelException {
-        if (properties.get(BinaryProperty.EXPOSE_CLASSES)) {
+        if (properties.get(BinaryProperty.EXPOSE_CLASSES)) { // TODO (HIGH) Apply scope here to be minimally intrusive
             ASTUtil.applyVisitorModifications(unit, new ClassExpositionVisitor(properties), monitor);
         }
     }

src/main/java/jce/codemanipulation/origin/FieldEncapsulator.java

@@ -10,34 +10,43 @@
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 
+import eme.model.IntermediateModel;
 import jce.codemanipulation.AbstractCodeManipulator;
 import jce.properties.EcorificationProperties;
 import jce.properties.TextProperty;
 import jce.util.jdt.ASTUtil;
 
 /**
- * Encapsulates the fields of the origin code. This is necessary for the removal of the fields.
+ * Encapsulates the fields of the origin code. This is necessary for the removal
+ * of the fields.
  * @author Timur Saglam
  */
 public class FieldEncapsulator extends AbstractCodeManipulator {
+    private IntermediateModel model;
 
     /**
      * Simple constructor that sets the properties.
+     * @param model is the {@link IntermediateModel} needed for the Ecorification
+     * scope.
      * @param properties are the {@link EcorificationProperties}.
      */
-    public FieldEncapsulator(EcorificationProperties properties) {
+    public FieldEncapsulator(IntermediateModel model, EcorificationProperties properties) {
         super(properties, properties.get(TextProperty.ECORE_PACKAGE), properties.get(TextProperty.WRAPPER_PACKAGE));
+        this.model = model;
     }
 
     @Override
     protected void manipulate(ICompilationUnit unit) throws JavaModelException {
-        ASTUtil.applyVisitorModifications(unit, new FieldUnfinalizationVisitor(), monitor); // make fields not final
-        CompilationUnit parsedUnit = ASTUtil.parse(unit, monitor);
-        parsedUnit.accept(new FieldEncapsulationVisitor(properties));
+        if (model.isTypeSelected(getPackageMemberName(unit))) { // only apply on origin type in scope
+            ASTUtil.applyVisitorModifications(unit, new FieldUnfinalizationVisitor(), monitor); // make fields not final
+            CompilationUnit parsedUnit = ASTUtil.parse(unit, monitor); // do not use applyVisitorModifications() here
+            parsedUnit.accept(new FieldEncapsulationVisitor(properties)); // because refactorings are applied, not modifications
+        }
     }
 
     /**
-     * {@link ASTVisitor} class that removes the modifier keyword final from all of its final fields.
+     * {@link ASTVisitor} class that removes the modifier keyword final from all of
+     * its final fields.
      */
     private class FieldUnfinalizationVisitor extends ASTVisitor {
         @Override

src/main/java/jce/codemanipulation/origin/InheritanceManipulator.java

@@ -4,29 +4,36 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.ASTVisitor;
 
+import eme.model.IntermediateModel;
 import jce.codemanipulation.AbstractCodeManipulator;
 import jce.properties.EcorificationProperties;
 import jce.properties.TextProperty;
 import jce.util.jdt.ASTUtil;
 
 /**
- * Changes the inheritance of the origin code to let the original classes inherit from the generated unification
- * classes.
+ * Changes the inheritance of the origin code to let the original classes
+ * inherit from the generated unification classes.
  * @author Timur Saglam
  */
 public class InheritanceManipulator extends AbstractCodeManipulator {
+    private final IntermediateModel model;
 
     /**
      * Simple constructor that sets the properties.
+     * @param model is the {@link IntermediateModel} needed for the Ecorification
+     * scope.
      * @param properties are the {@link EcorificationProperties}.
      */
-    public InheritanceManipulator(EcorificationProperties properties) {
+    public InheritanceManipulator(IntermediateModel model, EcorificationProperties properties) {
         super(properties, properties.get(TextProperty.ECORE_PACKAGE), properties.get(TextProperty.WRAPPER_PACKAGE));
+        this.model = model;
     }
 
     @Override
     protected void manipulate(ICompilationUnit unit) throws JavaModelException {
-        ASTVisitor visitor = new InheritanceManipulationVisitor(unit.getParent().getElementName(), properties);
-        ASTUtil.applyVisitorModifications(unit, visitor, monitor);
+        if (model.isTypeSelected(getPackageMemberName(unit))) { // only apply on origin type in scope
+            ASTVisitor visitor = new InheritanceManipulationVisitor(unit.getParent().getElementName(), properties);
+            ASTUtil.applyVisitorModifications(unit, visitor, monitor);
+        }
     }
 }

src/main/java/jce/codemanipulation/origin/MemberRemover.java

@@ -10,16 +10,18 @@
 import jce.util.jdt.ASTUtil;
 
 /**
- * Removes all private non-static fields and their access methods from the origin code that have a counterpart in the
- * Ecore metamodel which was extracted from the origin code.
+ * Removes all private non-static fields and their access methods from the
+ * origin code that have a counterpart in the Ecore metamodel which was
+ * extracted from the origin code.
  * @author Timur Saglam
  */
 public class MemberRemover extends AbstractCodeManipulator {
     private GeneratedEcoreMetamodel metamodel;
 
     /**
      * Simple constructor that sets the properties.
-     * @param metamodel is the Ecore metamodel which was extracted from the origin code.
+     * @param metamodel is the Ecore metamodel which was extracted from the origin
+     * code.
      * @param properties are the {@link EcorificationProperties}.
      */
     public MemberRemover(GeneratedEcoreMetamodel metamodel, EcorificationProperties properties) {
@@ -29,6 +31,8 @@ public MemberRemover(GeneratedEcoreMetamodel metamodel, EcorificationProperties
 
     @Override
     protected void manipulate(ICompilationUnit unit) throws JavaModelException {
-        ASTUtil.applyVisitorModifications(unit, new MemberRemovalVisitor(metamodel, properties), monitor);
+        if (metamodel.getIntermediateModel().isTypeSelected(getPackageMemberName(unit))) { // only apply on origin type in scope
+            ASTUtil.applyVisitorModifications(unit, new MemberRemovalVisitor(metamodel, properties), monitor);
+        }
     }
 }