diff options
Diffstat (limited to 'src/de/fernflower/modules/decompiler')
72 files changed, 633 insertions, 633 deletions
diff --git a/src/de/fernflower/modules/decompiler/ClearStructHelper.java b/src/de/fernflower/modules/decompiler/ClearStructHelper.java index 6323528..aedca91 100644 --- a/src/de/fernflower/modules/decompiler/ClearStructHelper.java +++ b/src/de/fernflower/modules/decompiler/ClearStructHelper.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.LinkedList; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class ClearStructHelper { diff --git a/src/de/fernflower/modules/decompiler/ConcatenationHelper.java b/src/de/fernflower/modules/decompiler/ConcatenationHelper.java index a8421d5..a07346b 100644 --- a/src/de/fernflower/modules/decompiler/ConcatenationHelper.java +++ b/src/de/fernflower/modules/decompiler/ConcatenationHelper.java @@ -12,20 +12,20 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class ConcatenationHelper { diff --git a/src/de/fernflower/modules/decompiler/DecHelper.java b/src/de/fernflower/modules/decompiler/DecHelper.java index 9b9e179..ea8823a 100644 --- a/src/de/fernflower/modules/decompiler/DecHelper.java +++ b/src/de/fernflower/modules/decompiler/DecHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashSet; @@ -20,8 +20,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class DecHelper { diff --git a/src/de/fernflower/modules/decompiler/DomHelper.java b/src/de/fernflower/modules/decompiler/DomHelper.java index 7b3d46f..ba6f839 100644 --- a/src/de/fernflower/modules/decompiler/DomHelper.java +++ b/src/de/fernflower/modules/decompiler/DomHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.io.File; import java.util.ArrayList; @@ -25,28 +25,28 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.code.cfg.ControlFlowGraph; -import de.fernflower.code.cfg.ExceptionRangeCFG; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.modules.decompiler.decompose.FastExtendedPostdominanceHelper; -import de.fernflower.modules.decompiler.deobfuscator.IrreducibleCFGDeobfuscator; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.GeneralStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SwitchStatement; -import de.fernflower.modules.decompiler.stats.SynchronizedStatement; -import de.fernflower.util.FastFixedSetFactory; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; -import de.fernflower.util.FastFixedSetFactory.FastFixedSet; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph; +import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.FastExtendedPostdominanceHelper; +import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.IrreducibleCFGDeobfuscator; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.GeneralStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement; +import org.jetbrains.java.decompiler.util.FastFixedSetFactory; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.VBStyleCollection; +import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet; public class DomHelper { diff --git a/src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java b/src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java index 9b6f91b..6854cd3 100644 --- a/src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java +++ b/src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class EliminateLoopsHelper { diff --git a/src/de/fernflower/modules/decompiler/ExitHelper.java b/src/de/fernflower/modules/decompiler/ExitHelper.java index 8cf9235..352415a 100644 --- a/src/de/fernflower/modules/decompiler/ExitHelper.java +++ b/src/de/fernflower/modules/decompiler/ExitHelper.java @@ -12,25 +12,25 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.exps.ExitExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; public class ExitHelper { diff --git a/src/de/fernflower/modules/decompiler/ExprProcessor.java b/src/de/fernflower/modules/decompiler/ExprProcessor.java index 7bc1bef..362e1a2 100644 --- a/src/de/fernflower/modules/decompiler/ExprProcessor.java +++ b/src/de/fernflower/modules/decompiler/ExprProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.Arrays; import java.util.HashMap; @@ -22,44 +22,44 @@ import java.util.List; import java.util.Map; import java.util.Set; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.exps.ArrayExprent; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.ExitExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FieldExprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.exps.MonitorExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.exps.SwitchExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.DirectNode; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.attr.StructBootstrapMethodsAttribute; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.LinkConstant; -import de.fernflower.struct.consts.PooledConstant; -import de.fernflower.struct.consts.PrimitiveConstant; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.attr.StructBootstrapMethodsAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.consts.PooledConstant; +import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ExprProcessor implements CodeConstants { diff --git a/src/de/fernflower/modules/decompiler/ExprentStack.java b/src/de/fernflower/modules/decompiler/ExprentStack.java index 6e76683..468dc41 100644 --- a/src/de/fernflower/modules/decompiler/ExprentStack.java +++ b/src/de/fernflower/modules/decompiler/ExprentStack.java @@ -12,10 +12,10 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.util.ListStack; public class ExprentStack extends ListStack<Exprent> { diff --git a/src/de/fernflower/modules/decompiler/FinallyProcessor.java b/src/de/fernflower/modules/decompiler/FinallyProcessor.java index 432e26b..3631090 100644 --- a/src/de/fernflower/modules/decompiler/FinallyProcessor.java +++ b/src/de/fernflower/modules/decompiler/FinallyProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashMap; @@ -21,35 +21,35 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.ConstantsUtil; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.SimpleInstructionSequence; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.code.cfg.ControlFlowGraph; -import de.fernflower.code.cfg.ExceptionRangeCFG; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.code.DeadCodeHelper; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ExitExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.DirectNode; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.sforms.SSAConstructorSparseEx; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.ConstantsUtil; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.SimpleInstructionSequence; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph; +import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class FinallyProcessor { diff --git a/src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java b/src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java index fe42f32..d11753e 100644 --- a/src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java +++ b/src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java @@ -12,26 +12,26 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.exps.AnnotationExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.ExitExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructAnnotationAttribute; -import de.fernflower.struct.attr.StructAnnotationParameterAttribute; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructAnnotationParameterAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class IdeaNotNullHelper { diff --git a/src/de/fernflower/modules/decompiler/IfHelper.java b/src/de/fernflower/modules/decompiler/IfHelper.java index 768e742..6894f71 100644 --- a/src/de/fernflower/modules/decompiler/IfHelper.java +++ b/src/de/fernflower/modules/decompiler/IfHelper.java @@ -12,20 +12,20 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class IfHelper { diff --git a/src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java b/src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java index 935c605..3fe181a 100644 --- a/src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java +++ b/src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SwitchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement; public class InlineSingleBlockHelper { diff --git a/src/de/fernflower/modules/decompiler/LabelHelper.java b/src/de/fernflower/modules/decompiler/LabelHelper.java index fc4f766..6d7a897 100644 --- a/src/de/fernflower/modules/decompiler/LabelHelper.java +++ b/src/de/fernflower/modules/decompiler/LabelHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; @@ -21,14 +21,14 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SwitchStatement; -import de.fernflower.modules.decompiler.stats.SynchronizedStatement; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement; public class LabelHelper { diff --git a/src/de/fernflower/modules/decompiler/LoopExtractHelper.java b/src/de/fernflower/modules/decompiler/LoopExtractHelper.java index b390c37..5e0130b 100644 --- a/src/de/fernflower/modules/decompiler/LoopExtractHelper.java +++ b/src/de/fernflower/modules/decompiler/LoopExtractHelper.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; import java.util.Set; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; diff --git a/src/de/fernflower/modules/decompiler/LowBreakHelper.java b/src/de/fernflower/modules/decompiler/LowBreakHelper.java index ae07a98..5811ef8 100644 --- a/src/de/fernflower/modules/decompiler/LowBreakHelper.java +++ b/src/de/fernflower/modules/decompiler/LowBreakHelper.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.List; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SynchronizedStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement; public class LowBreakHelper { diff --git a/src/de/fernflower/modules/decompiler/MergeHelper.java b/src/de/fernflower/modules/decompiler/MergeHelper.java index 6c69994..b9149e6 100644 --- a/src/de/fernflower/modules/decompiler/MergeHelper.java +++ b/src/de/fernflower/modules/decompiler/MergeHelper.java @@ -12,22 +12,22 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.List; import java.util.Set; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SwitchStatement; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement; public class MergeHelper { diff --git a/src/de/fernflower/modules/decompiler/PPandMMHelper.java b/src/de/fernflower/modules/decompiler/PPandMMHelper.java index 4ebd428..be90625 100644 --- a/src/de/fernflower/modules/decompiler/PPandMMHelper.java +++ b/src/de/fernflower/modules/decompiler/PPandMMHelper.java @@ -12,22 +12,22 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.DirectNode; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class PPandMMHelper { diff --git a/src/de/fernflower/modules/decompiler/PrimitiveExprsList.java b/src/de/fernflower/modules/decompiler/PrimitiveExprsList.java index 9e33bda..0a0ef45 100644 --- a/src/de/fernflower/modules/decompiler/PrimitiveExprsList.java +++ b/src/de/fernflower/modules/decompiler/PrimitiveExprsList.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; public class PrimitiveExprsList { diff --git a/src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java b/src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java index 338843e..e8f1e0a 100644 --- a/src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java +++ b/src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; @@ -20,20 +20,20 @@ import java.util.HashMap; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class SecondaryFunctionsHelper { diff --git a/src/de/fernflower/modules/decompiler/SequenceHelper.java b/src/de/fernflower/modules/decompiler/SequenceHelper.java index 6a27902..69721e8 100644 --- a/src/de/fernflower/modules/decompiler/SequenceHelper.java +++ b/src/de/fernflower/modules/decompiler/SequenceHelper.java @@ -12,19 +12,19 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.SequenceStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class SequenceHelper { diff --git a/src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java b/src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java index 522e4cb..8f55013 100644 --- a/src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java +++ b/src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.Arrays; @@ -22,28 +22,28 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.decompiler.exps.ArrayExprent; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.ExitExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.exps.MonitorExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.SSAConstructorSparseEx; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; public class SimplifyExprentsHelper { diff --git a/src/de/fernflower/modules/decompiler/StackVarsProcessor.java b/src/de/fernflower/modules/decompiler/StackVarsProcessor.java index 0b64a97..5dae30c 100644 --- a/src/de/fernflower/modules/decompiler/StackVarsProcessor.java +++ b/src/de/fernflower/modules/decompiler/StackVarsProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashMap; @@ -22,29 +22,29 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.MonitorExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.DirectNode; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.sforms.SSAConstructorSparseEx; -import de.fernflower.modules.decompiler.sforms.SSAUConstructorSparseEx; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarVersionEdge; -import de.fernflower.modules.decompiler.vars.VarVersionNode; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.modules.decompiler.vars.VarVersionsGraph; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.SFormsFastMapDirect; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAUConstructorSparseEx; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionEdge; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionNode; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.SFormsFastMapDirect; public class StackVarsProcessor { diff --git a/src/de/fernflower/modules/decompiler/StatEdge.java b/src/de/fernflower/modules/decompiler/StatEdge.java index 8ab7ee9..b20c2c7 100644 --- a/src/de/fernflower/modules/decompiler/StatEdge.java +++ b/src/de/fernflower/modules/decompiler/StatEdge.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class StatEdge { diff --git a/src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java b/src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java index b8ad7ab..a686f77 100644 --- a/src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java +++ b/src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler; +package org.jetbrains.java.decompiler.modules.decompiler; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.util.ListStack; // -------------------------------------------------------------------- // Algorithm diff --git a/src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java b/src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java index 188dc3d..e17a271 100644 --- a/src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java +++ b/src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.List; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class DominatorEngine { diff --git a/src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java index affc8c4..cf9e90c 100644 --- a/src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java +++ b/src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.HashMap; import java.util.HashSet; @@ -21,9 +21,9 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class DominatorTreeExceptionFilter { diff --git a/src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java index e8a00f0..e3093b5 100644 --- a/src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java +++ b/src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.ArrayList; import java.util.HashMap; @@ -23,11 +23,11 @@ import java.util.List; import java.util.Set; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.util.FastFixedSetFactory; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.FastFixedSetFactory.FastFixedSet; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.util.FastFixedSetFactory; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet; public class FastExtendedPostdominanceHelper { diff --git a/src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java b/src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java index 3097647..ed35202 100644 --- a/src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java +++ b/src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.List; import java.util.Set; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class GenericDominatorEngine { diff --git a/src/de/fernflower/modules/decompiler/decompose/IGraph.java b/src/de/fernflower/modules/decompiler/decompose/IGraph.java index 82bcf7d..8b72a4f 100644 --- a/src/de/fernflower/modules/decompiler/decompose/IGraph.java +++ b/src/de/fernflower/modules/decompiler/decompose/IGraph.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.List; import java.util.Set; diff --git a/src/de/fernflower/modules/decompiler/decompose/IGraphNode.java b/src/de/fernflower/modules/decompiler/decompose/IGraphNode.java index ee92a38..d2d1e0b 100644 --- a/src/de/fernflower/modules/decompiler/decompose/IGraphNode.java +++ b/src/de/fernflower/modules/decompiler/decompose/IGraphNode.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.decompose; +package org.jetbrains.java.decompiler.modules.decompiler.decompose; import java.util.List; diff --git a/src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java index eaec600..d0f7243 100644 --- a/src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java +++ b/src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.deobfuscator; +package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator; import java.util.ArrayList; import java.util.Arrays; @@ -23,17 +23,17 @@ import java.util.List; import java.util.Set; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.SimpleInstructionSequence; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.code.cfg.ControlFlowGraph; -import de.fernflower.code.cfg.ExceptionRangeCFG; -import de.fernflower.modules.decompiler.decompose.GenericDominatorEngine; -import de.fernflower.modules.decompiler.decompose.IGraph; -import de.fernflower.modules.decompiler.decompose.IGraphNode; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.SimpleInstructionSequence; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph; +import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraph; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ExceptionDeobfuscator { diff --git a/src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java index b6677fb..250a25e 100644 --- a/src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java +++ b/src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.deobfuscator; +package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator; import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class IrreducibleCFGDeobfuscator { diff --git a/src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java b/src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java index f8bddf1..2945913 100644 --- a/src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class AnnotationExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/ArrayExprent.java b/src/de/fernflower/modules/decompiler/exps/ArrayExprent.java index 14ac378..2f262bd 100644 --- a/src/de/fernflower/modules/decompiler/exps/ArrayExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/ArrayExprent.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ArrayExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/AssertExprent.java b/src/de/fernflower/modules/decompiler/exps/AssertExprent.java index 2bccbdf..03ead80 100644 --- a/src/de/fernflower/modules/decompiler/exps/AssertExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/AssertExprent.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.List; diff --git a/src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java b/src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java index a672f6c..9c233d4 100644 --- a/src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java @@ -12,20 +12,20 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class AssignmentExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/ConstExprent.java b/src/de/fernflower/modules/decompiler/exps/ConstExprent.java index b01bf69..10fa1d4 100644 --- a/src/de/fernflower/modules/decompiler/exps/ConstExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/ConstExprent.java @@ -12,19 +12,19 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.struct.gen.FieldDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ConstExprent extends Exprent { private static final HashMap<Integer, String> escapes = new HashMap<Integer, String>(); diff --git a/src/de/fernflower/modules/decompiler/exps/ExitExprent.java b/src/de/fernflower/modules/decompiler/exps/ExitExprent.java index 763af3b..ceaae30 100644 --- a/src/de/fernflower/modules/decompiler/exps/ExitExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/ExitExprent.java @@ -12,20 +12,20 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.struct.attr.StructExceptionsAttribute; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ExitExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/Exprent.java b/src/de/fernflower/modules/decompiler/exps/Exprent.java index ad5b3eb..6e15170 100644 --- a/src/de/fernflower/modules/decompiler/exps/Exprent.java +++ b/src/de/fernflower/modules/decompiler/exps/Exprent.java @@ -12,18 +12,18 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.gen.VarType; diff --git a/src/de/fernflower/modules/decompiler/exps/FieldExprent.java b/src/de/fernflower/modules/decompiler/exps/FieldExprent.java index d4334a0..235ff6f 100644 --- a/src/de/fernflower/modules/decompiler/exps/FieldExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/FieldExprent.java @@ -12,22 +12,22 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.consts.LinkConstant; -import de.fernflower.struct.gen.FieldDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class FieldExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/FunctionExprent.java b/src/de/fernflower/modules/decompiler/exps/FunctionExprent.java index d1637f4..e4c942f 100644 --- a/src/de/fernflower/modules/decompiler/exps/FunctionExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/FunctionExprent.java @@ -12,19 +12,19 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.ListStack; diff --git a/src/de/fernflower/modules/decompiler/exps/IfExprent.java b/src/de/fernflower/modules/decompiler/exps/IfExprent.java index 0786f49..15e39ba 100644 --- a/src/de/fernflower/modules/decompiler/exps/IfExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/IfExprent.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.ListStack; public class IfExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/InvocationExprent.java b/src/de/fernflower/modules/decompiler/exps/InvocationExprent.java index b4aeb0e..835e96e 100644 --- a/src/de/fernflower/modules/decompiler/exps/InvocationExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/InvocationExprent.java @@ -12,26 +12,26 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.*; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.consts.LinkConstant; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.ListStack; public class InvocationExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/MonitorExprent.java b/src/de/fernflower/modules/decompiler/exps/MonitorExprent.java index 21e8a8e..d231af0 100644 --- a/src/de/fernflower/modules/decompiler/exps/MonitorExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/MonitorExprent.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class MonitorExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/NewExprent.java b/src/de/fernflower/modules/decompiler/exps/NewExprent.java index 1023982..0d1814a 100644 --- a/src/de/fernflower/modules/decompiler/exps/NewExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/NewExprent.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.io.BufferedWriter; import java.io.IOException; @@ -21,18 +21,18 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassWriter; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassWriter; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.ListStack; public class NewExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/SwitchExprent.java b/src/de/fernflower/modules/decompiler/exps/SwitchExprent.java index 9516600..13bd3b4 100644 --- a/src/de/fernflower/modules/decompiler/exps/SwitchExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/SwitchExprent.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.vars.CheckTypesResult; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class SwitchExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/exps/VarExprent.java b/src/de/fernflower/modules/decompiler/exps/VarExprent.java index 12710c5..c2356ca 100644 --- a/src/de/fernflower/modules/decompiler/exps/VarExprent.java +++ b/src/de/fernflower/modules/decompiler/exps/VarExprent.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.exps; +package org.jetbrains.java.decompiler.modules.decompiler.exps; import java.io.BufferedWriter; import java.io.IOException; @@ -20,16 +20,16 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassWriter; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarTypeProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassWriter; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class VarExprent extends Exprent { diff --git a/src/de/fernflower/modules/decompiler/sforms/DirectGraph.java b/src/de/fernflower/modules/decompiler/sforms/DirectGraph.java index dc31401..b35f801 100644 --- a/src/de/fernflower/modules/decompiler/sforms/DirectGraph.java +++ b/src/de/fernflower/modules/decompiler/sforms/DirectGraph.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.sforms; +package org.jetbrains.java.decompiler.modules.decompiler.sforms; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class DirectGraph { diff --git a/src/de/fernflower/modules/decompiler/sforms/DirectNode.java b/src/de/fernflower/modules/decompiler/sforms/DirectNode.java index 8a85cfa..ebad3eb 100644 --- a/src/de/fernflower/modules/decompiler/sforms/DirectNode.java +++ b/src/de/fernflower/modules/decompiler/sforms/DirectNode.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.sforms; +package org.jetbrains.java.decompiler.modules.decompiler.sforms; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; public class DirectNode { diff --git a/src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java index 41b12f8..9388073 100644 --- a/src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java +++ b/src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.sforms; +package org.jetbrains.java.decompiler.modules.decompiler.sforms; import java.util.ArrayList; import java.util.HashMap; @@ -21,16 +21,16 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.IfStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SwitchStatement; -import de.fernflower.modules.decompiler.stats.SynchronizedStatement; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement; public class FlattenStatementsHelper { diff --git a/src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java index 150f71f..e21f38a 100644 --- a/src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java +++ b/src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.sforms; +package org.jetbrains.java.decompiler.modules.decompiler.sforms; import java.io.File; import java.util.ArrayList; @@ -21,23 +21,23 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.util.FastSparseSetFactory; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.SFormsFastMapDirect; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.SFormsFastMapDirect; public class SSAConstructorSparseEx { diff --git a/src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java index ba86aa2..a59780f 100644 --- a/src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java +++ b/src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.sforms; +package org.jetbrains.java.decompiler.modules.decompiler.sforms; import java.util.ArrayList; import java.util.HashMap; @@ -20,29 +20,29 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.stats.SynchronizedStatement; -import de.fernflower.modules.decompiler.vars.VarVersionEdge; -import de.fernflower.modules.decompiler.vars.VarVersionNode; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.modules.decompiler.vars.VarVersionsGraph; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.util.FastSparseSetFactory; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.SFormsFastMapDirect; -import de.fernflower.util.VBStyleCollection; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper.FinallyPathWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionEdge; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionNode; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.SFormsFastMapDirect; +import org.jetbrains.java.decompiler.util.VBStyleCollection; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; public class SSAUConstructorSparseEx { diff --git a/src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java b/src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java index 983f7f2..5cfa634 100644 --- a/src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.Instruction; -import de.fernflower.code.SimpleInstructionSequence; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.SimpleInstructionSequence; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; public class BasicBlockStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java b/src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java index 862f017..25adb29 100644 --- a/src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java @@ -12,23 +12,23 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.DecHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class CatchAllStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/CatchStatement.java b/src/de/fernflower/modules/decompiler/stats/CatchStatement.java index 0d6eb36..6387d45 100644 --- a/src/de/fernflower/modules/decompiler/stats/CatchStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/CatchStatement.java @@ -12,22 +12,22 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.DecHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class CatchStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/DoStatement.java b/src/de/fernflower/modules/decompiler/stats/DoStatement.java index 0dfdea2..604e36f 100644 --- a/src/de/fernflower/modules/decompiler/stats/DoStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/DoStatement.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class DoStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/GeneralStatement.java b/src/de/fernflower/modules/decompiler/stats/GeneralStatement.java index d398fbf..9cfaeb4 100644 --- a/src/de/fernflower/modules/decompiler/stats/GeneralStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/GeneralStatement.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.Collection; import java.util.HashSet; -import de.fernflower.main.DecompilerContext; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.util.InterpreterUtil; diff --git a/src/de/fernflower/modules/decompiler/stats/IfStatement.java b/src/de/fernflower/modules/decompiler/stats/IfStatement.java index 1f4b165..3e3e20b 100644 --- a/src/de/fernflower/modules/decompiler/stats/IfStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/IfStatement.java @@ -12,18 +12,18 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.DecHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.IfExprent; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class IfStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/RootStatement.java b/src/de/fernflower/modules/decompiler/stats/RootStatement.java index 1e515ae..c34888e 100644 --- a/src/de/fernflower/modules/decompiler/stats/RootStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/RootStatement.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; -import de.fernflower.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; public class RootStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/SequenceStatement.java b/src/de/fernflower/modules/decompiler/stats/SequenceStatement.java index ab8cf4c..79b0b19 100644 --- a/src/de/fernflower/modules/decompiler/stats/SequenceStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/SequenceStatement.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.Arrays; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.DecHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class SequenceStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/Statement.java b/src/de/fernflower/modules/decompiler/stats/Statement.java index 42bbff7..2f64035 100644 --- a/src/de/fernflower/modules/decompiler/stats/Statement.java +++ b/src/de/fernflower/modules/decompiler/stats/Statement.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.HashMap; @@ -22,15 +22,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.InstructionSequence; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.StrongConnectivityHelper; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.StrongConnectivityHelper; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/SwitchStatement.java b/src/de/fernflower/modules/decompiler/stats/SwitchStatement.java index 166a3dd..ec03886 100644 --- a/src/de/fernflower/modules/decompiler/stats/SwitchStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/SwitchStatement.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.Collections; @@ -21,18 +21,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import de.fernflower.code.SwitchInstruction; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.DecHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.SwitchExprent; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class SwitchStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java b/src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java index 5c73d61..5336f12 100644 --- a/src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java +++ b/src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java @@ -12,17 +12,17 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.stats; +package org.jetbrains.java.decompiler.modules.decompiler.stats; import java.util.ArrayList; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.SequenceHelper; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.SequenceHelper; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class SynchronizedStatement extends Statement { diff --git a/src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java b/src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java index df57b00..5519797 100644 --- a/src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java +++ b/src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class CheckTypesResult { diff --git a/src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java b/src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java index 9402091..5c04ccd 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java +++ b/src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.Arrays; @@ -24,19 +24,19 @@ import java.util.List; import java.util.Set; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; public class VarDefinitionHelper { diff --git a/src/de/fernflower/modules/decompiler/vars/VarProcessor.java b/src/de/fernflower/modules/decompiler/vars/VarProcessor.java index c491d86..6af5720 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarProcessor.java +++ b/src/de/fernflower/modules/decompiler/vars/VarProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.Collections; @@ -22,12 +22,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class VarProcessor { diff --git a/src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java b/src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java index 68b9e96..3e2e2b3 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java +++ b/src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java @@ -12,28 +12,28 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FunctionExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.stats.CatchAllStatement; -import de.fernflower.modules.decompiler.stats.CatchStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class VarTypeProcessor { diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java b/src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java index 01d04af..cac86ef 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java +++ b/src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; public class VarVersionEdge { // FIXME: can be removed? diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionNode.java b/src/de/fernflower/modules/decompiler/vars/VarVersionNode.java index 8ee8458..7e2b69b 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarVersionNode.java +++ b/src/de/fernflower/modules/decompiler/vars/VarVersionNode.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import de.fernflower.modules.decompiler.decompose.IGraphNode; -import de.fernflower.util.SFormsFastMapDirect; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode; +import org.jetbrains.java.decompiler.util.SFormsFastMapDirect; public class VarVersionNode implements IGraphNode { diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java b/src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java index 3b78505..b9a3cec 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java +++ b/src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; -import de.fernflower.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; public class VarVersionPaar { diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java b/src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java index fdc09e1..2ad672b 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java +++ b/src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.Collection; @@ -22,10 +22,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import de.fernflower.modules.decompiler.decompose.GenericDominatorEngine; -import de.fernflower.modules.decompiler.decompose.IGraph; -import de.fernflower.modules.decompiler.decompose.IGraphNode; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraph; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class VarVersionsGraph { diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java b/src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java index a301a5b..5e2adca 100644 --- a/src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java +++ b/src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.decompiler.vars; +package org.jetbrains.java.decompiler.modules.decompiler.vars; import java.util.ArrayList; import java.util.Collections; @@ -21,19 +21,19 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.sforms.SSAConstructorSparseEx; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; public class VarVersionsProcessor { |