From 43dd5d12c7244f23e3801b01209db4e20ea4044f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 8 Sep 2011 16:58:53 +0400 Subject: [PATCH] Variables extracted --- .../jetbrains/jet/lang/descriptors/ClassModifiers.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java b/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java index 6a709ed0eea..896958e0864 100644 --- a/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java +++ b/idea/src/org/jetbrains/jet/lang/descriptors/ClassModifiers.java @@ -29,10 +29,12 @@ public class ClassModifiers extends Modifiers { public static ClassModifiers resolveModifiers(@Nullable JetModifierList modifierList) { if (modifierList == null) return DEFAULT_MODIFIERS; + boolean abstractModifier = modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD); + boolean traitModifier = modifierList.hasModifier(JetTokens.TRAIT_KEYWORD); return new ClassModifiers( - modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD) || modifierList.hasModifier(JetTokens.TRAIT_KEYWORD), - modifierList.hasModifier(JetTokens.OPEN_KEYWORD) || modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD) || modifierList.hasModifier(JetTokens.TRAIT_KEYWORD), - modifierList.hasModifier(JetTokens.TRAIT_KEYWORD) + abstractModifier || traitModifier, + modifierList.hasModifier(JetTokens.OPEN_KEYWORD) || abstractModifier || traitModifier, + traitModifier ); }