From 4ca282df9439f7f4710020bcc0c0744ec5ebb3f3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 5 Jan 2019 13:54:23 +1100 Subject: [PATCH 1/2] IDEA-204998: Use decompile classes in preference to library classes GitOrigin-RevId: c600f67f720c2b74fe9009bb3dfb91b2dd6e868c --- .../java/decompiler/main/decompiler/ConsoleDecompiler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java index 120470d..75d4d09 100644 --- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java +++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java @@ -72,12 +72,12 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver { PrintStreamLogger logger = new PrintStreamLogger(System.out); ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger); - for (File source : sources) { - decompiler.addSource(source); - } for (File library : libraries) { decompiler.addLibrary(library); } + for (File source : sources) { + decompiler.addSource(source); + } decompiler.decompileContext(); } From 246de918ccb9c092c4d30664ffe611f77b0c7398 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 21 Jan 2020 16:33:08 +0100 Subject: [PATCH 2/2] remove author (only some, where it is ok) GitOrigin-RevId: 7dbab7524fe4efc5d17a04b95dee88b6f80fbe8d --- .../modules/decompiler/stats/DummyExitStatement.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java index 0b6e58b..c1d4530 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java @@ -1,13 +1,10 @@ -// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.Collection; import java.util.HashSet; import java.util.Set; -/** - * @author egor - */ public class DummyExitStatement extends Statement { public Set bytecode = null; // offsets of bytecode instructions mapped to dummy exit