Propagated bytecode-to-source tracer

src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java

@@ -1,26 +1,53 @@
 package org.jetbrains.java.decompiler.main.collectors;
 
 import java.util.HashMap;
+import java.util.Set;
 
 public class BytecodeMappingTracer {
 
   private int current_sourceline;
-  
+
   // bytecode offset, source line
-  private HashMap<Integer, Integer> mapping;
-  
+  private HashMap<Integer, Integer> mapping = new HashMap<Integer, Integer>();
+
+  public BytecodeMappingTracer() {}
+
+  public BytecodeMappingTracer(int initial_source_line) {
+    current_sourceline = initial_source_line;
+  }
+
   public void incrementSourceLine() {
     current_sourceline++;
   }
-  
+
+  public void incrementSourceLine(int number_lines) {
+    current_sourceline += number_lines;
+  }
+
   public void addMapping(int bytecode_offset) {
     if(!mapping.containsKey(bytecode_offset)) {
       mapping.put(bytecode_offset, current_sourceline);
     }
   }
 
+  public void addMapping(Set<Integer> bytecode_offsets) {
+    if(bytecode_offsets != null) {
+      for(Integer bytecode_offset : bytecode_offsets) {
+        addMapping(bytecode_offset);
+      }
+    }
+  }
+
   public HashMap<Integer, Integer> getMapping() {
     return mapping;
-  }  
-  
+  }
+
+  public int getCurrentSourceline() {
+    return current_sourceline;
+  }
+
+  public void setCurrentSourceline(int current_sourceline) {
+    this.current_sourceline = current_sourceline;
+  }
+
 }

src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java

@@ -9,59 +9,65 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 public class BytecodeSourceMapper {
 
   private int offset_total;
-  
+
   // class, method, bytecode offset, source line
-  private HashMap<String, HashMap<String, HashMap<Integer, Integer>>> mapping;
-  
+  private HashMap<String, HashMap<String, HashMap<Integer, Integer>>> mapping = new HashMap<String, HashMap<String, HashMap<Integer, Integer>>>();
+
   public void addMapping(String classname, String methodname, int bytecode_offset, int source_line) {
-    
+
     HashMap<String, HashMap<Integer, Integer>> class_mapping = mapping.get(classname);
     if(class_mapping == null) {
       mapping.put(classname, class_mapping = new HashMap<String, HashMap<Integer, Integer>>());
     }
-    
+
     HashMap<Integer, Integer> method_mapping = class_mapping.get(methodname);
     if(method_mapping == null) {
       class_mapping.put(methodname, method_mapping = new HashMap<Integer, Integer>());
     }
-    
+
     // don't overwrite
     if(!method_mapping.containsKey(bytecode_offset)) {
       method_mapping.put(bytecode_offset, source_line);
     }
   }
 
+  public void addTracer(String classname, String methodname, BytecodeMappingTracer tracer) {
+    for(Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
+      addMapping(classname, methodname, entry.getKey(), entry.getValue());
+    }
+  }
+
   public void dumpMapping(StringBuilder buffer) {
-    
+
     String lineSeparator = DecompilerContext.getNewLineSeparator();
     String indentstr1 = InterpreterUtil.getIndentString(1);
     String indentstr2 = InterpreterUtil.getIndentString(2);
 
-    
+
     for(Entry<String, HashMap<String, HashMap<Integer, Integer>>> class_entry : mapping.entrySet()) {
       HashMap<String, HashMap<Integer, Integer>> class_mapping = class_entry.getValue();
       buffer.append("class " + class_entry.getKey() + "{" + lineSeparator);
-      
+
       boolean is_first_method = true;
-      
+
       for(Entry<String, HashMap<Integer, Integer>> method_entry : class_mapping.entrySet()) {
         HashMap<Integer, Integer> method_mapping = method_entry.getValue();
-        
+
         if(!is_first_method) {
           buffer.append(lineSeparator);
         }
         buffer.append(indentstr1 + "method " + method_entry.getKey() + "{" + lineSeparator);
-        
+
         for(Entry<Integer, Integer> line : method_mapping.entrySet()) {
           buffer.append(indentstr2 + line.getKey() + indentstr2 + line.getValue() + lineSeparator);
         }
         buffer.append(indentstr1 + "}" + lineSeparator);
         is_first_method = false;
       }
-      buffer.append("}" + lineSeparator);      
+      buffer.append("}" + lineSeparator);
     }
   }
-  
+
   public int getTotalOffset() {
     return offset_total;
   }
@@ -69,7 +75,10 @@ public class BytecodeSourceMapper {
   public void setTotalOffset(int offset_total) {
     this.offset_total = offset_total;
   }
-  
-  
-  
+
+  public void addTotalOffset(int offset_total) {
+    this.offset_total += offset_total;
+  }
+
+
 }

src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java

@@ -107,17 +107,23 @@ public class ImportCollector {
     return retname == null ? nshort : retname;
   }
 
-  public boolean writeImports(StringBuilder buffer) {
+  public int writeImports(StringBuilder buffer) {
+
+    int importlines_written = 0;
+    String new_line_separator = DecompilerContext.getNewLineSeparator();
+
     List<String> imports = packImports();
 
     for (String s : imports) {
       buffer.append("import ");
       buffer.append(s);
       buffer.append(";");
-      buffer.append(DecompilerContext.getNewLineSeparator());
+      buffer.append(new_line_separator);
+
+      importlines_written++;
     }
 
-    return imports.size() > 0;
+    return importlines_written;
   }
 
   private List<String> packImports() {