Fixed Compiler errors, updated to newest java version, updated travis, updated to newest featureIDE

.travis.yml

@@ -4,10 +4,10 @@ language: java
 jdk:
   - openjdk11
 
-#-----start GUI testing stuff
+#-----start GUI testing
 services:
   - xvfb
-#-----end GUI testing stuff
+#-----end GUI testing
 cache:
   directories:
   - "$HOME/.m2"

README.md

@@ -1,4 +1,4 @@
-# VariantSync
+# VariantSync [![Build Status](https://travis-ci.org/tthuem/VariantSync.svg?branch=seproj_ulm_2020)](https://travis-ci.org/tthuem/VariantSync)
 === Automating the Synchronization of Software Variants ===
 
 VariantSync is a tool to develop variants separately as in clone-and-own and to automate change propagation by using domain knowledge of developers. VariantSync detects and logs changes during development, tags these changes to feature expressions and automates the synchronization

de.tubs.variantsync.core-test/test/de/tubs/variantsync/patch/base/DiffUtilsTest.java

@@ -62,4 +62,4 @@ public void testPatch2() throws DiffException {
 		assertTrue(patch.getDeltas().size() == 1);
 	}
 
-}
+}

de.tubs.variantsync.core/src/de/tubs/variantsync/core/VariantSyncComposer.java

@@ -17,11 +17,13 @@
 
 public class VariantSyncComposer extends ComposerExtensionClass {
 
-	@Override public void performFullBuild(Path config) {
+	@Override
+	public void performFullBuild(Path config) {
 		VariantSyncPlugin.getConfigurationProjectManager().reinitialize();
 	}
 
-	@Override public void addCompiler(IProject project, String sourcePath, String configPath, String buildPath) {
+	@Override
+	public void addCompiler(IProject project, String sourcePath, String configPath, String buildPath) {
 		File featureContextFile = new File(project.getFile(FeatureContextFormat.FILENAME).getLocationURI());
 		try {
 			featureContextFile.createNewFile();
@@ -30,60 +32,74 @@ public class VariantSyncComposer extends ComposerExtensionClass {
 		}
 	}
 
-	@Override public boolean hasSourceFolder() {
+	@Override
+	public boolean hasSourceFolder() {
 		return false;
 	}
 
-	@Override public boolean hasFeatureFolder() {
+	@Override
+	public boolean hasFeatureFolder() {
 		return false;
 	}
 
-	@Override public boolean hasBuildFolder() {
+	@Override
+	public boolean hasBuildFolder() {
 		return false;
 	}
 
-	@Override public boolean createFolderForFeatures() {
+	@Override
+	public boolean createFolderForFeatures() {
 		return false;
 	}
 
-	@Override public boolean showContextFieldsAndMethods() {
+	@Override
+	public boolean showContextFieldsAndMethods() {
 		return false;
 	}
 
-	@Override public boolean hasMetaProductGeneration() {
+	@Override
+	public boolean hasMetaProductGeneration() {
 		return false;
 	}
 
-	@Override public Mechanism getGenerationMechanism() {
+	@Override
+	public Mechanism getGenerationMechanism() {
 		return null;
 	}
 
-	@Override public boolean supportsAndroid() {
+	@Override
+	public boolean supportsAndroid() {
 		return false;
 	}
 
-	@Override public boolean supportsMigration() {
+	@Override
+	public boolean supportsMigration() {
 		return false;
 	}
 
-	@Override public boolean clean() {
+	@Override
+	public boolean clean() {
 		return false;
 	}
 
-	@Override public void postCompile(IResourceDelta delta, IFile buildFile) {
+	@Override
+	public void postCompile(IResourceDelta delta, IFile buildFile) {
 
 	}
 
-	@Override public void copyNotComposedFiles(Configuration config, IFolder destination) {
+	@Override
+	public void copyNotComposedFiles(Configuration config, IFolder destination) {
 
 	}
 
-	@Override public void buildPartialFeatureProjectAssets(IFolder sourceFolder, ArrayList<String> removedFeatures, ArrayList<String> mandatoryFeatures)
-			throws IOException, CoreException {
+	@Override
+	public void buildPartialFeatureProjectAssets(IFolder sourceFolder, ArrayList<String> removedFeatures,
+			ArrayList<String> mandatoryFeatures) throws IOException, CoreException {
 
 	}
 
-	@Override public boolean supportsPartialFeatureProject() {
+	@Override
+	public boolean supportsPartialFeatureProject() {
 		return false;
 	}
 

de.tubs.variantsync.core/src/de/tubs/variantsync/core/VariantSyncPlugin.java

@@ -60,18 +60,21 @@ public class VariantSyncPlugin extends AbstractUIPlugin {
 	/**
 	 * The constructor
 	 */
-	public VariantSyncPlugin() {}
+	public VariantSyncPlugin() {
+	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework. BundleContext)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.
+	 * BundleContext)
 	 */
 	public void start(BundleContext ctxt) throws Exception {
 		super.start(ctxt);
 		plugin = this;
 
-		DeltaFactoryManager
-				.setExtensionLoader(new EclipseExtensionLoader<>(PLUGIN_ID, IDeltaFactory.extensionPointID, IDeltaFactory.extensionID, IDeltaFactory.class));
+		DeltaFactoryManager.setExtensionLoader(new EclipseExtensionLoader<>(PLUGIN_ID, IDeltaFactory.extensionPointID,
+				IDeltaFactory.extensionID, IDeltaFactory.class));
 
 		configurationProjectManager.initalize();
 
@@ -87,7 +90,9 @@ public void run() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework. BundleContext)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.
+	 * BundleContext)
 	 */
 	public void stop(BundleContext ctxt) throws Exception {
 		configurationProjectManager.terminate();
@@ -137,7 +142,8 @@ public static PatchesManager getActivePatchesManager() {
 	}
 
 	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
+	 * Returns an image descriptor for the image file at the given plug-in relative
+	 * path.
 	 * 
 	 * @param path the path
 	 * @return the image descriptor
@@ -147,7 +153,8 @@ public ImageDescriptor getImageDescriptor(String path) {
 	}
 
 	/**
-	 * Always good to have this static method as when dealing with IResources having a interface to get the editor is very handy
+	 * Always good to have this static method as when dealing with IResources having
+	 * a interface to get the editor is very handy
 	 *
 	 * @return
 	 */
@@ -160,9 +167,11 @@ public static ITextEditor getEditor() {
 	}
 
 	public static IFile getEditorInput() {
-		if (VariantSyncPlugin.getActiveWorkbenchWindow() == null) return null;
+		if (VariantSyncPlugin.getActiveWorkbenchWindow() == null)
+			return null;
 		IEditorPart editorPart = VariantSyncPlugin.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart == null || !(editorPart instanceof IFileEditorInput)) return null;
+		if (editorPart == null || !(editorPart instanceof IFileEditorInput))
+			return null;
 		return ((IFileEditorInput) editorPart.getEditorInput()).getFile();
 	}
 
@@ -191,7 +200,8 @@ public void listenForActiveClass() {
 	}
 
 	public static void addNature(IProject project) {
-		VariantSyncProgressMonitor progressMonitor = new VariantSyncProgressMonitor("Adding VariantSync nature to " + project.getName());
+		VariantSyncProgressMonitor progressMonitor = new VariantSyncProgressMonitor(
+				"Adding VariantSync nature to " + project.getName());
 		try {
 			IProjectDescription description = project.getDescription();
 			String[] natures = description.getNatureIds();

de.tubs.variantsync.core/src/de/tubs/variantsync/core/exceptions/ProjectNotFoundException.java

@@ -5,25 +5,28 @@
 public class ProjectNotFoundException extends NoSuchElementException {
 
 	private static final long serialVersionUID = 1L;
-
-	public enum Type {CONFIGURATION, VARIANT};
-
+
+	public enum Type {
+		CONFIGURATION, VARIANT
+	};
+
 	private Type type;
-	
+
 	public ProjectNotFoundException(Type type) {
 		super("");
 		this.type = type;
-		
+
 	}
-	
+
 	public ProjectNotFoundException(Type type, String message) {
 		super(message);
 		this.type = type;
 	}
 
 	@Override
 	public String toString() {
-		return "A " + (type==Type.CONFIGURATION?"configuration project":"variant") + " does not exist in the workspace. " + getMessage();
+		return "A " + (type == Type.CONFIGURATION ? "configuration project" : "variant")
+				+ " does not exist in the workspace. " + getMessage();
 	}
-	
+
 }

de.tubs.variantsync.core/src/de/tubs/variantsync/core/managers/ConfigurationProjectManager.java

@@ -26,7 +26,8 @@
 import de.tubs.variantsync.core.utilities.event.VariantSyncEvent;
 import de.tubs.variantsync.core.utilities.event.VariantSyncEvent.EventType;
 
-public class ConfigurationProjectManager extends AManager implements IEventListener, de.ovgu.featureide.fm.core.base.event.IEventListener {
+public class ConfigurationProjectManager extends AManager
+		implements IEventListener, de.ovgu.featureide.fm.core.base.event.IEventListener {
 
 	private static HashMap<IFeatureProject, ConfigurationProject> INSTANCES = new HashMap<>();
 	private static ConfigurationProject lastRequestedConfiguration = null;
@@ -39,15 +40,17 @@ public void initalize() {
 			} catch (CoreException e) {
 				LogOperations.logError("A marker could not be deleted", e);
 			}
-			if (project.getProjectName().equals(VariantSyncPlugin.getDefault().getPreferenceStore().getString("lastRequestedConfiguration"))) {
+			if (project.getProjectName().equals(
+					VariantSyncPlugin.getDefault().getPreferenceStore().getString("lastRequestedConfiguration"))) {
 				lastConfiguration = getConfigurationProject(project);
 			} else {
 				getConfigurationProject(project);
 			}
 		}
 		if (lastConfiguration != null && lastRequestedConfiguration != lastConfiguration) {
 			lastRequestedConfiguration = lastConfiguration;
-			fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null, lastRequestedConfiguration));
+			fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null,
+					lastRequestedConfiguration));
 		}
 		for (ConfigurationProject configurationProject : INSTANCES.values()) {
 			findVariants(configurationProject);
@@ -82,7 +85,8 @@ public ConfigurationProject getConfigurationProject(IFeatureProject project) {
 					ConfigurationProject configurationProject = INSTANCES.get(featureProject);
 					if (lastRequestedConfiguration != configurationProject) {
 						lastRequestedConfiguration = configurationProject;
-						fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null, lastRequestedConfiguration));
+						fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null,
+								lastRequestedConfiguration));
 					}
 					return configurationProject;
 				}
@@ -92,7 +96,8 @@ public ConfigurationProject getConfigurationProject(IFeatureProject project) {
 			INSTANCES.put(project, configurationProject);
 			if (lastRequestedConfiguration != configurationProject) {
 				lastRequestedConfiguration = configurationProject;
-				fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null, lastRequestedConfiguration));
+				fireEvent(new VariantSyncEvent(this, EventType.CONFIGURATIONPROJECT_CHANGED, null,
+						lastRequestedConfiguration));
 			}
 			return configurationProject;
 		}
@@ -103,16 +108,16 @@ public ConfigurationProject getConfigurationProject(IFeatureProject project) {
 	 * Loads all contexts which are saved in a XML-file.
 	 */
 	private List<IFeatureProject> findConfigurationProjects() {
-		//System.out.println("[ConfigurationProjectManager.findConfigurationProjects]");
+		// System.out.println("[ConfigurationProjectManager.findConfigurationProjects]");
 		List<IFeatureProject> projects = new ArrayList<>();
 		for (IFeatureProject project : CorePlugin.getFeatureProjects()) {
-			//System.out.print("    project " + project.getProjectName());
+			// System.out.print(" project " + project.getProjectName());
 			if (project.getComposerID().equals("de.tubs.variantsync.core.composer")) {
 				LogOperations.logInfo("Found configuration project with name: " + project.getProjectName());
 				projects.add(project);
-				//System.out.println("    is variant composing");
+				// System.out.println(" is variant composing");
 			} else {
-				//System.out.println("    is NOT variant composing");
+				// System.out.println(" is NOT variant composing");
 			}
 		}
 		return projects;
@@ -142,8 +147,10 @@ private void findVariants(ConfigurationProject configurationProject) {
 
 	public IFeatureProject getFeatureProject(IProject project) {
 		for (IFeatureProject featureProject : INSTANCES.keySet()) {
-			if (project.getName().equals(featureProject.getProjectName())) return featureProject;
-			if (featureProject.getProject().exists() && INSTANCES.get(featureProject).getVariants().contains(project)) return featureProject;
+			if (project.getName().equals(featureProject.getProjectName()))
+				return featureProject;
+			if (featureProject.getProject().exists() && INSTANCES.get(featureProject).getVariants().contains(project))
+				return featureProject;
 		}
 		return null;
 	}
@@ -164,7 +171,8 @@ public ConfigurationProject getConfigurationProject(IProject project) {
 	 * @return
 	 */
 	public ConfigurationProject getActiveConfigurationProject() {
-		if (VariantSyncPlugin.getEditorInput() == null) return lastRequestedConfiguration;
+		if (VariantSyncPlugin.getEditorInput() == null)
+			return lastRequestedConfiguration;
 		return getConfigurationProject(VariantSyncPlugin.getEditorInput().getProject());
 	}
 
@@ -177,7 +185,8 @@ public void propertyChange(FeatureIDEEvent event) {
 			LogOperations.logInfo("Model Event" + event);
 			if (event.getSource() instanceof IFeatureModel) {
 				IFeatureModel model = (IFeatureModel) event.getSource();
-				List<String> featureExpressions = getActiveConfigurationProject().getFeatureContextManager().getContextsAsStrings();
+				List<String> featureExpressions = getActiveConfigurationProject().getFeatureContextManager()
+						.getContextsAsStrings();
 				for (IFeature feature : model.getFeatures()) {
 					if (!featureExpressions.contains(feature.getName())) {
 						getActiveConfigurationProject().getFeatureContextManager().addContext(feature.getName());

de.tubs.variantsync.core/src/de/tubs/variantsync/core/managers/FeatureContextManager.java

@@ -88,7 +88,8 @@ public void importFeaturesFromModel() throws ProjectNotFoundException {
 					fireEvent(new VariantSyncEvent(this, EventType.FEATURECONTEXT_ADDED, null, fe));
 				}
 			}
-		} else throw new ProjectNotFoundException(Type.CONFIGURATION);
+		} else
+			throw new ProjectNotFoundException(Type.CONFIGURATION);
 	}
 
 	public FeatureContext getContext(String name) {
@@ -108,8 +109,8 @@ public void reset() {
 	@Override
 	public void load() {
 		List<FeatureContext> contexts = new ArrayList<>();
-		FileHandler.load(Paths.get(configurationProject.getFeatureProject().getProject().getFile(FeatureContextFormat.FILENAME).getLocationURI()), contexts,
-				new FeatureContextFormat());
+		FileHandler.load(Paths.get(configurationProject.getFeatureProject().getProject()
+				.getFile(FeatureContextFormat.FILENAME).getLocationURI()), contexts, new FeatureContextFormat());
 		if (contexts.isEmpty()) {
 			try {
 				importFeaturesFromModel();
@@ -124,8 +125,8 @@ public void load() {
 
 	@Override
 	public void save() {
-		FileHandler.save(Paths.get(configurationProject.getFeatureProject().getProject().getFile(FeatureContextFormat.FILENAME).getLocationURI()),
-				getContexts(), new FeatureContextFormat());
+		FileHandler.save(Paths.get(configurationProject.getFeatureProject().getProject()
+				.getFile(FeatureContextFormat.FILENAME).getLocationURI()), getContexts(), new FeatureContextFormat());
 	}
 
 }