Should get the archive root for the libraries jar file when calling addRoots API. before_merge_pfe_april112007 java_tasklist_89600_t2b_h
authorpotingwu@netbeans.org
Fri, 13 Apr 2007 18:27:05 +0000
changeset 566d556960b6633
parent 565 90c8c53918ac
child 567 bbf4a589535f
Should get the archive root for the libraries jar file when calling addRoots API.
visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectUtils.java
visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/JsfProjectLibrary.java
     1.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectUtils.java	Fri Apr 13 18:24:10 2007 +0000
     1.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectUtils.java	Fri Apr 13 18:27:05 2007 +0000
     1.3 @@ -1394,7 +1394,7 @@
     1.4          for (int i = 0; i < jarName.length; i++) {
     1.5              File f = InstalledFileLocator.getDefault().locate(jarName[i], null, true);
     1.6              if (f != null) {
     1.7 -                URL root = FileUtil.toFileObject(f).getURL();
     1.8 +                URL root = FileUtil.getArchiveRoot(FileUtil.toFileObject(f)).getURL();
     1.9                  if (!hasRootReference(project, root)) {
    1.10                      jars.add(root);
    1.11                  }
    1.12 @@ -1408,7 +1408,7 @@
    1.13          for (int i = 0; i < jarName.length; i++) {
    1.14              File f = InstalledFileLocator.getDefault().locate(jarName[i], null, true);
    1.15              if (f != null) {
    1.16 -                URL root = FileUtil.toFileObject(f).getURL();
    1.17 +                URL root = FileUtil.getArchiveRoot(FileUtil.toFileObject(f)).getURL();
    1.18                  if (!hasRootReference(project, root, type)) {
    1.19                      jars.add(root);
    1.20                  }
     2.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/JsfProjectLibrary.java	Fri Apr 13 18:24:10 2007 +0000
     2.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/JsfProjectLibrary.java	Fri Apr 13 18:27:05 2007 +0000
     2.3 @@ -174,7 +174,7 @@
     2.4          }
     2.5  
     2.6          try {
     2.7 -            return FileUtil.toFileObject(file).getURL();
     2.8 +            return FileUtil.getArchiveRoot(FileUtil.toFileObject(file)).getURL();
     2.9          } catch (FileStateInvalidException e) {
    2.10              return null;
    2.11          }