Bug 477603 - Unnecessary import in org.eclipse.e4.ui.progress

Change-Id: Icf2b3ef60c590a5948153a8d68ae229b69f7ccdd
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

4 files changed, 12 insertions, 10 deletions

diff --git a/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.core.prefs
index 6b12df9170e..4b4a25364ad 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.core.prefs
@@ -114,7 +114,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
@@ -289,3 +289,4 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.ui.prefs
index 446b847248f..9e6057e224a 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.e4.emf.xpath.test/.settings/org.eclipse.jdt.ui.prefs
@@ -37,12 +37,12 @@ sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
 sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/Node.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/Node.java
index 358d366d1bc..e1d1fc832ab 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/Node.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/Node.java
@@ -8,8 +8,6 @@ package org.eclipse.e4.emf.xpath.test.model.xpathtest;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Node</b></em>'.
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/util/XpathtestSwitch.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/util/XpathtestSwitch.java
index 6f1cb7dfb61..c21a7d11de7 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/util/XpathtestSwitch.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/util/XpathtestSwitch.java
@@ -6,11 +6,14 @@
  */
 package org.eclipse.e4.emf.xpath.test.model.xpathtest.util;
 
-import java.util.List;
-
-import org.eclipse.e4.emf.xpath.test.model.xpathtest.*;
-
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.ExtendedNode;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.Menu;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.MenuContainer;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.MenuElement;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.MenuItem;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.Node;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.Root;
+import org.eclipse.e4.emf.xpath.test.model.xpathtest.XpathtestPackage;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;