This is an automated email from the ASF dual-hosted git repository. bwalker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 20818f45e3 Open clean up code base to remove Windows 95 & 98 support.. 20818f45e3 is described below commit 20818f45e3296e33838612592ff10c9f2157c083 Author: Brad Walker <bwal...@musings.com> AuthorDate: Sun Apr 24 18:49:57 2022 -0600 Open clean up code base to remove Windows 95 & 98 support.. Windows 95 & Windows 98 support is no longer provided by the base JVM. Matter of fact, support ended in Java 5 for these platforms. This cleans up the code base to no longer support these obsolete platforms. --- .../modules/extbrowser/NbDdeBrowserImpl.java | 27 ++++++------------- .../XMLFormatterTest/testReformatSample2.pass | 4 +-- .../testReformat/netbeans_build.xml | 4 +-- .../XMLFormatterTest/testReformatSample2.pass | 4 +-- .../testReformat/netbeans_build.xml | 4 +-- java/performance/sparrow/build.xml | 6 ++--- .../native/launcher/windows/src/ExtractUtils.c | 1 - nbi/engine/native/launcher/windows/src/Main.c | 31 +++++++++------------- .../native/launcher/windows/src/SystemUtils.c | 5 ---- .../native/launcher/windows/src/SystemUtils.h | 1 - .../src/org/netbeans/core/output2/OutWriter.java | 6 +---- .../beanstubs/org/openide/util/Utilities.java | 12 ++------- .../nbproject/org-openide-compat.sig | 4 --- .../nbproject/org-openide-util-ui.sig | 4 --- .../openide.util.ui/nbproject/org-openide-util.sig | 2 -- .../src/org/openide/util/Utilities.java | 6 ----- .../openide.util/nbproject/org-openide-util.sig | 2 -- .../src/org/openide/util/BaseUtilities.java | 14 ++-------- .../nbproject/org-netbeans-lib-profiler.sig | 2 -- .../org/netbeans/lib/profiler/global/Platform.java | 18 +------------ 20 files changed, 38 insertions(+), 119 deletions(-) diff --git a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java index 685161846f..d87a45b9a7 100644 --- a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java +++ b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java @@ -356,16 +356,14 @@ public class NbDdeBrowserImpl extends ExtBrowserImpl { } logFine("urlstr:", urlStr); // NOI18N - if (!win9xHack(task.browser.realDDEServer())) { - StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage (NbDdeBrowserImpl.class, "MSG_activatingBrowser")); - try { - task.browser.reqDdeMessage(task.browser.realDDEServer(),WWW_ACTIVATE,"-1,0x0",task.browser.getActivateTimeout()); - } catch (NbBrowserException ex) { - logFine("Exception, gonna start browser:", ex); - triedStart = true; - startBrowser(task.browser.extBrowserFactory.getBrowserExecutable(), urlStr); - } - } + StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage (NbDdeBrowserImpl.class, "MSG_activatingBrowser")); + try { + task.browser.reqDdeMessage(task.browser.realDDEServer(),WWW_ACTIVATE,"-1,0x0",task.browser.getActivateTimeout()); + } catch (NbBrowserException ex) { + logFine("Exception, gonna start browser:", ex); + triedStart = true; + startBrowser(task.browser.extBrowserFactory.getBrowserExecutable(), urlStr); + } logFine("firstpart"); // NOI18N if (!triedStart) { @@ -445,15 +443,6 @@ public class NbDdeBrowserImpl extends ExtBrowserImpl { return url; } - /** - * Checks for IExplorer & Win9x combination. - */ - private boolean win9xHack (String browser) { - return browser.equals(ExtWebBrowser.IEXPLORE) - && (Utilities.getOperatingSystem() == Utilities.OS_WIN98 - || Utilities.getOperatingSystem() == Utilities.OS_WIN95); - } - /** * Utility function that tries to start new browser process. * diff --git a/ide/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass b/ide/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass index 5a924712dd..a2cae95b19 100644 --- a/ide/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass +++ b/ide/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass @@ -748,7 +748,7 @@ Link to<A HREF="overview-summary.html">Non-frame version.</A> <!-- possibly after filtering for duplicates or something like this. --> <!-- Timeout is ten minutes; should be enough for valid start, while preventing --> <!-- a deadlock from hanging an automated build: --> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> @@ -828,7 +828,7 @@ Link to<A HREF="overview-summary.html">Non-frame version.</A> > <property name="tryme.debug.args" value="" /> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> diff --git a/ide/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml b/ide/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml index defab19e67..56064a2ef2 100644 --- a/ide/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml +++ b/ide/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml @@ -748,7 +748,7 @@ PKGINST=${pkg.svr4.pkginst}</echo> <!-- possibly after filtering for duplicates or something like this. --> <!-- Timeout is ten minutes; should be enough for valid start, while preventing --> <!-- a deadlock from hanging an automated build: --> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> @@ -828,7 +828,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d > <property name="tryme.debug.args" value="" /> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> diff --git a/ide/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass b/ide/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass index aba74820c2..25eb5bdbfd 100644 --- a/ide/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass +++ b/ide/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass @@ -748,7 +748,7 @@ Link to<A HREF="overview-summary.html">Non-frame version.</A> <!-- possibly after filtering for duplicates or something like this. --> <!-- Timeout is ten minutes; should be enough for valid start, while preventing --> <!-- a deadlock from hanging an automated build: --> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> @@ -828,7 +828,7 @@ Link to<A HREF="overview-summary.html">Non-frame version.</A> > <property name="tryme.debug.args" value="" /> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> diff --git a/ide/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml b/ide/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml index f9253586ff..d8c35dc49c 100644 --- a/ide/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml +++ b/ide/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/netbeans_build.xml @@ -748,7 +748,7 @@ PKGINST=${pkg.svr4.pkginst}</echo> <!-- possibly after filtering for duplicates or something like this. --> <!-- Timeout is ten minutes; should be enough for valid start, while preventing --> <!-- a deadlock from hanging an automated build: --> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> @@ -828,7 +828,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d > <property name="tryme.debug.args" value="" /> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> + <exec os="Windows NT Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> <arg value="--jdkhome"/> <arg file="${nbjdk.home}"/> <arg value="--userdir"/> diff --git a/java/performance/sparrow/build.xml b/java/performance/sparrow/build.xml index 01db477f45..2836ce03db 100644 --- a/java/performance/sparrow/build.xml +++ b/java/performance/sparrow/build.xml @@ -112,7 +112,7 @@ depends="create-userdir,add-userdir"> <echo>Warmup 1 - running IDE once to prime disk and memory caches and create userdir</echo> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" + <exec os="Windows NT Windows 2000 Windows XP" executable="${netbeans.home}/bin/runide.exe" failonerror="yes" timeout="600000"> <arg value="-J-Dnetbeans.close=true"/> </exec> @@ -123,7 +123,7 @@ </exec> <echo>Warmup 2 - running IDE a second time prime disk and memory caches and create userdir</echo> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" + <exec os="Windows NT Windows 2000 Windows XP" executable="${netbeans.home}/bin/runide.exe" failonerror="yes" timeout="600000"> <arg value="-J-Dnetbeans.close=true"/> </exec> @@ -305,7 +305,7 @@ Copying ide.log</echo> <target name="runide-freshuserdir" depends="delete-userdir,create-userdir,runide" /> <target name="runide" description="Start the IDE with the userdir specified in the userdir property"> -<exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" +<exec os="Windows NT Windows 2000 Windows XP" executable="${netbeans.home}/bin/runide.exe" failonerror="yes" timeout="600000" output="${gclog}_${index}"> </exec> diff --git a/nbi/engine/native/launcher/windows/src/ExtractUtils.c b/nbi/engine/native/launcher/windows/src/ExtractUtils.c index edbfa5543a..5eb831681a 100644 --- a/nbi/engine/native/launcher/windows/src/ExtractUtils.c +++ b/nbi/engine/native/launcher/windows/src/ExtractUtils.c @@ -60,7 +60,6 @@ void skipStub(LauncherProperties * props) { WCHAR * os; props->status = EXIT_CODE_STUB; os = appendStringW(NULL, L"It`s only the launcher stub.\nOS: "); - if(is9x()) os = appendStringW(os, L"Windows 9x"); if(isNT()) os = appendStringW(os, L"Windows NT"); if(is2k()) os = appendStringW(os, L"Windows 2000"); if(isXP()) os = appendStringW(os, L"Windows XP"); diff --git a/nbi/engine/native/launcher/windows/src/Main.c b/nbi/engine/native/launcher/windows/src/Main.c index 5a819eed05..e7b7b755f0 100644 --- a/nbi/engine/native/launcher/windows/src/Main.c +++ b/nbi/engine/native/launcher/windows/src/Main.c @@ -634,27 +634,22 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hi, LPSTR lpCmdLine, int nCmd globalInstance = hInstance; UNREFERENCED_PARAMETER(lpCmdLine); initWow64(); - if(is9x()) { - MessageBoxA(0, "Windows 9X platform is not supported", "Message", MB_OK); - status = EXIT_CODE_SYSTEM_ERROR; + if(!createEvents()) { + status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR; } else { - if(!createEvents()) { - status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR; + LauncherProperties * props = createLauncherProperties(); + createLauncherThread(props); + if(!createGui(props, hInstance, hi, nCmdShow)) { + status = EXIT_CODE_GUI_INITIALIZATION_ERROR; } else { - LauncherProperties * props = createLauncherProperties(); - createLauncherThread(props); - if(!createGui(props, hInstance, hi, nCmdShow)) { - status = EXIT_CODE_GUI_INITIALIZATION_ERROR; - } else { - messageLoop(props); - WaitForSingleObject(closingWindowsConfirmed, INFINITE); - } - - status = props->status; - exitCode = props->exitCode; - printStatus(props); - freeLauncherProperties(&props); + messageLoop(props); + WaitForSingleObject(closingWindowsConfirmed, INFINITE); } + + status = props->status; + exitCode = props->exitCode; + printStatus(props); + freeLauncherProperties(&props); } FREE(currentProgressSize); FREE(totalProgressSize); diff --git a/nbi/engine/native/launcher/windows/src/SystemUtils.c b/nbi/engine/native/launcher/windows/src/SystemUtils.c index c8b423ec79..983ea13121 100644 --- a/nbi/engine/native/launcher/windows/src/SystemUtils.c +++ b/nbi/engine/native/launcher/windows/src/SystemUtils.c @@ -36,11 +36,6 @@ void getOSVersion(DWORD *id, DWORD *major, DWORD *minor, DWORD *productType) { return; } -DWORD is9x() { - DWORD id, major, minor, type; - getOSVersion(& id, & major, & minor, & type); - return (id == VER_PLATFORM_WIN32_WINDOWS) ? 1 : 0; -} DWORD isNT() { DWORD id, major, minor, type; getOSVersion(& id, & major, & minor, & type); diff --git a/nbi/engine/native/launcher/windows/src/SystemUtils.h b/nbi/engine/native/launcher/windows/src/SystemUtils.h index 69437f83fb..bdbffc5001 100644 --- a/nbi/engine/native/launcher/windows/src/SystemUtils.h +++ b/nbi/engine/native/launcher/windows/src/SystemUtils.h @@ -24,7 +24,6 @@ extern "C" { #endif -DWORD is9x(); DWORD isNT(); DWORD isXP(); DWORD is2k(); diff --git a/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java b/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java index 0bd85453f3..7f94e09ec9 100644 --- a/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java +++ b/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java @@ -52,11 +52,7 @@ class OutWriter extends PrintWriter { private boolean disposeOnClose = false; - //IZ 44375 - Memory mapping fails with bad file handle on win 98 - private static final boolean USE_HEAP_STORAGE = - Boolean.getBoolean("nb.output.heap") || Utilities.getOperatingSystem() == //NOI18N - Utilities.OS_WIN98 || - Utilities.getOperatingSystem() == Utilities.OS_WIN95; + private static final boolean USE_HEAP_STORAGE = Boolean.getBoolean("nb.output.heap"); /** * Byte array used to write the line separator after line writes. diff --git a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java index 312cc10835..ae79b9853e 100644 --- a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java +++ b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java @@ -56,12 +56,8 @@ public final class Utilities { /** Operating system is Windows NT. */ public static final int OS_WINNT = 1 << 0; - /** Operating system is Windows 95. */ - public static final int OS_WIN95 = OS_WINNT << 1; - /** Operating system is Windows 98. */ - public static final int OS_WIN98 = OS_WIN95 << 1; /** Operating system is Solaris. */ - public static final int OS_SOLARIS = OS_WIN98 << 1; + public static final int OS_SOLARIS = OS_WINNT << 1; /** Operating system is Linux. */ public static final int OS_LINUX = OS_SOLARIS << 1; /** Operating system is HP-UX. */ @@ -97,7 +93,7 @@ public final class Utilities { public static final int OS_FREEBSD = OS_OTHER << 1; /** A mask for Windows platforms. */ - public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 | OS_WIN2000 | OS_WIN_OTHER; + public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN2000 | OS_WIN_OTHER; /** A mask for Unix platforms. */ public static final int OS_UNIX_MASK = OS_SOLARIS | OS_LINUX | OS_HP | OS_AIX | OS_IRIX | OS_SUNOS | OS_TRU64 | OS_MAC | OS_FREEBSD; @@ -115,10 +111,6 @@ public final class Utilities { String osName = System.getProperty ("os.name"); if ("Windows NT".equals (osName)) // NOI18N operatingSystem = OS_WINNT; - else if ("Windows 95".equals (osName)) // NOI18N - operatingSystem = OS_WIN95; - else if ("Windows 98".equals (osName)) // NOI18N - operatingSystem = OS_WIN98; else if ("Windows 2000".equals (osName)) // NOI18N operatingSystem = OS_WIN2000; else if (osName.startsWith("Windows ")) // NOI18N diff --git a/platform/openide.compat/nbproject/org-openide-compat.sig b/platform/openide.compat/nbproject/org-openide-compat.sig index ec6390ce06..5d060e6d12 100644 --- a/platform/openide.compat/nbproject/org-openide-compat.sig +++ b/platform/openide.compat/nbproject/org-openide-compat.sig @@ -994,8 +994,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 @@ -1637,8 +1635,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 diff --git a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig index 19ace4bda7..15868a6b46 100644 --- a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig +++ b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig @@ -649,8 +649,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 @@ -1263,8 +1261,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 diff --git a/platform/openide.util.ui/nbproject/org-openide-util.sig b/platform/openide.util.ui/nbproject/org-openide-util.sig index 8ec497fcc8..2662f7725d 100644 --- a/platform/openide.util.ui/nbproject/org-openide-util.sig +++ b/platform/openide.util.ui/nbproject/org-openide-util.sig @@ -1178,8 +1178,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 diff --git a/platform/openide.util.ui/src/org/openide/util/Utilities.java b/platform/openide.util.ui/src/org/openide/util/Utilities.java index 2f513f2bfa..f32954401d 100644 --- a/platform/openide.util.ui/src/org/openide/util/Utilities.java +++ b/platform/openide.util.ui/src/org/openide/util/Utilities.java @@ -95,12 +95,6 @@ public final class Utilities { /** Operating system is Windows NT. */ public static final int OS_WINNT = BaseUtilities.OS_WINNT; - /** Operating system is Windows 95. */ - public static final int OS_WIN95 = BaseUtilities.OS_WIN95; - - /** Operating system is Windows 98. */ - public static final int OS_WIN98 = BaseUtilities.OS_WIN98; - /** Operating system is Solaris. */ public static final int OS_SOLARIS = BaseUtilities.OS_SOLARIS; diff --git a/platform/openide.util/nbproject/org-openide-util.sig b/platform/openide.util/nbproject/org-openide-util.sig index 2e9a1f1582..8ce96fc216 100644 --- a/platform/openide.util/nbproject/org-openide-util.sig +++ b/platform/openide.util/nbproject/org-openide-util.sig @@ -497,8 +497,6 @@ fld public final static int OS_UNIX_MASK = 1709048 fld public final static int OS_UNIX_OTHER = 524288 fld public final static int OS_VMS = 16384 fld public final static int OS_WIN2000 = 8192 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 303111 anno 0 java.lang.Deprecated() fld public final static int OS_WINNT = 1 diff --git a/platform/openide.util/src/org/openide/util/BaseUtilities.java b/platform/openide.util/src/org/openide/util/BaseUtilities.java index 9f1f5ee9d8..ba40790b42 100644 --- a/platform/openide.util/src/org/openide/util/BaseUtilities.java +++ b/platform/openide.util/src/org/openide/util/BaseUtilities.java @@ -59,14 +59,8 @@ public abstract class BaseUtilities { /** Operating system is Windows NT. */ public static final int OS_WINNT = 1/* << 0*/; - /** Operating system is Windows 95. */ - public static final int OS_WIN95 = OS_WINNT << 1; - - /** Operating system is Windows 98. */ - public static final int OS_WIN98 = OS_WIN95 << 1; - /** Operating system is Solaris. */ - public static final int OS_SOLARIS = OS_WIN98 << 1; + public static final int OS_SOLARIS = OS_WINNT << 1; /** Operating system is Linux. */ public static final int OS_LINUX = OS_SOLARIS << 1; @@ -136,7 +130,7 @@ public abstract class BaseUtilities { * @deprecated Use {@link #isWindows()} instead. */ @Deprecated - public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 | OS_WIN2000 | OS_WINVISTA | OS_WIN_OTHER; + public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN2000 | OS_WINVISTA | OS_WIN_OTHER; /** A mask for Unix platforms. * @deprecated Use {@link #isUnix()} instead. @@ -215,10 +209,6 @@ public abstract class BaseUtilities { if ("Windows NT".equals(osName)) { // NOI18N operatingSystem = OS_WINNT; - } else if ("Windows 95".equals(osName)) { // NOI18N - operatingSystem = OS_WIN95; - } else if ("Windows 98".equals(osName)) { // NOI18N - operatingSystem = OS_WIN98; } else if ("Windows 2000".equals(osName)) { // NOI18N operatingSystem = OS_WIN2000; } else if ("Windows Vista".equals(osName)) { // NOI18N diff --git a/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig b/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig index 39ae2873dc..55cb7f54f4 100644 --- a/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig +++ b/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig @@ -1021,8 +1021,6 @@ fld public final static int OS_TRU64 = 512 fld public final static int OS_UNIX_MASK = 3064 fld public final static int OS_VMS = 8192 fld public final static int OS_WIN2000 = 4096 -fld public final static int OS_WIN95 = 2 -fld public final static int OS_WIN98 = 4 fld public final static int OS_WINDOWS_MASK = 20487 fld public final static int OS_WINNT = 1 fld public final static int OS_WIN_OTHER = 16384 diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java index ae9107bcb3..341be93a9a 100644 --- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java +++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java @@ -38,16 +38,6 @@ public class Platform implements CommonConstants { */ public static final int OS_WINNT = 1; - /** - * Operating system is Windows 95. - */ - public static final int OS_WIN95 = 2; - - /** - * Operating system is Windows 98. - */ - public static final int OS_WIN98 = 4; - /** * Operating system is Solaris. */ @@ -116,7 +106,7 @@ public class Platform implements CommonConstants { /** * A mask for Windows platforms. */ - public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 | OS_WIN2000 | OS_WIN_OTHER; + public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN2000 | OS_WIN_OTHER; /** * A mask for Unix platforms. @@ -401,12 +391,6 @@ public class Platform implements CommonConstants { if ("Windows NT".equals(osName)) { // NOI18N return OS_WINNT; - } else if ("Windows 95".equals(osName)) { // NOI18N - - return OS_WIN95; - } else if ("Windows 98".equals(osName)) { // NOI18N - - return OS_WIN98; } else if ("Windows 2000".equals(osName)) { // NOI18N return OS_WIN2000; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists