Attachment #151624 for bug #221217

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

Lines 1-4 Link Here

(-)j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>




import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;
import org.netbeans.modules.j2ee.dd.api.web.SessionConfig;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.dd.api.web.WebFragment;
import org.netbeans.modules.j2ee.ddloaders.web.DDDataObject;
import org.netbeans.modules.xml.multiview.Utils;
import org.netbeans.modules.xml.multiview.Error;

 * @author Petr Slechta
 */
public class OverviewPanel extends SectionInnerPanel implements java.awt.event.ItemListener {
    private final DDDataObject dObj;
    private final WebApp webApp;

    public OverviewPanel(SectionView sectionView, DDDataObject dObj) {
        super(sectionView);

        addValidatee(stTF);

        BigDecimal ver = new BigDecimal(webApp.getVersion());
        boolean showNameElement = (ver.compareTo(new BigDecimal(3.0)) >= 0) && 
                (webApp instanceof WebFragment);//JavaEE6 and in web-fragment
        jLabel2.setVisible(showNameElement);
        tfName.setVisible(showNameElement);
        if (showNameElement) {
            tfName.setText(getXmlNames());
            addModifier(tfName);
        }

Return to bug 221217

Lines 48-53 Link Here

(-)j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.java (-6 / +8 lines)
48	import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;	48	import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;
49	import org.netbeans.modules.j2ee.dd.api.web.SessionConfig;	49	import org.netbeans.modules.j2ee.dd.api.web.SessionConfig;
50	import org.netbeans.modules.j2ee.dd.api.web.WebApp;	50	import org.netbeans.modules.j2ee.dd.api.web.WebApp;
		51	import org.netbeans.modules.j2ee.dd.api.web.WebFragment;
51	import org.netbeans.modules.j2ee.ddloaders.web.DDDataObject;	52	import org.netbeans.modules.j2ee.ddloaders.web.DDDataObject;
52	import org.netbeans.modules.xml.multiview.Utils;	53	import org.netbeans.modules.xml.multiview.Utils;
53	import org.netbeans.modules.xml.multiview.Error;	54	import org.netbeans.modules.xml.multiview.Error;
Lines 59-66 Link Here
59	* @author Petr Slechta	60	* @author Petr Slechta
60	*/	61	*/
61	public class OverviewPanel extends SectionInnerPanel implements java.awt.event.ItemListener {	62	public class OverviewPanel extends SectionInnerPanel implements java.awt.event.ItemListener {
62	private DDDataObject dObj;	63	private final DDDataObject dObj;
63	private WebApp webApp;	64	private final WebApp webApp;
64		65
65	public OverviewPanel(SectionView sectionView, DDDataObject dObj) {	66	public OverviewPanel(SectionView sectionView, DDDataObject dObj) {
66	super(sectionView);	67	super(sectionView);
Lines 86-95 Link Here
86	addValidatee(stTF);	87	addValidatee(stTF);
87		88
88	BigDecimal ver = new BigDecimal(webApp.getVersion());	89	BigDecimal ver = new BigDecimal(webApp.getVersion());
89	boolean jee6 = ver.compareTo(new BigDecimal(3.0)) >= 0;	90	boolean showNameElement = (ver.compareTo(new BigDecimal(3.0)) >= 0) &&
90	jLabel2.setVisible(jee6);	91	(webApp instanceof WebFragment);//JavaEE6 and in web-fragment
91	tfName.setVisible(jee6);	92	jLabel2.setVisible(showNameElement);
92	if (jee6) {	93	tfName.setVisible(showNameElement);
		94	if (showNameElement) {
93	tfName.setText(getXmlNames());	95	tfName.setText(getXmlNames());
94	addModifier(tfName);	96	addModifier(tfName);
95	}	97	}