8180286: Remove the launchers data model flags -d32/-d64
authorksrini
Fri, 26 May 2017 07:39:18 -0700
changeset 45281 122c607f82da
parent 45280 49ede353bf43
child 45282 e1cef38d150d
8180286: Remove the launchers data model flags -d32/-d64 Reviewed-by: alanb, dholmes, mchung
jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties
--- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Fri May 26 17:36:22 2017 +0800
+++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Fri May 26 07:39:18 2017 -0700
@@ -363,10 +363,6 @@
     static void initHelpMessage(String progname) {
         outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.header",
                 (progname == null) ? "java" : progname ));
-        outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel",
-                32));
-        outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel",
-                64));
     }
 
     /**
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Fri May 26 17:36:22 2017 +0800
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Fri May 26 07:39:18 2017 -0700
@@ -34,7 +34,6 @@
 \ <module>/<mainclass> are passed as the arguments to main class.\n\n\
 \ where options include:\n\n
 
-java.launcher.opt.datamodel  =\    -d{0}\t  Deprecated, will be removed in a future release\n
 java.launcher.opt.vmselect   =\    {0}\t  to select the "{1}" VM\n
 java.launcher.opt.hotspot    =\    {0}\t  is a synonym for the "{1}" VM  [deprecated]\n