Attachment #105406 for bug #187279

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 187279
Collapse All | Expand All




                // we need to construct the children from the root package directly from DataObjects..
                
                FileObject fo = dobj.getPrimaryFile();
                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("package.bluej") == null)) { //NOI18N
                    return new Node[0];
                }
                if (rootDir != null && rootDir.equals(fo)) {




        if (fileObject.getFileObject("nbproject") != null && fileObject.getFileObject("build.xml") != null) {  // NOI18N
            return false;
        }
        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
    }

        if ("nbproject".equalsIgnoreCase(fileObject.getName())) {  //NOI18N
            return null;
        }
        FileObject projectFile = fileObject.getFileObject("package.bluej"); // NOI18N
        if (projectFile == null || !projectFile.isData()) {
            return null;
        }

        if (projectDiskFile == null)  {
            return null;
        }
        if (fileObject.getParent().getFileObject("package.bluej") != null) {  // NOI18N
            return null;
        }
        




        }

        public boolean contains(FileObject fileObject) throws IllegalArgumentException {
            if ("package.bluej".equals(fileObject.getNameExt())) {  // NOI18N
                return false;
            }
            if ("build.xml".equals(fileObject.getNameExt())) {  // NOI18N
                return false;
            } 
            if (fileObject.isFolder() && fileObject.getFileObject("package.bluej") == null) {  // NOI18N
                return false;
            }
            return true;

Lines 276-282 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/export/ConvertToJ2SEAction.java (-1 / +1 lines)
276	boolean test = sourceFOs[i].getName().endsWith("Test"); // NOI18N	276	boolean test = sourceFOs[i].getName().endsWith("Test"); // NOI18N
277	FileUtil.copyFile(sourceFOs[i], test ? targetTestRoot : targetSrcRoot, sourceFOs[i].getName());	277	FileUtil.copyFile(sourceFOs[i], test ? targetTestRoot : targetSrcRoot, sourceFOs[i].getName());
278	}	278	}
279	} else if (sourceFOs[i].getFileObject("bluej.pkg") != null) { // NOI18N	279	} else if (sourceFOs[i].getFileObject("package.bluej") != null) { // NOI18N
280	//only the bluej package items get copied.	280	//only the bluej package items get copied.
281	FileObject childTargetSrc = targetSrcRoot.createFolder(sourceFOs[i].getName());	281	FileObject childTargetSrc = targetSrcRoot.createFolder(sourceFOs[i].getName());
282	FileObject childTargetTest = targetTestRoot.createFolder(sourceFOs[i].getName());	282	FileObject childTargetTest = targetTestRoot.createFolder(sourceFOs[i].getName());




            DataObject dobj = (DataObject)orig.getLookup().lookup(DataObject.class);
            if (dobj != null) {
                FileObject fo = dobj.getPrimaryFile();
                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("package.bluej") == null)) { // NOI18N
                    return new Node[0];
                }
                  return new Node[] {new MyFilterWithHtml(orig, new FilterChildrenImpl(orig))};

Lines 108-114 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/packagewizard/PackageWizardIterator.java (-1 / +1 lines)
108	public void run() throws IOException {	108	public void run() throws IOException {
109	set = delegate.instantiate();	109	set = delegate.instantiate();
110	FileObject fo = (FileObject)set.iterator().next();	110	FileObject fo = (FileObject)set.iterator().next();
111	fo.createData("bluej.pkg"); // NOI18N	111	fo.createData("package.bluej"); // NOI18N
112	}	112	}
113	}	113	}
114	);	114	);

Return to bug 187279

Lines 41-48 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/BluejProjectFactory.java (-4 / +4 lines)
41	if (fileObject.getFileObject("nbproject") != null && fileObject.getFileObject("build.xml") != null) { // NOI18N	41	if (fileObject.getFileObject("nbproject") != null && fileObject.getFileObject("build.xml") != null) { // NOI18N
42	return false;	42	return false;
43	}	43	}
44	File project = new File(projectDir, "bluej.pkg"); // NOI18N	44	File project = new File(projectDir, "package.bluej"); // NOI18N
45	File parentProject = new File(projectDir.getParentFile(), "bluej.pkg"); // NOI18N	45	File parentProject = new File(projectDir.getParentFile(), "package.bluej"); // NOI18N
46	return project.exists() && project.isFile() &&	46	return project.exists() && project.isFile() &&
47	(!parentProject.exists()) && !"nbproject".equalsIgnoreCase(projectDir.getName()); // NOI18N	47	(!parentProject.exists()) && !"nbproject".equalsIgnoreCase(projectDir.getName()); // NOI18N
48	}	48	}
Lines 54-60 Link Here
54	if ("nbproject".equalsIgnoreCase(fileObject.getName())) { //NOI18N	54	if ("nbproject".equalsIgnoreCase(fileObject.getName())) { //NOI18N
55	return null;	55	return null;
56	}	56	}
57	FileObject projectFile = fileObject.getFileObject("bluej.pkg"); // NOI18N	57	FileObject projectFile = fileObject.getFileObject("package.bluej"); // NOI18N
58	if (projectFile == null \|\| !projectFile.isData()) {	58	if (projectFile == null \|\| !projectFile.isData()) {
59	return null;	59	return null;
60	}	60	}
Lines 62-68 Link Here
62	if (projectDiskFile == null) {	62	if (projectDiskFile == null) {
63	return null;	63	return null;
64	}	64	}
65	if (fileObject.getParent().getFileObject("bluej.pkg") != null) { // NOI18N	65	if (fileObject.getParent().getFileObject("package.bluej") != null) { // NOI18N
66	return null;	66	return null;
67	}	67	}
68		68

Lines 119-131 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/BluejSources.java (-2 / +2 lines)
119	}	119	}
120		120
121	public boolean contains(FileObject fileObject) throws IllegalArgumentException {	121	public boolean contains(FileObject fileObject) throws IllegalArgumentException {
122	if ("bluej.pkg".equals(fileObject.getNameExt())) { // NOI18N	122	if ("package.bluej".equals(fileObject.getNameExt())) { // NOI18N
123	return false;	123	return false;
124	}	124	}
125	if ("build.xml".equals(fileObject.getNameExt())) { // NOI18N	125	if ("build.xml".equals(fileObject.getNameExt())) { // NOI18N
126	return false;	126	return false;
127	}	127	}
128	if (fileObject.isFolder() && fileObject.getFileObject("bluej.pkg") == null) { // NOI18N	128	if (fileObject.isFolder() && fileObject.getFileObject("package.bluej") == null) { // NOI18N
129	return false;	129	return false;
130	}	130	}
131	return true;	131	return true;

Lines 268-281 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/BluejLogicalViewProvider.java (-2 / +3 lines)
268	// we need to construct the children from the root package directly from DataObjects..	268	// we need to construct the children from the root package directly from DataObjects..
269		269
270	FileObject fo = dobj.getPrimaryFile();	270	FileObject fo = dobj.getPrimaryFile();
271	if ("bluej.pkg".equals(fo.getNameExt()) \|\| //NOI18N	271	if ("package.bluej".equals(fo.getNameExt()) \|\| //NOI18N
272	"build.xml".equals(fo.getNameExt()) \|\| //NOI18N	272	"build.xml".equals(fo.getNameExt()) \|\| //NOI18N
		273	"bluej.pkg".equals(fo.getNameExt()) \|\| //NOI18N
273	"bluej.pkh".equals(fo.getNameExt()) \|\| //NOI18N	274	"bluej.pkh".equals(fo.getNameExt()) \|\| //NOI18N
274	("+libs".equals(fo.getName()) && fo.isFolder()) \|\| //NOI18N	275	("+libs".equals(fo.getName()) && fo.isFolder()) \|\| //NOI18N
275	".DS_Store".equals(fo.getNameExt()) \|\| //NOI18N	276	".DS_Store".equals(fo.getNameExt()) \|\| //NOI18N
276	"ctxt".equals(fo.getExt()) \|\| //NOI18N	277	"ctxt".equals(fo.getExt()) \|\| //NOI18N
277	"class".equals(fo.getExt()) \|\| //NOI18N	278	"class".equals(fo.getExt()) \|\| //NOI18N
278	(fo.isFolder() && fo.getFileObject("bluej.pkg") == null)) { //NOI18N	279	(fo.isFolder() && fo.getFileObject("package.bluej") == null)) { //NOI18N
279	return new Node[0];	280	return new Node[0];
280	}	281	}
281	if (rootDir != null && rootDir.equals(fo)) {	282	if (rootDir != null && rootDir.equals(fo)) {

Lines 183-196 Link Here

(-)o.n.bluej/src/org/netbeans/bluej/nodes/BluejLogicalViewRootNode.java (-2 / +3 lines)
183	DataObject dobj = (DataObject)orig.getLookup().lookup(DataObject.class);	183	DataObject dobj = (DataObject)orig.getLookup().lookup(DataObject.class);
184	if (dobj != null) {	184	if (dobj != null) {
185	FileObject fo = dobj.getPrimaryFile();	185	FileObject fo = dobj.getPrimaryFile();
186	if ("bluej.pkg".equals(fo.getNameExt()) \|\| // NOI18N	186	if ("package.bluej".equals(fo.getNameExt()) \|\| // NOI18N
187	"build.xml".equals(fo.getNameExt()) \|\| // NOI18N	187	"build.xml".equals(fo.getNameExt()) \|\| // NOI18N
		188	"bluej.pkg".equals(fo.getNameExt()) \|\| //NOI18N
188	"bluej.pkh".equals(fo.getNameExt()) \|\| // NOI18N	189	"bluej.pkh".equals(fo.getNameExt()) \|\| // NOI18N
189	("+libs".equals(fo.getName()) && fo.isFolder()) \|\| // NOI18N	190	("+libs".equals(fo.getName()) && fo.isFolder()) \|\| // NOI18N
190	"ctxt".equals(fo.getExt()) \|\| // NOI18N	191	"ctxt".equals(fo.getExt()) \|\| // NOI18N
191	"class".equals(fo.getExt()) \|\| // NOI18N	192	"class".equals(fo.getExt()) \|\| // NOI18N
192	".DS_STORE".equals(fo.getNameExt()) \|\| // NOI18N	193	".DS_STORE".equals(fo.getNameExt()) \|\| // NOI18N
193	(fo.isFolder() && fo.getFileObject("bluej.pkg") == null)) { // NOI18N	194	(fo.isFolder() && fo.getFileObject("package.bluej") == null)) { // NOI18N
194	return new Node[0];	195	return new Node[0];
195	}	196	}
196	return new Node[] {new MyFilterWithHtml(orig, new FilterChildrenImpl(orig))};	197	return new Node[] {new MyFilterWithHtml(orig, new FilterChildrenImpl(orig))};