Releng: build against S-4.10M3-201811211800
- resolve compile & configuration errors
Change-Id: I84631c0645bc65956bd6feb7f241cf06f7d93e40
diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/LineBreaksPreparator.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/LineBreaksPreparator.java
index 041680d..84b4492 100644
--- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/LineBreaksPreparator.java
+++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/LineBreaksPreparator.java
@@ -705,8 +705,7 @@
for (Object pMap : node.getParameterMappings())
breakLineBefore((ASTNode) pMap);
String bracePosition = this.options.brace_position_for_method_declaration;
- handleBracedCode(node, null, bracePosition, this.options.indent_statements_compare_to_block,
- this.options.insert_new_line_in_empty_block);
+ handleBracedCode(node, null, bracePosition, this.options.indent_statements_compare_to_block);
}
return true;
}
@@ -722,8 +721,7 @@
for (Object pMap : node.getParameterMappings())
breakLineBefore((ASTNode) pMap);
String bracePosition = this.options.brace_position_for_method_declaration;
- handleBracedCode(node, null, bracePosition, this.options.indent_statements_compare_to_block,
- this.options.insert_new_line_in_empty_block);
+ handleBracedCode(node, null, bracePosition, this.options.indent_statements_compare_to_block);
}
return true;
}
diff --git a/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath b/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
index b277a8a..148b322 100644
--- a/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.debug.tests/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/.classpath
index 68ddec1..2c94f8a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="OTRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/.classpath b/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
index 984c253..943debb 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/.classpath
@@ -1,16 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="model"/>
- <classpathentry kind="src" path="search"/>
- <classpathentry kind="src" path="hierarchy"/>
- <classpathentry kind="src" path="compiler"/>
- <classpathentry kind="src" path="parser"/>
- <classpathentry kind="src" path="formatter"/>
- <classpathentry kind="src" path="otjld"/>
+ <classpathentry kind="src" path="model">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="search">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="hierarchy">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="compiler">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="parser">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="formatter">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="otjld">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="OTRE"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="selection"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="selection">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.classpath
index 472ee29..eb3f32a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.dom/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath
index f8244d8..b392bcd 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests.refactoring/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="OTRE"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/.classpath b/testplugins/org.eclipse.objectteams.otdt.ui.tests/.classpath
index b05df52..324673d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/.classpath
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="OTRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
