← Back to branch summary

~ubuntu-branches/ubuntu/utopic/eclipse-wtp/utopic-proposed

« back to all changes in this revision

Viewing changes to org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/ast/TypeDeclaration.java

  • Committer: Package Import Robot
  • Author(s): Jakub Adam
  • Date: 2014-07-10 12:54:39 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20140710125439-ixzeiqepu8m3e1z6
Tags: 3.6.0-1
* New upstream release.
* Refreshed d/patches/debian-custom-build.patch.
* Regenerate CSSTokenizer during build.
* Override codeless-jar warning in eclipse-wtp binary package.
* Override false positive source-is-missing lintian error in bundle
  org.eclipse.wst.jsdt.support.ie.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/ast/TypeDeclaration.java
1
1
/*******************************************************************************
2
 
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 
2
 * Copyright (c) 2000, 2011, 2013 IBM Corporation and others.
3
3
 * All rights reserved. This program and the accompanying materials
4
4
 * are made available under the terms of the Eclipse Public License v1.0
5
5
 * which accompanies this distribution, and is available at
751
751
                                // if the type is package-info, the javadoc was resolved as part of the compilation unit javadoc
752
752
                                this.javadoc.resolve(this.scope);
753
753
                        }
754
 
                } else if (sourceType != null && !sourceType.isLocalType()) {
 
754
                } else if (this.scope != null && sourceType != null && !sourceType.isLocalType()) {
755
755
                        this.scope.problemReporter().javadocMissing(this.sourceStart, this.sourceEnd, sourceType.modifiers);
756
756
                }
757
757
 
947
947
 * This method is doing either up/down propagation.
948
948
 */
949
949
void updateMaxFieldCount() {
950
 
        if (this.binding == null)
 
950
        if (this.scope == null || this.binding == null)
951
951
                return; // error scenario
952
952
        TypeDeclaration outerMostType = this.scope.outerMostClassScope().referenceType();
953
953
        if (this.maxFieldCount > outerMostType.maxFieldCount) {