# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: C:\Users\iau\Documents\NetBeansProjects\netbeans
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: o.n.bluej/src/org/netbeans/bluej/BluejLogicalViewProvider.java
--- o.n.bluej/src/org/netbeans/bluej/BluejLogicalViewProvider.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/BluejLogicalViewProvider.java Locally Modified (Based On LOCAL)
@@ -268,14 +268,15 @@
                 // we need to construct the children from the root package directly from DataObjects..
                 
                 FileObject fo = dobj.getPrimaryFile();
-                if ("bluej.pkg".equals(fo.getNameExt()) || //NOI18N
+                if ("package.bluej".equals(fo.getNameExt()) || //NOI18N
                         "build.xml".equals(fo.getNameExt()) || //NOI18N
+                        "bluej.pkg".equals(fo.getNameExt()) || //NOI18N
                         "bluej.pkh".equals(fo.getNameExt()) || //NOI18N
                         ("+libs".equals(fo.getName()) && fo.isFolder()) || //NOI18N
                         ".DS_Store".equals(fo.getNameExt()) || //NOI18N
                         "ctxt".equals(fo.getExt()) || //NOI18N
                         "class".equals(fo.getExt()) || //NOI18N
-                        (fo.isFolder() && fo.getFileObject("bluej.pkg") == null)) { //NOI18N
\ No newline at end of file
+                        (fo.isFolder() && fo.getFileObject("package.bluej") == null)) { //NOI18N
\ No newline at end of file
                     return new Node[0];
                 }
                 if (rootDir != null && rootDir.equals(fo)) {
Index: o.n.bluej/src/org/netbeans/bluej/BluejProjectFactory.java
--- o.n.bluej/src/org/netbeans/bluej/BluejProjectFactory.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/BluejProjectFactory.java Locally Modified (Based On LOCAL)
@@ -41,8 +41,8 @@
         if (fileObject.getFileObject("nbproject") != null && fileObject.getFileObject("build.xml") != null) {  // NOI18N
             return false;
         }
-        File project = new File(projectDir, "bluej.pkg"); // NOI18N
-        File parentProject = new File(projectDir.getParentFile(), "bluej.pkg");  // NOI18N
+        File project = new File(projectDir, "package.bluej"); // NOI18N
+        File parentProject = new File(projectDir.getParentFile(), "package.bluej");  // NOI18N
         return project.exists() && project.isFile() &&
                 (!parentProject.exists()) && !"nbproject".equalsIgnoreCase(projectDir.getName()); // NOI18N
     }
@@ -54,7 +54,7 @@
         if ("nbproject".equalsIgnoreCase(fileObject.getName())) {  //NOI18N
             return null;
         }
-        FileObject projectFile = fileObject.getFileObject("bluej.pkg"); // NOI18N
+        FileObject projectFile = fileObject.getFileObject("package.bluej"); // NOI18N
         if (projectFile == null || !projectFile.isData()) {
             return null;
         }
@@ -62,7 +62,7 @@
         if (projectDiskFile == null)  {
             return null;
         }
-        if (fileObject.getParent().getFileObject("bluej.pkg") != null) {  // NOI18N
+        if (fileObject.getParent().getFileObject("package.bluej") != null) {  // NOI18N
             return null;
         }
         
Index: o.n.bluej/src/org/netbeans/bluej/BluejSources.java
--- o.n.bluej/src/org/netbeans/bluej/BluejSources.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/BluejSources.java Locally Modified (Based On LOCAL)
@@ -119,13 +119,13 @@
         }
 
         public boolean contains(FileObject fileObject) throws IllegalArgumentException {
-            if ("bluej.pkg".equals(fileObject.getNameExt())) {  // NOI18N
+            if ("package.bluej".equals(fileObject.getNameExt())) {  // NOI18N
                 return false;
             }
             if ("build.xml".equals(fileObject.getNameExt())) {  // NOI18N
                 return false;
             } 
-            if (fileObject.isFolder() && fileObject.getFileObject("bluej.pkg") == null) {  // NOI18N
+            if (fileObject.isFolder() && fileObject.getFileObject("package.bluej") == null) {  // NOI18N
                 return false;
             }
             return true;
Index: o.n.bluej/src/org/netbeans/bluej/export/ConvertToJ2SEAction.java
--- o.n.bluej/src/org/netbeans/bluej/export/ConvertToJ2SEAction.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/export/ConvertToJ2SEAction.java Locally Modified (Based On LOCAL)
@@ -276,7 +276,7 @@
                     boolean test = sourceFOs[i].getName().endsWith("Test");  // NOI18N
                     FileUtil.copyFile(sourceFOs[i], test ? targetTestRoot : targetSrcRoot, sourceFOs[i].getName());
                 }
-            } else if (sourceFOs[i].getFileObject("bluej.pkg") != null) {  // NOI18N
+            } else if (sourceFOs[i].getFileObject("package.bluej") != null) {  // NOI18N
                 //only the bluej package items get copied.
                 FileObject childTargetSrc  = targetSrcRoot.createFolder(sourceFOs[i].getName());
                 FileObject childTargetTest  = targetTestRoot.createFolder(sourceFOs[i].getName());
Index: o.n.bluej/src/org/netbeans/bluej/nodes/BluejLogicalViewRootNode.java
--- o.n.bluej/src/org/netbeans/bluej/nodes/BluejLogicalViewRootNode.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/nodes/BluejLogicalViewRootNode.java Locally Modified (Based On LOCAL)
@@ -183,14 +183,15 @@
             DataObject dobj = (DataObject)orig.getLookup().lookup(DataObject.class);
             if (dobj != null) {
                 FileObject fo = dobj.getPrimaryFile();
-                if ("bluej.pkg".equals(fo.getNameExt()) || // NOI18N
+                if ("package.bluej".equals(fo.getNameExt()) || // NOI18N
                         "build.xml".equals(fo.getNameExt()) || // NOI18N
+                        "bluej.pkg".equals(fo.getNameExt()) || //NOI18N
                         "bluej.pkh".equals(fo.getNameExt()) || // NOI18N
                         ("+libs".equals(fo.getName()) && fo.isFolder()) || // NOI18N
                         "ctxt".equals(fo.getExt()) || // NOI18N
                         "class".equals(fo.getExt()) || // NOI18N
                         ".DS_STORE".equals(fo.getNameExt()) || // NOI18N
-                        (fo.isFolder() && fo.getFileObject("bluej.pkg") == null)) { // NOI18N
+                        (fo.isFolder() && fo.getFileObject("package.bluej") == null)) { // NOI18N
                     return new Node[0];
                 }
                   return new Node[] {new MyFilterWithHtml(orig, new FilterChildrenImpl(orig))};
Index: o.n.bluej/src/org/netbeans/bluej/packagewizard/PackageWizardIterator.java
--- o.n.bluej/src/org/netbeans/bluej/packagewizard/PackageWizardIterator.java Base (BASE)
+++ o.n.bluej/src/org/netbeans/bluej/packagewizard/PackageWizardIterator.java Locally Modified (Based On LOCAL)
@@ -108,7 +108,7 @@
                 public void run() throws IOException {
                     set = delegate.instantiate();
                     FileObject fo = (FileObject)set.iterator().next();
-                    fo.createData("bluej.pkg"); // NOI18N
+                    fo.createData("package.bluej"); // NOI18N
                 }
             }
             );