? cvs.diff
? cvs.out
Index: loaders/src/org/openide/loaders/ExtensionList.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/ExtensionList.java,v
retrieving revision 1.4
diff -u -r1.4 ExtensionList.java
--- loaders/src/org/openide/loaders/ExtensionList.java 8 Jun 2004 09:02:09 -0000 1.4
+++ loaders/src/org/openide/loaders/ExtensionList.java 19 Sep 2004 12:55:01 -0000
@@ -30,7 +30,7 @@
/** if true, ignore case of file extensions (not MIME types tho!) */
private static final boolean CASE_INSENSITIVE =
- Utilities.isWindows() || Utilities.getOperatingSystem() == Utilities.OS_VMS;
+ Utilities.isWindows() || Utilities.isOS2() || Utilities.getOperatingSystem() == Utilities.OS_VMS;
/** set of extensions to recognize */
private TreeSet list;
Index: loaders/src/org/openide/loaders/NewObjectWizardPanel.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/NewObjectWizardPanel.java,v
retrieving revision 1.4
diff -u -r1.4 NewObjectWizardPanel.java
--- loaders/src/org/openide/loaders/NewObjectWizardPanel.java 14 Jun 2004 14:32:12 -0000 1.4
+++ loaders/src/org/openide/loaders/NewObjectWizardPanel.java 19 Sep 2004 12:55:02 -0000
@@ -113,7 +113,7 @@
errorMsg = NbBundle.getMessage(TemplateWizard2.class, "MSG_file_already_exist", f.getNameExt()); //NOI18N
isOK = false;
}
- if (org.openide.util.Utilities.isWindows ()) {
+ if (org.openide.util.Utilities.isWindows () || org.openide.util.Utilities.isOS2()) {
if (TemplateWizard.checkCaseInsensitiveName (targetFolder.getPrimaryFile (), getPanelUI ().getNewObjectName (), extension)) {
errorMsg = NbBundle.getMessage(TemplateWizard2.class, "MSG_file_already_exist", getPanelUI ().getNewObjectName ()); // NOI18N
isOK = false;
Index: loaders/src/org/openide/loaders/TemplateWizard2.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/TemplateWizard2.java,v
retrieving revision 1.4
diff -u -r1.4 TemplateWizard2.java
--- loaders/src/org/openide/loaders/TemplateWizard2.java 1 Mar 2004 09:53:17 -0000 1.4
+++ loaders/src/org/openide/loaders/TemplateWizard2.java 19 Sep 2004 12:55:03 -0000
@@ -266,7 +266,7 @@
return NbBundle.getMessage(TemplateWizard2.class, "MSG_file_already_exist", sb.toString()); // NOI18N
}
- if (org.openide.util.Utilities.isWindows ()) {
+ if (org.openide.util.Utilities.isWindows () || org.openide.util.Utilities.isOS2 ()) {
if (TemplateWizard.checkCaseInsensitiveName (locationFolder.getPrimaryFile (), newObjectName.getText (), extension)) {
return NbBundle.getMessage(TemplateWizard2.class, "MSG_file_already_exist", newObjectName.getText ()); // NOI18N
}
Index: masterfs/src/org/netbeans/modules/masterfs/MasterFileObject.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/MasterFileObject.java,v
retrieving revision 1.33
diff -u -r1.33 MasterFileObject.java
--- masterfs/src/org/netbeans/modules/masterfs/MasterFileObject.java 10 Sep 2004 07:30:51 -0000 1.33
+++ masterfs/src/org/netbeans/modules/masterfs/MasterFileObject.java 19 Sep 2004 12:55:08 -0000
@@ -255,7 +255,7 @@
if (retVal == null) {
File f = childResourcePath.getFile();
boolean canRefresh = true;
- if (Utilities.isWindows() && childResourcePath.getParent().isRoot()) {
+ if ((Utilities.isWindows()||Utilities.isOS2()) && childResourcePath.getParent().isRoot()) {
canRefresh = (SpecialDelegates.checkValidWindowsDrive(f) != null);
}
if (canRefresh) {
Index: masterfs/src/org/netbeans/modules/masterfs/MasterURLMapper.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/MasterURLMapper.java,v
retrieving revision 1.6
diff -u -r1.6 MasterURLMapper.java
--- masterfs/src/org/netbeans/modules/masterfs/MasterURLMapper.java 30 Jun 2004 10:10:27 -0000 1.6
+++ masterfs/src/org/netbeans/modules/masterfs/MasterURLMapper.java 19 Sep 2004 12:55:08 -0000
@@ -68,7 +68,7 @@
}
private static boolean isWindowsDriveRoot(File file) {
- return Utilities.isWindows() && file.getParent() == null;
+ return (Utilities.isWindows()||Utilities.isOS2()) && file.getParent() == null;
}
static URL fileToURL(File file) throws MalformedURLException {
Index: masterfs/src/org/netbeans/modules/masterfs/ResourcePath.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/ResourcePath.java,v
retrieving revision 1.7
diff -u -r1.7 ResourcePath.java
--- masterfs/src/org/netbeans/modules/masterfs/ResourcePath.java 24 Jun 2004 16:03:18 -0000 1.7
+++ masterfs/src/org/netbeans/modules/masterfs/ResourcePath.java 19 Sep 2004 12:55:08 -0000
@@ -47,7 +47,7 @@
File getFile () {
// XXX this is ugly and fragile; revisit
- if (Utilities.isWindows()) {
+ if (Utilities.isWindows()||Utilities.isOS2()) {
File retVal = null;
// Windows: resourcePath is e.g. /d:/temp/foo.txt
if (!isRoot()) {
Index: masterfs/src/org/netbeans/modules/masterfs/SpecialDelegates.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/SpecialDelegates.java,v
retrieving revision 1.10
diff -u -r1.10 SpecialDelegates.java
--- masterfs/src/org/netbeans/modules/masterfs/SpecialDelegates.java 2 Sep 2004 13:46:54 -0000 1.10
+++ masterfs/src/org/netbeans/modules/masterfs/SpecialDelegates.java 19 Sep 2004 12:55:10 -0000
@@ -54,7 +54,7 @@
*/
static FileObject get(final ResourcePath resPath) {
FileObject retVal;
- if (Utilities.isWindows())
+ if (Utilities.isWindows()||Utilities.isOS2())
retVal = getForWindows(resPath);
else if (Utilities.getOperatingSystem() == Utilities.OS_VMS)
retVal = getForVMS(resPath);
Index: masterfs/src/org/netbeans/modules/masterfs/providers/Attributes.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/providers/Attributes.java,v
retrieving revision 1.6
diff -u -r1.6 Attributes.java
--- masterfs/src/org/netbeans/modules/masterfs/providers/Attributes.java 26 Aug 2004 14:58:34 -0000 1.6
+++ masterfs/src/org/netbeans/modules/masterfs/providers/Attributes.java 19 Sep 2004 12:55:11 -0000
@@ -57,7 +57,7 @@
private String preparePrefix(File fileSystemRoot) {
fileSystemRoot = FileUtil.normalizeFile(fileSystemRoot);
String rootPath = fileSystemRoot.getAbsolutePath().replace('\\', '/');
- return (Utilities.isWindows()) ? rootPath.toLowerCase() : rootPath;
+ return (Utilities.isWindows()||Utilities.isOS2()) ? rootPath.toLowerCase() : rootPath;
}
public static File getRootForAttributes() {
Index: masterfs/test/unit/src/org/netbeans/modules/masterfs/MasterFileObjectTestHid.java
===================================================================
RCS file: /cvs/openide/masterfs/test/unit/src/org/netbeans/modules/masterfs/MasterFileObjectTestHid.java,v
retrieving revision 1.16
diff -u -r1.16 MasterFileObjectTestHid.java
--- masterfs/test/unit/src/org/netbeans/modules/masterfs/MasterFileObjectTestHid.java 16 Sep 2004 10:53:43 -0000 1.16
+++ masterfs/test/unit/src/org/netbeans/modules/masterfs/MasterFileObjectTestHid.java 19 Sep 2004 12:55:12 -0000
@@ -249,7 +249,7 @@
public void testNormalizeDrivesOnWindows48681 () {
- if (org.openide.util.Utilities.isWindows()) {
+ if (org.openide.util.Utilities.isWindows()||org.openide.util.Utilities.isOS2()) {
File[] roots = File.listRoots();
for (int i = 0; i < roots.length; i++) {
File file = roots[i];
Index: registry/src/org/netbeans/modules/registry/mergedctx/Resource.java
===================================================================
RCS file: /cvs/openide/registry/src/org/netbeans/modules/registry/mergedctx/Resource.java,v
retrieving revision 1.2
diff -u -r1.2 Resource.java
--- registry/src/org/netbeans/modules/registry/mergedctx/Resource.java 18 Sep 2003 11:40:00 -0000 1.2
+++ registry/src/org/netbeans/modules/registry/mergedctx/Resource.java 19 Sep 2004 12:55:14 -0000
@@ -72,7 +72,7 @@
String retValue = resourcePath;
//retValue = retValue.replace('/', '/');
//retValue = retValue.replace('.', '.');
- final int idx = Utilities.isWindows() ? 1 : 0;
+ final int idx = Utilities.isWindows()||Utilities.isOS2() ? 1 : 0;
return retValue.substring(idx);
}
Index: src/org/openide/filesystems/FileUtil.java
===================================================================
RCS file: /cvs/openide/src/org/openide/filesystems/FileUtil.java,v
retrieving revision 1.116
diff -u -r1.116 FileUtil.java
--- src/org/openide/filesystems/FileUtil.java 15 Sep 2004 07:12:28 -0000 1.116
+++ src/org/openide/filesystems/FileUtil.java 19 Sep 2004 12:55:22 -0000
@@ -328,7 +328,7 @@
}
try {
URL url = fileToURL(file);
- if (url.getAuthority() != null && Utilities.isWindows()) {
+ if (url.getAuthority() != null && (Utilities.isWindows()&&Utilities.isOS2())) {
return null;
}
retVal = URLMapper.findFileObject(url);
Index: src/org/openide/filesystems/LocalFileSystem.java
===================================================================
RCS file: /cvs/openide/src/org/openide/filesystems/LocalFileSystem.java,v
retrieving revision 1.64
diff -u -r1.64 LocalFileSystem.java
--- src/org/openide/filesystems/LocalFileSystem.java 16 Mar 2004 15:34:20 -0000 1.64
+++ src/org/openide/filesystems/LocalFileSystem.java 19 Sep 2004 12:55:25 -0000
@@ -134,7 +134,7 @@
*/
protected String computeSystemName (File rootFile) {
String retVal = rootFile.getAbsolutePath ().replace(File.separatorChar, '/');
- return (Utilities.isWindows()) ? retVal.toLowerCase() : retVal;
+ return (Utilities.isWindows()||Utilities.isOS2()) ? retVal.toLowerCase() : retVal;
}
//
Index: src/org/openide/util/Utilities.java
===================================================================
RCS file: /cvs/openide/src/org/openide/util/Utilities.java,v
retrieving revision 1.144
diff -u -r1.144 Utilities.java
--- src/org/openide/util/Utilities.java 8 Sep 2004 17:09:10 -0000 1.144
+++ src/org/openide/util/Utilities.java 19 Sep 2004 12:55:57 -0000
@@ -89,11 +89,8 @@
/** Operating system is unknown. */
public static final int OS_OTHER = 65536;
- //TODO: reavaluate OS_OS2 addition into the OS_WINDOWS_MASK
- //OS_OS2 added cause #44136: Filesystem support has been broken under OS/2
-
/** A mask for Windows platforms. */
- public static final int OS_WINDOWS_MASK = OS_WINNT | OS_WIN95 | OS_WIN98 | OS_WIN2000 | OS_WIN_OTHER | OS_OS2;
+ 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;
@@ -216,6 +213,14 @@
*/
public static final boolean isUnix () {
return (getOperatingSystem () & OS_UNIX_MASK) != 0;
+ }
+
+ /** Test whether the IDE is running on some variant of OS/2.
+ * @return true if OS/2 or eComStation,
+ * false if some other manner of operating system
+ */
+ public static final boolean isOS2 () {
+ return (getOperatingSystem () & OS_OS2) != 0;
}
/** The operating system on which NetBeans runs*/
Index: test/unit/src/org/openide/filesystems/FileObjectTestHid.java
===================================================================
RCS file: /cvs/openide/test/unit/src/org/openide/filesystems/FileObjectTestHid.java,v
retrieving revision 1.42
diff -u -r1.42 FileObjectTestHid.java
--- test/unit/src/org/openide/filesystems/FileObjectTestHid.java 14 Sep 2004 15:24:44 -0000 1.42
+++ test/unit/src/org/openide/filesystems/FileObjectTestHid.java 19 Sep 2004 12:56:19 -0000
@@ -401,7 +401,7 @@
public void testGetPath3() throws IOException{
/** There is no possible to create filenames ending in dots on Win platforms*/
- if (Utilities.isWindows()) return;
+ if (Utilities.isWindows()||Utilities.isOS2()) return;
checkSetUp();
FileObject fold1 = getTestFolder1(root);
FileObject fold2 = getTestFolder1(fold1);