Attachment #38423 for bug #94666

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 94666
Collapse All | Expand All

Lines 444-449 Link Here

(-)openide/arch/arch-openide-datasystems.xml (+8 lines)
444	if true, the DataShadow name is used instead of original's name,	444	if true, the DataShadow name is used instead of original's name,
445	affects DataShadows of filesystem roots only	445	affects DataShadows of filesystem roots only
446	</api>	446	</api>
		447
		448	<api type="export" group="property" name="simple" category="stable" >
		449	templates and folders under <code>Templates/</code>
		450	folder can be annotated with <attr name="simple" boolvalue="false"<
		451	if they are supposed to be hidden in <em>Template Manager</em>.
		452	If a folder is annotated with this attribute, it is also hidden
		453	in standard <em>New File wizard</em>.
		454	</api>
447		455
448	<!-- FolderOrder: -->	456	<!-- FolderOrder: -->
449	<api type="export" group="property" name="PartialOrders" category="stable" >	457	<api type="export" group="property" name="PartialOrders" category="stable" >




        }

        private boolean acceptTemplate (DataObject d) {
            if (d.isTemplate () || d instanceof DataFolder) {
                return true;
            } else if (d instanceof DataFolder)  {
                Object o = d.getPrimaryFile ().getAttribute ("simple"); // NOI18N
                return o == null || Boolean.TRUE.equals (o);
            } else {

    // </editor-fold>//GEN-END:initComponents

    private void moveDownButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveDownButtonActionPerformed
        moveDown (manager.getSelectedNodes ());//GEN-LAST:event_moveDownButtonActionPerformed
    }                                              

    private void moveUpButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveUpButtonActionPerformed
        moveUp (manager.getSelectedNodes ());//GEN-LAST:event_moveUpButtonActionPerformed
    }                                            
    
    private void newFolderButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newFolderButtonActionPerformed


        } catch (PropertyVetoException pve) {
            Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, pve);
        }
//GEN-LAST:event_newFolderButtonActionPerformed
    }                                               
    
    private void deleteButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed
        Node [] nodes = manager.getSelectedNodes (); 

            catch (IOException ioe) {
                Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, ioe);
            }
        }//GEN-LAST:event_deleteButtonActionPerformed
    }                                            

    private void duplicateButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_duplicateButtonActionPerformed
        Node [] nodes = manager.getSelectedNodes ();
        assert nodes != null : "Selected Nodes cannot be null.";
        assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);
        createDuplicateFromNode (nodes [0]);
//GEN-LAST:event_duplicateButtonActionPerformed
    }                                               
    
    private void renameButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_renameButtonActionPerformed
        Node [] nodes = manager.getSelectedNodes ();
        assert nodes != null : "Selected Nodes cannot be null.";
        assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);
        view.invokeInplaceEditing ();//GEN-LAST:event_renameButtonActionPerformed
    }                                            
    
    private void addButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed
        doAdd (manager.getSelectedNodes ());//GEN-LAST:event_addButtonActionPerformed
    }                                         
    
    
    // Variables declaration - do not modify//GEN-BEGIN:variables

Lines 105-108 Link Here

(-)core/favorites/test/unit/src/org/netbeans/modules/favorites/templates/TemplatesPanelTest.java (+9 lines)
105	Node[] arr = n.getChildren().getNodes(true);	105	Node[] arr = n.getChildren().getNodes(true);
106	assertEquals("Empty: " + Arrays.asList(arr), 0, arr.length);	106	assertEquals("Empty: " + Arrays.asList(arr), 0, arr.length);
107	}	107	}
		108	public void testIgnoresSimpleNonFolders() throws Exception {
		109	FileObject root = Repository.getDefault ().getDefaultFileSystem ().getRoot ();
		110	FileObject fo = FileUtil.createData(root, "Templates/SimpleFolder.java");
		111	fo.setAttribute("simple", Boolean.FALSE);
		112	fo.setAttribute("template", Boolean.TRUE);
		113	Node n = TemplatesPanel.getTemplateRootNode();
		114	Node[] arr = n.getChildren().getNodes(true);
		115	assertEquals("Empty: " + Arrays.asList(arr), 0, arr.length);
		116	}
108	}	117	}

Return to bug 94666

Lines 162-170 Link Here

(-)core/favorites/src/org/netbeans/modules/favorites/templates/TemplatesPanel.java (-17 / +15 lines)
162	}	162	}
163		163
164	private boolean acceptTemplate (DataObject d) {	164	private boolean acceptTemplate (DataObject d) {
165	if (d.isTemplate ()) {	165	if (d.isTemplate () \|\| d instanceof DataFolder) {
166	return true;
167	} else if (d instanceof DataFolder) {
168	Object o = d.getPrimaryFile ().getAttribute ("simple"); // NOI18N	166	Object o = d.getPrimaryFile ().getAttribute ("simple"); // NOI18N
169	return o == null \|\| Boolean.TRUE.equals (o);	167	return o == null \|\| Boolean.TRUE.equals (o);
170	} else {	168	} else {
Lines 353-364 Link Here
353	// </editor-fold>//GEN-END:initComponents	351	// </editor-fold>//GEN-END:initComponents
354		352
355	private void moveDownButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveDownButtonActionPerformed	353	private void moveDownButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveDownButtonActionPerformed
356	moveDown (manager.getSelectedNodes ());	354	moveDown (manager.getSelectedNodes ());//GEN-LAST:event_moveDownButtonActionPerformed
357	}//GEN-LAST:event_moveDownButtonActionPerformed	355	}
358		356
359	private void moveUpButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveUpButtonActionPerformed	357	private void moveUpButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_moveUpButtonActionPerformed
360	moveUp (manager.getSelectedNodes ());	358	moveUp (manager.getSelectedNodes ());//GEN-LAST:event_moveUpButtonActionPerformed
361	}//GEN-LAST:event_moveUpButtonActionPerformed	359	}
362		360
363	private void newFolderButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newFolderButtonActionPerformed	361	private void newFolderButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newFolderButtonActionPerformed
364		362
Lines 383-390 Link Here
383	} catch (PropertyVetoException pve) {	381	} catch (PropertyVetoException pve) {
384	Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, pve);	382	Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, pve);
385	}	383	}
386		384	//GEN-LAST:event_newFolderButtonActionPerformed
387	}//GEN-LAST:event_newFolderButtonActionPerformed	385	}
388		386
389	private void deleteButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed	387	private void deleteButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed
390	Node [] nodes = manager.getSelectedNodes ();	388	Node [] nodes = manager.getSelectedNodes ();
Lines 395-421 Link Here
395	catch (IOException ioe) {	393	catch (IOException ioe) {
396	Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, ioe);	394	Logger.getLogger(TemplatesPanel.class.getName()).log(Level.WARNING, null, ioe);
397	}	395	}
398	}	396	}//GEN-LAST:event_deleteButtonActionPerformed
399	}//GEN-LAST:event_deleteButtonActionPerformed	397	}
400		398
401	private void duplicateButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_duplicateButtonActionPerformed	399	private void duplicateButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_duplicateButtonActionPerformed
402	Node [] nodes = manager.getSelectedNodes ();	400	Node [] nodes = manager.getSelectedNodes ();
403	assert nodes != null : "Selected Nodes cannot be null.";	401	assert nodes != null : "Selected Nodes cannot be null.";
404	assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);	402	assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);
405	createDuplicateFromNode (nodes [0]);	403	createDuplicateFromNode (nodes [0]);
406		404	//GEN-LAST:event_duplicateButtonActionPerformed
407	}//GEN-LAST:event_duplicateButtonActionPerformed	405	}
408		406
409	private void renameButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_renameButtonActionPerformed	407	private void renameButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_renameButtonActionPerformed
410	Node [] nodes = manager.getSelectedNodes ();	408	Node [] nodes = manager.getSelectedNodes ();
411	assert nodes != null : "Selected Nodes cannot be null.";	409	assert nodes != null : "Selected Nodes cannot be null.";
412	assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);	410	assert nodes.length == 1 : "One one node can be selected, but was " + Arrays.asList (nodes);
413	view.invokeInplaceEditing ();	411	view.invokeInplaceEditing ();//GEN-LAST:event_renameButtonActionPerformed
414	}//GEN-LAST:event_renameButtonActionPerformed	412	}
415		413
416	private void addButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed	414	private void addButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addButtonActionPerformed
417	doAdd (manager.getSelectedNodes ());	415	doAdd (manager.getSelectedNodes ());//GEN-LAST:event_addButtonActionPerformed
418	}//GEN-LAST:event_addButtonActionPerformed	416	}
419		417
420		418
421	// Variables declaration - do not modify//GEN-BEGIN:variables	419	// Variables declaration - do not modify//GEN-BEGIN:variables