Attachment #50403 for bug #116418

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

Lines 867-870 Link Here

(-)navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java (-1 / +1 lines)
867	public void setMultiview(PageFlowElement multiview) {	867	public void setMultiview(PageFlowElement multiview) {
868	this.multiviewRef = new WeakReference<PageFlowElement>(multiview);	868	this.multiviewRef = new WeakReference<PageFlowElement>(multiview);
869	}	869	}
870	}	870	}




 * @author Petr Pisl
 */
public class JSFConfigComponentFactoryImpl implements JSFConfigComponentFactory {

    private static final Logger LOGGER = Logger.getLogger(JSFConfigComponentFactoryImpl.class.getName());
    
    private final JSFConfigModelImpl model;

    
    public static boolean areSameQName(JSFConfigQNames jsfqname,Element element) {
        QName qname = AbstractDocumentComponent.getQName(element);
        if (JSFConfigQNames.JSF_1_2_NS.equals(element.getNamespaceURI())){
            return jsfqname.getQName(JSFVersion.JSF_1_2).equals(qname);
        if (element.getNamespaceURI() != null && element.getNamespaceURI().length()>0)
            version = JSFVersion.JSF_1_2;
        if (element.getNamespaceURI() != null){
            aresame = jsfqname.getQName(version).equals(qname);
        } else {
            aresame = jsfqname.getLocalName().equals(qname.getLocalPart());
        }
        return jsfqname.getLocalName().equals(qname.getLocalPart());
    }
    
    public static class CreateVisitor extends JSFConfigVisitor.Default {

Lines 99-105 Link Here

(-)src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java (-1 / +1 lines)
99	public JSFVersion getVersion() {	99	public JSFVersion getVersion() {
100	String namespaceURI = getRootComponent().getPeer().getNamespaceURI();	100	String namespaceURI = getRootComponent().getPeer().getNamespaceURI();
101	JSFVersion version = JSFVersion.JSF_1_1;	101	JSFVersion version = JSFVersion.JSF_1_1;
102	if (namespaceURI != null){	102	if (JSFConfigQNames.JSF_1_2_NS.equals(namespaceURI)){
103	version = JSFVersion.JSF_1_2;	103	version = JSFVersion.JSF_1_2;
104	}	104	}
105	return version;	105	return version;




<?xml version='1.0' encoding='UTF-8'?>


<!DOCTYPE faces-config PUBLIC
  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<!-- =========== FULL CONFIGURATION FILE ================================== -->

<faces-config xmlns="http://java.sun.com/JSF/Configuration">
    
  
</faces-config>




<?xml version='1.0' encoding='UTF-8'?>


<!DOCTYPE faces-config PUBLIC
  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">

<!-- =========== FULL CONFIGURATION FILE ================================== -->

<faces-config>
    
  
</faces-config>

Added Link Here

(-)test/unit/data/faces-config_1_2.xml (+11 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2
3	<!-- =========== FULL CONFIGURATION FILE ================================== -->
4
5	<faces-config version="1.2"
6	xmlns="http://java.sun.com/xml/ns/javaee"
7	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
9
10
11	</faces-config>

Return to bug 116418

Lines 52-58 Link Here

(-)src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentFactoryImpl.java (-10 / +4 lines)
52	* @author Petr Pisl	52	* @author Petr Pisl
53	*/	53	*/
54	public class JSFConfigComponentFactoryImpl implements JSFConfigComponentFactory {	54	public class JSFConfigComponentFactoryImpl implements JSFConfigComponentFactory {
55		55
56	private static final Logger LOGGER = Logger.getLogger(JSFConfigComponentFactoryImpl.class.getName());	56	private static final Logger LOGGER = Logger.getLogger(JSFConfigComponentFactoryImpl.class.getName());
57		57
58	private final JSFConfigModelImpl model;	58	private final JSFConfigModelImpl model;
Lines 133-148 Link Here
133		133
134	public static boolean areSameQName(JSFConfigQNames jsfqname,Element element) {	134	public static boolean areSameQName(JSFConfigQNames jsfqname,Element element) {
135	QName qname = AbstractDocumentComponent.getQName(element);	135	QName qname = AbstractDocumentComponent.getQName(element);
136	boolean aresame = false;	136	if (JSFConfigQNames.JSF_1_2_NS.equals(element.getNamespaceURI())){
137	JSFVersion version = JSFVersion.JSF_1_1;	137	return jsfqname.getQName(JSFVersion.JSF_1_2).equals(qname);
138	if (element.getNamespaceURI() != null && element.getNamespaceURI().length()>0)
139	version = JSFVersion.JSF_1_2;
140	if (element.getNamespaceURI() != null){
141	aresame = jsfqname.getQName(version).equals(qname);
142	} else {
143	aresame = jsfqname.getLocalName().equals(qname.getLocalPart());
144	}	138	}
145	return aresame;	139	return jsfqname.getLocalName().equals(qname.getLocalPart());
146	}	140	}
147		141
148	public static class CreateVisitor extends JSFConfigVisitor.Default {	142	public static class CreateVisitor extends JSFConfigVisitor.Default {

Added Link Here

(-)test/unit/data/faces-config_1_1_with_ns.xml (+12 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2
3
4	<!DOCTYPE faces-config PUBLIC
5	"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
6	"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
7	<!-- =========== FULL CONFIGURATION FILE ================================== -->
8
9	<faces-config xmlns="http://java.sun.com/JSF/Configuration">
10
11
12	</faces-config>

Added Link Here

(-)test/unit/data/faces-config_1_1_without_ns.xml (+13 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2
3
4	<!DOCTYPE faces-config PUBLIC
5	"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
6	"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
7
8	<!-- =========== FULL CONFIGURATION FILE ================================== -->
9
10	<faces-config>
11
12
13	</faces-config>