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

(-)a/xml.schema.model/src/org/netbeans/modules/xml/schema/model/LocalElement.java (-2 / +2 lines)
Lines 1-7 Link Here
1
/*
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
3
 *
4
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
4
 * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
5
 *
5
 *
6
 * The contents of this file are subject to the terms of either the GNU
6
 * The contents of this file are subject to the terms of either the GNU
7
 * General Public License Version 2 only ("GPL") or the Common
7
 * General Public License Version 2 only ("GPL") or the Common
Lines 79-83 Link Here
79
    void setMinOccurs(Integer min);
79
    void setMinOccurs(Integer min);
80
    int getMinOccursDefault();
80
    int getMinOccursDefault();
81
    int getMinOccursEffective();
81
    int getMinOccursEffective();
82
    
82
    String getMinOccursText();
83
}
83
}
(-)a/xml.schema.model/src/org/netbeans/modules/xml/schema/model/impl/LocalElementBaseImpl.java (-3 / +7 lines)
Lines 1-7 Link Here
1
/*
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
3
 *
4
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
4
 * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
5
 *
5
 *
6
 * The contents of this file are subject to the terms of either the GNU
6
 * The contents of this file are subject to the terms of either the GNU
7
 * General Public License Version 2 only ("GPL") or the Common
7
 * General Public License Version 2 only ("GPL") or the Common
Lines 100-111 Link Here
100
    public NamedComponentReference<GlobalElement> getRef() {
100
    public NamedComponentReference<GlobalElement> getRef() {
101
        return resolveGlobalReference(GlobalElement.class, SchemaAttributes.REF);
101
        return resolveGlobalReference(GlobalElement.class, SchemaAttributes.REF);
102
    }
102
    }
103
    
103
104
    public String getMinOccursText() {
105
        return getAttribute(SchemaAttributes.MIN_OCCURS);
106
    }
107
104
    /**
108
    /**
105
     *
109
     *
106
     */
110
     */
107
    public Integer getMinOccurs() {
111
    public Integer getMinOccurs() {
108
        String s = getAttribute(SchemaAttributes.MIN_OCCURS);
112
        String s = getMinOccursText();
109
        return s == null ? null : Integer.valueOf(s);
113
        return s == null ? null : Integer.valueOf(s);
110
    }
114
    }
111
    
115
    
(-)a/xml.schema.ui.basic/src/org/netbeans/modules/xml/schema/ui/nodes/categorized/AdvancedLocalElementNode.java (-2 / +2 lines)
Lines 1-7 Link Here
1
/*
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
3
 *
4
 * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
4
 * Copyright 1997-2010 Sun Microsystems, Inc. All rights reserved.
5
 *
5
 *
6
 * The contents of this file are subject to the terms of either the GNU
6
 * The contents of this file are subject to the terms of either the GNU
7
 * General Public License Version 2 only ("GPL") or the Common
7
 * General Public License Version 2 only ("GPL") or the Common
Lines 82-88 Link Here
82
        if (max.equals("unbounded"))
82
        if (max.equals("unbounded"))
83
            max="*";
83
            max="*";
84
        
84
        
85
        String decoration="["+element.getMinOccursEffective()+".."+max+"]";
85
        String decoration="["+element.getMinOccursText()+".."+max+"]";
86
        if(element.getType()!=null && element.getType().get()!=null) {
86
        if(element.getType()!=null && element.getType().get()!=null) {
87
            String supertypeLabel = NbBundle.getMessage(
87
            String supertypeLabel = NbBundle.getMessage(
88
                    AdvancedLocalElementNode.class, "LBL_InstanceOf",
88
                    AdvancedLocalElementNode.class, "LBL_InstanceOf",

Return to bug 167525