Skip to content

Commit beb6759

Browse files
authored
Merge branch 'eclipse-platform:master' into master
2 parents 87de033 + 0520433 commit beb6759

File tree

36 files changed

+4831
-577
lines changed

36 files changed

+4831
-577
lines changed
-452 Bytes
Binary file not shown.

debug/org.eclipse.debug.terminal/icons/console_view.svg

Lines changed: 550 additions & 0 deletions
Loading
-729 Bytes
Binary file not shown.

debug/org.eclipse.debug.terminal/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
point="org.eclipse.ui.console.consoleFactories">
2121
<consoleFactory
2222
class="org.eclipse.debug.terminal.ui.TerminalConsoleFactory"
23-
icon="icons/console_view.png"
23+
icon="icons/console_view.svg"
2424
label="Terminal">
2525
</consoleFactory>
2626
</extension>

debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393
@SuppressWarnings("deprecation")
9494
public class LaunchConfigurationTests extends AbstractLaunchTest implements ILaunchConfigurationListener {
9595

96-
@SuppressWarnings({ "unused" })
97-
// Only ensures org.eclipse.ui.externaltools is required
98-
private static final org.eclipse.ui.externaltools.internal.model.BuilderUtils ref = null;
99-
10096
/**
10197
* Identifier of test launch configuration type extension
10298
*/

debug/org.eclipse.debug.ui.launchview.tests/src/org/eclipse/debug/ui/launchview/tests/launchview/LaunchViewSmokeTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323

2424
public class LaunchViewSmokeTest extends AbstractLaunchViewTest {
2525

26-
@SuppressWarnings({ "restriction", "unused" })
27-
// Only ensures org.eclipse.debug.ui.launchview is required
28-
private static final org.eclipse.debug.ui.launchview.IBackgroundLaunchExecutor e = null;
29-
3026
@Test
3127
public void testOpenView() {
3228
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

platform/org.eclipse.platform/build.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ bin.includes = about.html,\
1717
about.properties,\
1818
eclipse_lg.png,\
1919
eclipse_lg@2x.png,\
20+
eclipse16.svg,\
21+
eclipse32.svg,\
22+
eclipse48.svg,\
2023
eclipse16.png,\
2124
eclipse32.png,\
2225
eclipse48.png,\

platform/org.eclipse.platform/eclipse16.svg

Lines changed: 26 additions & 70 deletions
Loading

platform/org.eclipse.platform/eclipse32.svg

Lines changed: 32 additions & 76 deletions
Loading

0 commit comments

Comments
 (0)