Skip to content

Commit de48a8d

Browse files
committed
Remove 1.1.x VM install UI and code supporting it
JDT can target Java 1.8 as a minimum so providing a special case option to have Java 1.1.x JVM that can not be used for anything after that is useless. Fixes #648 .
1 parent 4da0d59 commit de48a8d

File tree

9 files changed

+5
-314
lines changed

9 files changed

+5
-314
lines changed

org.eclipse.jdt.debug.ui/plugin.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<!--
4-
Copyright (c) 2005, 2024 IBM Corporation and others.
4+
Copyright (c) 2005, 2025 IBM Corporation and others.
55
66
This program and the accompanying materials
77
are made available under the terms of the Eclipse Public License 2.0
@@ -2998,11 +2998,6 @@ M4 = Platform-specific fourth key
29982998
class="org.eclipse.jdt.internal.debug.ui.jres.StandardVMCommandTab"
29992999
id="org.eclipse.jdt.debug.ui.StandardVMCommandTab">
30003000
</vmInstallTypePage>
3001-
<vmInstallTypePage
3002-
vmInstallTypeID="org.eclipse.jdt.launching.Standard11xVMType"
3003-
class="org.eclipse.jdt.internal.debug.ui.jres.StandardVMCommandTab"
3004-
id="org.eclipse.jdt.debug.ui.StandardVMCommandTab">
3005-
</vmInstallTypePage>
30063001
</extension>
30073002
<extension
30083003
point="org.eclipse.team.core.fileTypes">

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2018 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -203,8 +203,6 @@ public class LaunchingMessages extends NLS {
203203
public static String JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__14;
204204
public static String JavaSourceLocator_Exception_occurred_initializing_source_locator__15;
205205

206-
public static String Standard11xVMType_Standard_1_1_x_VM_1;
207-
208206
public static String PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___missing_handle_identifier_for_package_fragment_root__6;
209207
public static String PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___package_fragment_root_does_not_exist__7;
210208
public static String PackageFragmentRootSourceLocation_Exception_occurred_initializing_source_location__8;

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2000, 2018 IBM Corporation and others.
2+
# Copyright (c) 2000, 2025 IBM Corporation and others.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the Eclipse Public License 2.0
@@ -165,8 +165,6 @@ JavaSourceLocator_Unable_to_restore_source_location__12=Unable to restore source
165165
JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__14=Unable to restore Java source locator - invalid format.
166166
JavaSourceLocator_Exception_occurred_initializing_source_locator__15=Exception occurred initializing source locator.
167167

168-
Standard11xVMType_Standard_1_1_x_VM_1=Standard 1.1.x VM
169-
170168
PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___missing_handle_identifier_for_package_fragment_root__6=Unable to initialize source location - missing handle identifier for package fragment root.
171169
PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___package_fragment_root_does_not_exist__7=Unable to initialize source location - package fragment root does not exist.
172170
PackageFragmentRootSourceLocation_Exception_occurred_initializing_source_location__8=Exception occurred initializing source location.

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java

Lines changed: 0 additions & 145 deletions
This file was deleted.

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ public class StandardVMType extends AbstractVMInstallType {
8787

8888
/**
8989
* The minimal -Xmx size for launching a JVM. <br>
90-
* <b>Note:</b> Must be omitted for Standard11xVM! <br>
9190
* <b>Note:</b> Must be at least -Xmx16m for JRockit, see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=433455">bug 433455</a>.
9291
*
9392
* @since 3.7.100

org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2024 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -41,7 +41,6 @@
4141
import org.eclipse.debug.core.model.IStreamsProxy;
4242
import org.eclipse.jdt.internal.launching.LaunchingMessages;
4343
import org.eclipse.jdt.internal.launching.LaunchingPlugin;
44-
import org.eclipse.jdt.internal.launching.Standard11xVM;
4544
import org.eclipse.jdt.internal.launching.StandardVMType;
4645
import org.eclipse.osgi.util.NLS;
4746
import org.w3c.dom.Document;
@@ -378,9 +377,7 @@ public Map<String, String> evaluateSystemProperties(String[] properties, IProgre
378377
if (runner == null) {
379378
abort(NLS.bind(LaunchingMessages.AbstractVMInstall_0, ""), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
380379
}
381-
if (!(this instanceof Standard11xVM)) {
382-
config.setVMArguments(new String[] { StandardVMType.MIN_VM_SIZE });
383-
}
380+
config.setVMArguments(new String[] { StandardVMType.MIN_VM_SIZE });
384381
config.setProgramArguments(properties);
385382
Launch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
386383
if (monitor.isCanceled()) {

org.eclipse.jdt.launching/plugin.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
class="org.eclipse.jdt.internal.launching.StandardVMType"
3737
id="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType">
3838
</vmInstallType>
39-
<vmInstallType
40-
class="org.eclipse.jdt.internal.launching.Standard11xVMType"
41-
id="org.eclipse.jdt.launching.Standard11xVMType">
42-
</vmInstallType>
4339
<vmInstallType
4440
class="org.eclipse.jdt.internal.launching.EEVMType"
4541
id="org.eclipse.jdt.launching.EEVMType">

0 commit comments

Comments
 (0)