java-decompiler: fixes and cleanups

- unified attribute loading code
- common methods for checking member flags
- verifying skip()
- correct resource closing
- typos

1 files changed, 2 insertions, 3 deletions

diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
index 93746b7..fcdeaf1 100644
--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
@@ -82,7 +82,7 @@ public class EnumProcessor {
 
     // hide dummy synthetic fields of enum constants
     for (StructField fd : cl.getFields()) {
-      if ((fd.access_flags & CodeConstants.ACC_ENUM) != 0) {
+      if (fd.hasModifier(CodeConstants.ACC_ENUM)) {
         Exprent initializer =
           wrapper.getStaticFieldInitializers().getWithKey(InterpreterUtil.makeUniqueKey(fd.getName(), fd.getDescriptor()));
         if (initializer != null && initializer.type == Exprent.EXPRENT_NEW) {
@@ -97,10 +97,9 @@ public class EnumProcessor {
   }
 
   private static void hideDummyFieldInConstant(ClassWrapper wrapper) {
-
     StructClass cl = wrapper.getClassStruct();
     for (StructField fd : cl.getFields()) {
-      if ((fd.access_flags & CodeConstants.ACC_SYNTHETIC) != 0) {
+      if (fd.isSynthetic()) {
         FieldDescriptor descr = FieldDescriptor.parseDescriptor(fd.getDescriptor());
         VarType ret = descr.type;