This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 81872488c2 Revert PR4025 "Open clean up code base to remove Windows 95
& 98 support.." due to compile time constant changes.
new 03bb14800c Merge pull request #4498 from neilcsmith-net/revert-nb4025
81872488c2 is described below
commit 81872488c2d3b8f8651095e6a6084824695b1769
Author: Neil C Smith <[email protected]>
AuthorDate: Fri Aug 12 09:13:41 2022 +0100
Revert PR4025 "Open clean up code base to remove Windows 95 & 98 support.."
due to compile time constant changes.
This reverts commit 20818f45e3296e33838612592ff10c9f2157c083.
---
.../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, 119 insertions(+), 38 deletions(-)
diff --git
a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
index d87a45b9a7..685161846f 100644
--- a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
+++ b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
@@ -356,14 +356,16 @@ public class NbDdeBrowserImpl extends ExtBrowserImpl {
}
logFine("urlstr:", urlStr); // NOI18N
- 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);
- }
+ 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);
+ }
+ }
logFine("firstpart"); // NOI18N
if (!triedStart) {
@@ -443,6 +445,15 @@ 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 a2cae95b19..5a924712dd 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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
+ <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">
<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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
+ <exec os="Windows NT Windows 95 Windows 98 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 56064a2ef2..defab19e67 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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
+ <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">
<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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
+ <exec os="Windows NT Windows 95 Windows 98 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 25eb5bdbfd..aba74820c2 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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
+ <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">
<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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
+ <exec os="Windows NT Windows 95 Windows 98 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 d8c35dc49c..f9253586ff 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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000">
+ <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">
<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 2000 Windows 2003 Windows XP"
executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
+ <exec os="Windows NT Windows 95 Windows 98 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 2836ce03db..01db477f45 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 2000 Windows XP"
+ <exec os="Windows NT Windows 95 Windows 98 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 2000 Windows XP"
+ <exec os="Windows NT Windows 95 Windows 98 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 2000 Windows XP"
+<exec os="Windows NT Windows 95 Windows 98 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 5eb831681a..edbfa5543a 100644
--- a/nbi/engine/native/launcher/windows/src/ExtractUtils.c
+++ b/nbi/engine/native/launcher/windows/src/ExtractUtils.c
@@ -60,6 +60,7 @@ 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 e7b7b755f0..5a819eed05 100644
--- a/nbi/engine/native/launcher/windows/src/Main.c
+++ b/nbi/engine/native/launcher/windows/src/Main.c
@@ -634,22 +634,27 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hi,
LPSTR lpCmdLine, int nCmd
globalInstance = hInstance;
UNREFERENCED_PARAMETER(lpCmdLine);
initWow64();
- if(!createEvents()) {
- status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR;
+ if(is9x()) {
+ MessageBoxA(0, "Windows 9X platform is not supported", "Message",
MB_OK);
+ status = EXIT_CODE_SYSTEM_ERROR;
} else {
- LauncherProperties * props = createLauncherProperties();
- createLauncherThread(props);
- if(!createGui(props, hInstance, hi, nCmdShow)) {
- status = EXIT_CODE_GUI_INITIALIZATION_ERROR;
+ if(!createEvents()) {
+ status = EXIT_CODE_EVENTS_INITIALIZATION_ERROR;
} else {
- messageLoop(props);
- WaitForSingleObject(closingWindowsConfirmed, INFINITE);
+ 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);
}
-
- 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 983ea13121..c8b423ec79 100644
--- a/nbi/engine/native/launcher/windows/src/SystemUtils.c
+++ b/nbi/engine/native/launcher/windows/src/SystemUtils.c
@@ -36,6 +36,11 @@ 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 bdbffc5001..69437f83fb 100644
--- a/nbi/engine/native/launcher/windows/src/SystemUtils.h
+++ b/nbi/engine/native/launcher/windows/src/SystemUtils.h
@@ -24,6 +24,7 @@
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 7f94e09ec9..0bd85453f3 100644
--- a/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java
+++ b/platform/core.output2/src/org/netbeans/core/output2/OutWriter.java
@@ -52,7 +52,11 @@ class OutWriter extends PrintWriter {
private boolean disposeOnClose = false;
- private static final boolean USE_HEAP_STORAGE =
Boolean.getBoolean("nb.output.heap");
+ //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;
/**
* 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 ae79b9853e..312cc10835 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,8 +56,12 @@ 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_WINNT << 1;
+ public static final int OS_SOLARIS = OS_WIN98 << 1;
/** Operating system is Linux. */
public static final int OS_LINUX = OS_SOLARIS << 1;
/** Operating system is HP-UX. */
@@ -93,7 +97,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_WIN2000 |
OS_WIN_OTHER;
+ public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 |
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;
@@ -111,6 +115,10 @@ 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 cb4fedfc33..3c868ebcb1 100644
--- a/platform/openide.compat/nbproject/org-openide-compat.sig
+++ b/platform/openide.compat/nbproject/org-openide-compat.sig
@@ -994,6 +994,8 @@ 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
@@ -1635,6 +1637,8 @@ 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 15868a6b46..19ace4bda7 100644
--- a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
+++ b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
@@ -649,6 +649,8 @@ 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
@@ -1261,6 +1263,8 @@ 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 2662f7725d..8ec497fcc8 100644
--- a/platform/openide.util.ui/nbproject/org-openide-util.sig
+++ b/platform/openide.util.ui/nbproject/org-openide-util.sig
@@ -1178,6 +1178,8 @@ 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 f32954401d..2f513f2bfa 100644
--- a/platform/openide.util.ui/src/org/openide/util/Utilities.java
+++ b/platform/openide.util.ui/src/org/openide/util/Utilities.java
@@ -95,6 +95,12 @@ 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 1938803605..18aa7e6cf6 100644
--- a/platform/openide.util/nbproject/org-openide-util.sig
+++ b/platform/openide.util/nbproject/org-openide-util.sig
@@ -497,6 +497,8 @@ 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 ba40790b42..9f1f5ee9d8 100644
--- a/platform/openide.util/src/org/openide/util/BaseUtilities.java
+++ b/platform/openide.util/src/org/openide/util/BaseUtilities.java
@@ -59,8 +59,14 @@ 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_WINNT << 1;
+ public static final int OS_SOLARIS = OS_WIN98 << 1;
/** Operating system is Linux. */
public static final int OS_LINUX = OS_SOLARIS << 1;
@@ -130,7 +136,7 @@ public abstract class BaseUtilities {
* @deprecated Use {@link #isWindows()} instead.
*/
@Deprecated
- public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN2000 |
OS_WINVISTA | OS_WIN_OTHER;
+ public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 |
OS_WIN2000 | OS_WINVISTA | OS_WIN_OTHER;
/** A mask for Unix platforms.
* @deprecated Use {@link #isUnix()} instead.
@@ -209,6 +215,10 @@ 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 3110c2584b..128770693b 100644
--- a/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig
+++ b/profiler/lib.profiler/nbproject/org-netbeans-lib-profiler.sig
@@ -1023,6 +1023,8 @@ 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 341be93a9a..ae9107bcb3 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,6 +38,16 @@ 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.
*/
@@ -106,7 +116,7 @@ public class Platform implements CommonConstants {
/**
* A mask for Windows platforms.
*/
- public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN2000 |
OS_WIN_OTHER;
+ public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 |
OS_WIN2000 | OS_WIN_OTHER;
/**
* A mask for Unix platforms.
@@ -391,6 +401,12 @@ 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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
