Killed some diamonds to make Java 6 happy.

build.gradle

@@ -24,6 +24,10 @@ buildscript {
 allprojects {
 	group = 'org.scenarioo'
     version = getVersionName()
+    tasks.withType(JavaCompile) {
+	    sourceCompatibility = "1.6"
+	    targetCompatibility = "1.6"
+	}
 }
 
 configure([project(":scenarioo-server"), project(":scenarioo-docu-generation-example")]) {

scenarioo-server/src/main/java/org/scenarioo/model/configuration/Configuration.java

@@ -36,28 +36,28 @@
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Configuration {
-
+	
 	public static final String DEFAULT_ALIAS_FOR_MOST_RECENT_BUILD = "most recent";
 	public static final String DEFAULT_ALIAS_FOR_LAST_SUCCESSFUL_BUILD = "last successful";
-
+	
 	private String testDocumentationDirPath;
-
+	
 	private String defaultBranchName = "trunk";
-
+	
 	private String defaultBuildName = DEFAULT_ALIAS_FOR_LAST_SUCCESSFUL_BUILD;
-
+	
 	private String aliasForMostRecentBuild = DEFAULT_ALIAS_FOR_MOST_RECENT_BUILD;
-
+	
 	private String aliasForLastSuccessfulBuild = DEFAULT_ALIAS_FOR_LAST_SUCCESSFUL_BUILD;
-
+	
 	private String buildStatusForSuccessfulBuilds = "success";
-
+	
 	private String scenarioPropertiesInOverview;
-
+	
 	private String applicationName = "";
-
+	
 	private String applicationInformation = "";
-
+	
 	private Map<String, String> buildstates = new HashMap<String, String>();
 
 	private boolean expandPagesInScenarioOverview = false;
@@ -68,130 +68,129 @@ public class Configuration {
 	private Map<String, LabelConfiguration> labelConfigurations = new LinkedHashMap<String, LabelConfiguration>();
 
 	private List<CustomObjectTab> customObjectTabs = new ArrayList<CustomObjectTab>();
-
+	
 	public String getTestDocumentationDirPath() {
 		return testDocumentationDirPath;
 	}
-
-	public void setTestDocumentationDirPath(String testDocumentationDirPath) {
+	
+	public void setTestDocumentationDirPath(final String testDocumentationDirPath) {
 		this.testDocumentationDirPath = testDocumentationDirPath;
 	}
-
+	
 	public String getDefaultBranchName() {
 		return defaultBranchName;
 	}
-
-	public void setDefaultBranchName(String defaultBranchName) {
+	
+	public void setDefaultBranchName(final String defaultBranchName) {
 		this.defaultBranchName = defaultBranchName;
 	}
-
+	
 	public String getDefaultBuildName() {
 		return defaultBuildName;
 	}
-
-	public void setDefaultBuildName(String defaultBuildName) {
+	
+	public void setDefaultBuildName(final String defaultBuildName) {
 		this.defaultBuildName = defaultBuildName;
 	}
-
+	
 	public String getAliasForMostRecentBuild() {
 		return aliasForMostRecentBuild;
 	}
-
-	public void setAliasForMostRecentBuild(String aliasForMostRecentBuild) {
+	
+	public void setAliasForMostRecentBuild(final String aliasForMostRecentBuild) {
 		this.aliasForMostRecentBuild = aliasForMostRecentBuild;
 	}
-
+	
 	public String getAliasForLastSuccessfulBuild() {
 		return aliasForLastSuccessfulBuild;
 	}
-
+	
 	public void setAliasForLastSuccessfulBuild(
-			String aliasForLastSuccessfulBuild) {
+			final String aliasForLastSuccessfulBuild) {
 		this.aliasForLastSuccessfulBuild = aliasForLastSuccessfulBuild;
 	}
-
+	
 	public String getBuildStatusForSuccessfulBuilds() {
 		return buildStatusForSuccessfulBuilds;
 	}
-
+	
 	public void setBuildStatusForSuccessfulBuilds(
-			String buildStatusForSuccessfulBuilds) {
+			final String buildStatusForSuccessfulBuilds) {
 		this.buildStatusForSuccessfulBuilds = buildStatusForSuccessfulBuilds;
 	}
-
+	
 	public String getScenarioPropertiesInOverview() {
 		return scenarioPropertiesInOverview;
 	}
-
+	
 	public void setScenarioPropertiesInOverview(
-			String scenarioPropertiesInOverview) {
+			final String scenarioPropertiesInOverview) {
 		this.scenarioPropertiesInOverview = scenarioPropertiesInOverview;
 	}
-
+	
 	public String getApplicationName() {
 		return applicationName;
 	}
-
+	
 	/**
-	 * The name of the application that is documented by this Scenarioo
-	 * installation. It's displayed in the browser's title bar and in the
-	 * navigation bar of Scenarioo.
+	 * The name of the application that is documented by this Scenarioo installation. It's displayed in the browser's
+	 * title bar and in the navigation bar of Scenarioo.
 	 */
-	public void setApplicationName(String applicationName) {
+	public void setApplicationName(final String applicationName) {
 		this.applicationName = applicationName;
 	}
-
+	
 	public String getApplicationInformation() {
 		return applicationInformation;
 	}
-
-	public void setApplicationInformation(String applicationInformation) {
+	
+	public void setApplicationInformation(final String applicationInformation) {
 		this.applicationInformation = applicationInformation;
 	}
-
+	
 	public Map<String, String> getBuildstates() {
 		return buildstates;
 	}
-
-	public void setBuildstates(Map<String, String> buildstates) {
+	
+	public void setBuildstates(final Map<String, String> buildstates) {
 		this.buildstates = buildstates;
 	}
-
+	
 	public boolean isExpandPagesInScenarioOverview() {
 		return expandPagesInScenarioOverview;
 	}
 
 	public void setExpandPagesInScenarioOverview(final boolean expandPagesInScenarioOverview) {
 		this.expandPagesInScenarioOverview = expandPagesInScenarioOverview;
 	}
-
+	
 	public List<BranchAlias> getBranchAliases() {
-		if(branchAliases == null) {
+		if (branchAliases == null) {
 			branchAliases = new LinkedList<BranchAlias>();
 		}
 		return branchAliases;
 	}
-
-	public void setBranchAliases(List<BranchAlias> buildAliases) {
+	
+	public void setBranchAliases(final List<BranchAlias> buildAliases) {
 		this.branchAliases = buildAliases;
 	}
-
+	
 	public Map<String, LabelConfiguration> getLabelConfigurations() {
-		if(labelConfigurations == null) {
-			labelConfigurations = new LinkedHashMap<>();
+		if (labelConfigurations == null) {
+			labelConfigurations = new LinkedHashMap<String, LabelConfiguration>();
 		}
 		return labelConfigurations;
 	}
-
-	public void setLabelConfigurations(Map<String, LabelConfiguration> labelConfigurations) {
+	
+	public void setLabelConfigurations(final Map<String, LabelConfiguration> labelConfigurations) {
 		this.labelConfigurations = labelConfigurations;
 	}
-
+	
 	public List<CustomObjectTab> getCustomObjectTabs() {
 		return customObjectTabs;
 	}
-
-	public void setCustomObjectTabs(List<CustomObjectTab> customObjectTabs) {
+	
+	public void setCustomObjectTabs(final List<CustomObjectTab> customObjectTabs) {
 		this.customObjectTabs = customObjectTabs;
 	}
 }

scenarioo-server/src/main/java/org/scenarioo/rest/LabelConfigurationsResource.java

@@ -46,6 +46,7 @@ public Map<String, LabelConfiguration> listLabelConfigurations() {
 
 	/**
 	 * Creates a flat list of the label configurations map. This service exists for easier handling in angular.
+	 * 
 	 * @return map as list
 	 */
 	@Path("list")
@@ -55,17 +56,18 @@ public List<FlatLabelConfiguration> getLabelConfigurationsAsList() {
 		Configuration configuration = ConfigurationDAO.getConfiguration();
 		Map<String, LabelConfiguration> labelConfigurations = configuration.getLabelConfigurations();
 
-		List<FlatLabelConfiguration> flatLabelConfigurations = new LinkedList<>();
-		for(Entry<String, LabelConfiguration> labelConfiguration : labelConfigurations.entrySet()) {
-			flatLabelConfigurations.add(new FlatLabelConfiguration(labelConfiguration.getKey(), labelConfiguration.getValue()));
+		List<FlatLabelConfiguration> flatLabelConfigurations = new LinkedList<FlatLabelConfiguration>();
+		for (Entry<String, LabelConfiguration> labelConfiguration : labelConfigurations.entrySet()) {
+			flatLabelConfigurations.add(new FlatLabelConfiguration(labelConfiguration.getKey(), labelConfiguration
+					.getValue()));
 		}
 
 		return flatLabelConfigurations;
 	}
 
 	@POST
 	@Consumes({ "application/json", "application/xml" })
-	public void updateLabelConfigurations(Map<String, LabelConfiguration> labelConfigurations) {
+	public void updateLabelConfigurations(final Map<String, LabelConfiguration> labelConfigurations) {
 		Configuration configuration = ConfigurationDAO.getConfiguration();
 		configuration.setLabelConfigurations(labelConfigurations);
 		ConfigurationDAO.updateConfiguration(configuration);
@@ -79,7 +81,7 @@ static class FlatLabelConfiguration extends LabelConfiguration {
 		public FlatLabelConfiguration() {
 		}
 
-		public FlatLabelConfiguration(String name, LabelConfiguration configuration) {
+		public FlatLabelConfiguration(final String name, final LabelConfiguration configuration) {
 			this.name = name;
 			setForegroundColor(configuration.getForegroundColor());
 			setBackgroundColor(configuration.getBackgroundColor());
@@ -88,8 +90,8 @@ public FlatLabelConfiguration(String name, LabelConfiguration configuration) {
 		public String getName() {
 			return name;
 		}
-
-		public void setName(String name) {
+		
+		public void setName(final String name) {
 			this.name = name;
 		}
 

scenarioo-server/src/main/java/org/scenarioo/rest/mapper/ScenarioDtoMapper.java

@@ -31,9 +31,9 @@ private List<PageWithSteps> mapPages(final List<PageSteps> pagesAndSteps) {
 			return null;
 		}
 
-		Map<String, Integer> occurrences = new HashMap<>();
+		Map<String, Integer> occurrences = new HashMap<String, Integer>();
 
-		List<PageWithSteps> pages = new ArrayList<>(pagesAndSteps.size());
+		List<PageWithSteps> pages = new ArrayList<PageWithSteps>(pagesAndSteps.size());
 		for (PageSteps pageStep : pagesAndSteps) {
 			pages.add(mapPage(pageStep, getPageOccurrenceForPageName(occurrences, pageStep.getPage().getName())));
 		}

scenarioo-server/src/test/java/org/scenarioo/dao/configuration/ConfigurationDAOTest.java

@@ -1,6 +1,6 @@
 package org.scenarioo.dao.configuration;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,11 +15,10 @@
 import org.scenarioo.model.configuration.LabelConfiguration;
 
 /**
- * Smoke tests for reading and writing a configuration. 
+ * Smoke tests for reading and writing a configuration.
  */
 public class ConfigurationDAOTest {
 
-
 	@Before
 	public void init() {
 		ConfigurationDAO.setConfigurationDirectory("tmp");
@@ -41,17 +40,17 @@ public void writeRead() {
 
 		assertEquals(labelConfigurations, loadedConfiguration.getLabelConfigurations());
 	}
-
+	
 	private Map<String, LabelConfiguration> createLabelConfigurations() {
-		Map<String, LabelConfiguration> labelConfigurations = new LinkedHashMap<>();
+		Map<String, LabelConfiguration> labelConfigurations = new LinkedHashMap<String, LabelConfiguration>();
 		labelConfigurations.put("test", createLabelConfig("#1231231", "#1234231"));
 		labelConfigurations.put("test2", createLabelConfig("red", "#1234231"));
 		labelConfigurations.put("test3", createLabelConfig("black", "#1234231"));
 
 		return labelConfigurations;
 	}
-
-	private LabelConfiguration createLabelConfig(String foregroundColor, String backgroundColor) {
+	
+	private LabelConfiguration createLabelConfig(final String foregroundColor, final String backgroundColor) {
 		LabelConfiguration labelConfig = new LabelConfiguration();
 		labelConfig.setForegroundColor(foregroundColor);
 		labelConfig.setBackgroundColor(backgroundColor);