From f864084061806fda5510e50bfd2e69bf1dea406b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 28 Aug 2014 20:49:56 +0400 Subject: java-decompiler: post-import cleanup (root package renamed) --- src/de/fernflower/code/CodeConstants.java | 2 +- src/de/fernflower/code/ConstantsUtil.java | 78 +++++++++++----------- src/de/fernflower/code/ExceptionHandler.java | 4 +- src/de/fernflower/code/ExceptionTable.java | 6 +- .../fernflower/code/FullInstructionSequence.java | 4 +- src/de/fernflower/code/IfInstruction.java | 2 +- src/de/fernflower/code/Instruction.java | 2 +- src/de/fernflower/code/InstructionSequence.java | 12 ++-- src/de/fernflower/code/JumpInstruction.java | 2 +- .../fernflower/code/SimpleInstructionSequence.java | 4 +- src/de/fernflower/code/SwitchInstruction.java | 2 +- src/de/fernflower/code/cfg/BasicBlock.java | 12 ++-- src/de/fernflower/code/cfg/ControlFlowGraph.java | 34 +++++----- src/de/fernflower/code/cfg/ExceptionRangeCFG.java | 4 +- src/de/fernflower/code/instructions/AALOAD.java | 4 +- src/de/fernflower/code/instructions/AASTORE.java | 4 +- .../fernflower/code/instructions/ACONST_NULL.java | 4 +- src/de/fernflower/code/instructions/ALOAD.java | 4 +- src/de/fernflower/code/instructions/ANEWARRAY.java | 4 +- src/de/fernflower/code/instructions/ARETURN.java | 4 +- .../fernflower/code/instructions/ARRAYLENGTH.java | 4 +- src/de/fernflower/code/instructions/ASTORE.java | 4 +- src/de/fernflower/code/instructions/ATHROW.java | 4 +- src/de/fernflower/code/instructions/BALOAD.java | 4 +- src/de/fernflower/code/instructions/BASTORE.java | 4 +- src/de/fernflower/code/instructions/BIPUSH.java | 4 +- src/de/fernflower/code/instructions/CALOAD.java | 4 +- src/de/fernflower/code/instructions/CASTORE.java | 4 +- src/de/fernflower/code/instructions/CHECKCAST.java | 4 +- src/de/fernflower/code/instructions/D2F.java | 4 +- src/de/fernflower/code/instructions/D2I.java | 4 +- src/de/fernflower/code/instructions/D2L.java | 4 +- src/de/fernflower/code/instructions/DADD.java | 4 +- src/de/fernflower/code/instructions/DALOAD.java | 4 +- src/de/fernflower/code/instructions/DASTORE.java | 4 +- src/de/fernflower/code/instructions/DCMPG.java | 4 +- src/de/fernflower/code/instructions/DCMPL.java | 4 +- src/de/fernflower/code/instructions/DCONST_0.java | 4 +- src/de/fernflower/code/instructions/DCONST_1.java | 4 +- src/de/fernflower/code/instructions/DDIV.java | 4 +- src/de/fernflower/code/instructions/DLOAD.java | 4 +- src/de/fernflower/code/instructions/DMUL.java | 4 +- src/de/fernflower/code/instructions/DNEG.java | 4 +- src/de/fernflower/code/instructions/DREM.java | 4 +- src/de/fernflower/code/instructions/DRETURN.java | 4 +- src/de/fernflower/code/instructions/DSTORE.java | 4 +- src/de/fernflower/code/instructions/DSUB.java | 4 +- src/de/fernflower/code/instructions/DUP.java | 4 +- src/de/fernflower/code/instructions/DUP2.java | 4 +- src/de/fernflower/code/instructions/DUP2_X1.java | 4 +- src/de/fernflower/code/instructions/DUP2_X2.java | 4 +- src/de/fernflower/code/instructions/DUP_X1.java | 4 +- src/de/fernflower/code/instructions/DUP_X2.java | 4 +- src/de/fernflower/code/instructions/F2D.java | 4 +- src/de/fernflower/code/instructions/F2I.java | 4 +- src/de/fernflower/code/instructions/F2L.java | 4 +- src/de/fernflower/code/instructions/FADD.java | 4 +- src/de/fernflower/code/instructions/FALOAD.java | 4 +- src/de/fernflower/code/instructions/FASTORE.java | 4 +- src/de/fernflower/code/instructions/FCMPG.java | 4 +- src/de/fernflower/code/instructions/FCMPL.java | 4 +- src/de/fernflower/code/instructions/FCONST_0.java | 4 +- src/de/fernflower/code/instructions/FCONST_1.java | 4 +- src/de/fernflower/code/instructions/FCONST_2.java | 4 +- src/de/fernflower/code/instructions/FDIV.java | 4 +- src/de/fernflower/code/instructions/FLOAD.java | 4 +- src/de/fernflower/code/instructions/FMUL.java | 4 +- src/de/fernflower/code/instructions/FNEG.java | 4 +- src/de/fernflower/code/instructions/FREM.java | 4 +- src/de/fernflower/code/instructions/FRETURN.java | 4 +- src/de/fernflower/code/instructions/FSTORE.java | 4 +- src/de/fernflower/code/instructions/FSUB.java | 4 +- src/de/fernflower/code/instructions/GETFIELD.java | 4 +- src/de/fernflower/code/instructions/GETSTATIC.java | 4 +- src/de/fernflower/code/instructions/GOTO.java | 4 +- src/de/fernflower/code/instructions/GOTO_W.java | 4 +- src/de/fernflower/code/instructions/I2B.java | 4 +- src/de/fernflower/code/instructions/I2C.java | 4 +- src/de/fernflower/code/instructions/I2D.java | 4 +- src/de/fernflower/code/instructions/I2F.java | 4 +- src/de/fernflower/code/instructions/I2L.java | 4 +- src/de/fernflower/code/instructions/I2S.java | 4 +- src/de/fernflower/code/instructions/IADD.java | 4 +- src/de/fernflower/code/instructions/IALOAD.java | 4 +- src/de/fernflower/code/instructions/IAND.java | 4 +- src/de/fernflower/code/instructions/IASTORE.java | 4 +- src/de/fernflower/code/instructions/IDIV.java | 4 +- src/de/fernflower/code/instructions/IFEQ.java | 4 +- src/de/fernflower/code/instructions/IFGE.java | 4 +- src/de/fernflower/code/instructions/IFGT.java | 4 +- src/de/fernflower/code/instructions/IFLE.java | 4 +- src/de/fernflower/code/instructions/IFLT.java | 4 +- src/de/fernflower/code/instructions/IFNE.java | 4 +- src/de/fernflower/code/instructions/IFNONNULL.java | 4 +- src/de/fernflower/code/instructions/IFNULL.java | 4 +- src/de/fernflower/code/instructions/IF_ACMPEQ.java | 4 +- src/de/fernflower/code/instructions/IF_ACMPNE.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPEQ.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPGE.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPGT.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPLE.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPLT.java | 4 +- src/de/fernflower/code/instructions/IF_ICMPNE.java | 4 +- src/de/fernflower/code/instructions/IINC.java | 4 +- src/de/fernflower/code/instructions/ILOAD.java | 4 +- src/de/fernflower/code/instructions/IMUL.java | 4 +- src/de/fernflower/code/instructions/INEG.java | 4 +- .../fernflower/code/instructions/INSTANCEOF.java | 4 +- .../code/instructions/INVOKEINTERFACE.java | 4 +- .../code/instructions/INVOKESPECIAL.java | 4 +- .../fernflower/code/instructions/INVOKESTATIC.java | 4 +- .../code/instructions/INVOKEVIRTUAL.java | 4 +- src/de/fernflower/code/instructions/IOR.java | 4 +- src/de/fernflower/code/instructions/IREM.java | 4 +- src/de/fernflower/code/instructions/IRETURN.java | 4 +- src/de/fernflower/code/instructions/ISHL.java | 4 +- src/de/fernflower/code/instructions/ISHR.java | 4 +- src/de/fernflower/code/instructions/ISTORE.java | 4 +- src/de/fernflower/code/instructions/ISUB.java | 4 +- src/de/fernflower/code/instructions/IUSHR.java | 4 +- src/de/fernflower/code/instructions/IXOR.java | 4 +- src/de/fernflower/code/instructions/JSR.java | 4 +- src/de/fernflower/code/instructions/JSR_W.java | 4 +- src/de/fernflower/code/instructions/L2D.java | 4 +- src/de/fernflower/code/instructions/L2F.java | 4 +- src/de/fernflower/code/instructions/L2I.java | 4 +- src/de/fernflower/code/instructions/LADD.java | 4 +- src/de/fernflower/code/instructions/LALOAD.java | 4 +- src/de/fernflower/code/instructions/LAND.java | 4 +- src/de/fernflower/code/instructions/LASTORE.java | 4 +- src/de/fernflower/code/instructions/LCMP.java | 4 +- src/de/fernflower/code/instructions/LCONST_0.java | 4 +- src/de/fernflower/code/instructions/LCONST_1.java | 4 +- src/de/fernflower/code/instructions/LDC.java | 4 +- src/de/fernflower/code/instructions/LDC2_W.java | 4 +- src/de/fernflower/code/instructions/LDC_W.java | 4 +- src/de/fernflower/code/instructions/LDIV.java | 4 +- src/de/fernflower/code/instructions/LLOAD.java | 4 +- src/de/fernflower/code/instructions/LMUL.java | 4 +- src/de/fernflower/code/instructions/LNEG.java | 4 +- .../fernflower/code/instructions/LOOKUPSWITCH.java | 4 +- src/de/fernflower/code/instructions/LOR.java | 4 +- src/de/fernflower/code/instructions/LREM.java | 4 +- src/de/fernflower/code/instructions/LRETURN.java | 4 +- src/de/fernflower/code/instructions/LSHL.java | 4 +- src/de/fernflower/code/instructions/LSHR.java | 4 +- src/de/fernflower/code/instructions/LSTORE.java | 4 +- src/de/fernflower/code/instructions/LSUB.java | 4 +- src/de/fernflower/code/instructions/LUSHR.java | 4 +- src/de/fernflower/code/instructions/LXOR.java | 4 +- .../fernflower/code/instructions/MONITORENTER.java | 4 +- .../fernflower/code/instructions/MONITOREXIT.java | 4 +- .../code/instructions/MULTIANEWARRAY.java | 4 +- src/de/fernflower/code/instructions/NEW.java | 4 +- src/de/fernflower/code/instructions/NEWARRAY.java | 4 +- src/de/fernflower/code/instructions/NOP.java | 4 +- src/de/fernflower/code/instructions/POP.java | 4 +- src/de/fernflower/code/instructions/POP2.java | 4 +- src/de/fernflower/code/instructions/PUTFIELD.java | 4 +- src/de/fernflower/code/instructions/PUTSTATIC.java | 4 +- src/de/fernflower/code/instructions/RET.java | 4 +- src/de/fernflower/code/instructions/RETURN.java | 4 +- src/de/fernflower/code/instructions/SALOAD.java | 4 +- src/de/fernflower/code/instructions/SASTORE.java | 4 +- src/de/fernflower/code/instructions/SIPUSH.java | 4 +- src/de/fernflower/code/instructions/SWAP.java | 4 +- .../fernflower/code/instructions/TABLESWITCH.java | 4 +- .../fernflower/code/instructions/XXXUNUSEDXXX.java | 4 +- .../code/interpreter/InstructionImpact.java | 20 +++--- src/de/fernflower/code/interpreter/Util.java | 8 +-- src/de/fernflower/code/optinstructions/ALOAD.java | 4 +- .../fernflower/code/optinstructions/ANEWARRAY.java | 4 +- src/de/fernflower/code/optinstructions/ASTORE.java | 4 +- src/de/fernflower/code/optinstructions/BIPUSH.java | 4 +- .../fernflower/code/optinstructions/CHECKCAST.java | 4 +- src/de/fernflower/code/optinstructions/DLOAD.java | 4 +- src/de/fernflower/code/optinstructions/DSTORE.java | 4 +- src/de/fernflower/code/optinstructions/FLOAD.java | 4 +- src/de/fernflower/code/optinstructions/FSTORE.java | 4 +- .../fernflower/code/optinstructions/GETFIELD.java | 4 +- .../fernflower/code/optinstructions/GETSTATIC.java | 4 +- src/de/fernflower/code/optinstructions/GOTO.java | 4 +- src/de/fernflower/code/optinstructions/GOTO_W.java | 4 +- src/de/fernflower/code/optinstructions/IINC.java | 4 +- src/de/fernflower/code/optinstructions/ILOAD.java | 4 +- .../code/optinstructions/INSTANCEOF.java | 4 +- .../code/optinstructions/INVOKEDYNAMIC.java | 4 +- .../code/optinstructions/INVOKEINTERFACE.java | 4 +- .../code/optinstructions/INVOKESPECIAL.java | 4 +- .../code/optinstructions/INVOKESTATIC.java | 4 +- .../code/optinstructions/INVOKEVIRTUAL.java | 4 +- src/de/fernflower/code/optinstructions/ISTORE.java | 4 +- src/de/fernflower/code/optinstructions/JSR.java | 4 +- src/de/fernflower/code/optinstructions/JSR_W.java | 4 +- src/de/fernflower/code/optinstructions/LDC.java | 4 +- src/de/fernflower/code/optinstructions/LDC2_W.java | 4 +- src/de/fernflower/code/optinstructions/LDC_W.java | 4 +- src/de/fernflower/code/optinstructions/LLOAD.java | 4 +- .../code/optinstructions/LOOKUPSWITCH.java | 4 +- src/de/fernflower/code/optinstructions/LSTORE.java | 4 +- .../code/optinstructions/MULTIANEWARRAY.java | 4 +- src/de/fernflower/code/optinstructions/NEW.java | 4 +- .../fernflower/code/optinstructions/NEWARRAY.java | 4 +- .../fernflower/code/optinstructions/PUTFIELD.java | 4 +- .../fernflower/code/optinstructions/PUTSTATIC.java | 4 +- src/de/fernflower/code/optinstructions/RET.java | 4 +- src/de/fernflower/code/optinstructions/SIPUSH.java | 4 +- .../code/optinstructions/TABLESWITCH.java | 4 +- src/de/fernflower/main/AssertProcessor.java | 54 +++++++-------- .../fernflower/main/ClassReference14Processor.java | 52 +++++++-------- src/de/fernflower/main/ClassWriter.java | 74 ++++++++++---------- src/de/fernflower/main/ClassesProcessor.java | 38 +++++------ src/de/fernflower/main/DecompilerContext.java | 16 ++--- src/de/fernflower/main/EnumProcessor.java | 34 +++++----- src/de/fernflower/main/Fernflower.java | 22 +++--- src/de/fernflower/main/InitializerProcessor.java | 34 +++++----- .../main/collectors/CounterContainer.java | 2 +- .../main/collectors/ImportCollector.java | 10 +-- .../main/collectors/VarNamesCollector.java | 2 +- .../main/decompiler/ConsoleDecompiler.java | 16 ++--- .../fernflower/main/decompiler/IdeDecompiler.java | 12 ++-- .../fernflower/main/decompiler/WebDecompiler.java | 4 +- .../main/decompiler/helper/PrintStreamLogger.java | 6 +- .../fernflower/main/extern/IBytecodeProvider.java | 2 +- .../fernflower/main/extern/IDecompilatSaver.java | 2 +- .../fernflower/main/extern/IFernflowerLogger.java | 2 +- .../main/extern/IFernflowerPreferences.java | 2 +- .../fernflower/main/extern/IIdentifierRenamer.java | 2 +- src/de/fernflower/main/rels/ClassWrapper.java | 38 +++++------ src/de/fernflower/main/rels/LambdaProcessor.java | 32 ++++----- .../main/rels/MethodProcessorThread.java | 56 ++++++++-------- src/de/fernflower/main/rels/MethodWrapper.java | 16 ++--- .../fernflower/main/rels/NestedClassProcessor.java | 58 ++++++++-------- .../fernflower/main/rels/NestedMemberAccess.java | 38 +++++------ src/de/fernflower/modules/code/DeadCodeHelper.java | 18 ++--- .../modules/decompiler/ClearStructHelper.java | 6 +- .../modules/decompiler/ConcatenationHelper.java | 18 ++--- .../fernflower/modules/decompiler/DecHelper.java | 6 +- .../fernflower/modules/decompiler/DomHelper.java | 46 ++++++------- .../modules/decompiler/EliminateLoopsHelper.java | 6 +- .../fernflower/modules/decompiler/ExitHelper.java | 26 ++++---- .../modules/decompiler/ExprProcessor.java | 78 +++++++++++----------- .../modules/decompiler/ExprentStack.java | 6 +- .../modules/decompiler/FinallyProcessor.java | 60 ++++++++--------- .../modules/decompiler/IdeaNotNullHelper.java | 34 +++++----- src/de/fernflower/modules/decompiler/IfHelper.java | 16 ++--- .../decompiler/InlineSingleBlockHelper.java | 12 ++-- .../fernflower/modules/decompiler/LabelHelper.java | 18 ++--- .../modules/decompiler/LoopExtractHelper.java | 10 +-- .../modules/decompiler/LowBreakHelper.java | 8 +-- .../fernflower/modules/decompiler/MergeHelper.java | 22 +++--- .../modules/decompiler/PPandMMHelper.java | 20 +++--- .../modules/decompiler/PrimitiveExprsList.java | 4 +- .../decompiler/SecondaryFunctionsHelper.java | 30 ++++----- .../modules/decompiler/SequenceHelper.java | 16 ++--- .../modules/decompiler/SimplifyExprentsHelper.java | 46 ++++++------- .../modules/decompiler/StackVarsProcessor.java | 48 ++++++------- src/de/fernflower/modules/decompiler/StatEdge.java | 4 +- .../decompiler/StrongConnectivityHelper.java | 6 +- .../decompiler/decompose/DominatorEngine.java | 8 +-- .../decompose/DominatorTreeExceptionFilter.java | 8 +-- .../decompose/FastExtendedPostdominanceHelper.java | 12 ++-- .../decompose/GenericDominatorEngine.java | 4 +- .../modules/decompiler/decompose/IGraph.java | 2 +- .../modules/decompiler/decompose/IGraphNode.java | 2 +- .../deobfuscator/ExceptionDeobfuscator.java | 24 +++---- .../deobfuscator/IrreducibleCFGDeobfuscator.java | 8 +-- .../modules/decompiler/exps/AnnotationExprent.java | 8 +-- .../modules/decompiler/exps/ArrayExprent.java | 10 +-- .../modules/decompiler/exps/AssertExprent.java | 2 +- .../modules/decompiler/exps/AssignmentExprent.java | 20 +++--- .../modules/decompiler/exps/ConstExprent.java | 16 ++--- .../modules/decompiler/exps/ExitExprent.java | 20 +++--- .../modules/decompiler/exps/Exprent.java | 12 ++-- .../modules/decompiler/exps/FieldExprent.java | 24 +++---- .../modules/decompiler/exps/FunctionExprent.java | 14 ++-- .../modules/decompiler/exps/IfExprent.java | 8 +-- .../modules/decompiler/exps/InvocationExprent.java | 34 +++++----- .../modules/decompiler/exps/MonitorExprent.java | 4 +- .../modules/decompiler/exps/NewExprent.java | 26 ++++---- .../modules/decompiler/exps/SwitchExprent.java | 8 +-- .../modules/decompiler/exps/VarExprent.java | 22 +++--- .../modules/decompiler/sforms/DirectGraph.java | 8 +-- .../modules/decompiler/sforms/DirectNode.java | 8 +-- .../decompiler/sforms/FlattenStatementsHelper.java | 22 +++--- .../decompiler/sforms/SSAConstructorSparseEx.java | 36 +++++----- .../decompiler/sforms/SSAUConstructorSparseEx.java | 48 ++++++------- .../decompiler/stats/BasicBlockStatement.java | 16 ++--- .../decompiler/stats/CatchAllStatement.java | 22 +++--- .../modules/decompiler/stats/CatchStatement.java | 22 +++--- .../modules/decompiler/stats/DoStatement.java | 12 ++-- .../modules/decompiler/stats/GeneralStatement.java | 6 +- .../modules/decompiler/stats/IfStatement.java | 16 ++--- .../modules/decompiler/stats/RootStatement.java | 4 +- .../decompiler/stats/SequenceStatement.java | 12 ++-- .../modules/decompiler/stats/Statement.java | 20 +++--- .../modules/decompiler/stats/SwitchStatement.java | 26 ++++---- .../decompiler/stats/SynchronizedStatement.java | 14 ++-- .../modules/decompiler/vars/CheckTypesResult.java | 6 +- .../decompiler/vars/VarDefinitionHelper.java | 28 ++++---- .../modules/decompiler/vars/VarProcessor.java | 14 ++-- .../modules/decompiler/vars/VarTypeProcessor.java | 34 +++++----- .../modules/decompiler/vars/VarVersionEdge.java | 2 +- .../modules/decompiler/vars/VarVersionNode.java | 6 +- .../modules/decompiler/vars/VarVersionPaar.java | 4 +- .../modules/decompiler/vars/VarVersionsGraph.java | 10 +-- .../decompiler/vars/VarVersionsProcessor.java | 28 ++++---- .../modules/renamer/ClassWrapperNode.java | 4 +- .../modules/renamer/ConverterHelper.java | 4 +- .../modules/renamer/IdentifierConverter.java | 26 ++++---- .../modules/renamer/PoolInterceptor.java | 4 +- src/de/fernflower/struct/ContextUnit.java | 8 +-- src/de/fernflower/struct/IDecompiledData.java | 2 +- src/de/fernflower/struct/ISaveClass.java | 2 +- src/de/fernflower/struct/StructClass.java | 18 ++--- src/de/fernflower/struct/StructContext.java | 10 +-- src/de/fernflower/struct/StructField.java | 8 +-- src/de/fernflower/struct/StructMethod.java | 26 ++++---- .../struct/attr/StructAnnDefaultAttribute.java | 6 +- .../struct/attr/StructAnnotationAttribute.java | 22 +++--- .../attr/StructAnnotationParameterAttribute.java | 6 +- .../struct/attr/StructAnnotationTypeAttribute.java | 6 +- .../attr/StructBootstrapMethodsAttribute.java | 8 +-- .../struct/attr/StructConstantValueAttribute.java | 4 +- .../attr/StructEnclosingMethodAttribute.java | 6 +- .../struct/attr/StructExceptionsAttribute.java | 4 +- .../struct/attr/StructGeneralAttribute.java | 4 +- .../attr/StructGenericSignatureAttribute.java | 4 +- .../struct/attr/StructInnerClassesAttribute.java | 4 +- .../attr/StructLocalVariableTableAttribute.java | 4 +- src/de/fernflower/struct/consts/ConstantPool.java | 14 ++-- src/de/fernflower/struct/consts/LinkConstant.java | 2 +- .../fernflower/struct/consts/PooledConstant.java | 4 +- .../struct/consts/PrimitiveConstant.java | 2 +- .../fernflower/struct/consts/VariableTypeEnum.java | 2 +- src/de/fernflower/struct/gen/DataPoint.java | 8 +-- src/de/fernflower/struct/gen/FieldDescriptor.java | 2 +- src/de/fernflower/struct/gen/MethodDescriptor.java | 2 +- src/de/fernflower/struct/gen/VarType.java | 6 +- .../gen/generics/GenericClassDescriptor.java | 2 +- .../gen/generics/GenericFieldDescriptor.java | 2 +- .../struct/gen/generics/GenericMain.java | 8 +-- .../gen/generics/GenericMethodDescriptor.java | 2 +- .../struct/gen/generics/GenericType.java | 4 +- src/de/fernflower/struct/lazy/LazyLoader.java | 12 ++-- src/de/fernflower/util/DataInputFullStream.java | 2 +- src/de/fernflower/util/FastFixedSetFactory.java | 2 +- src/de/fernflower/util/FastSetFactory.java | 2 +- src/de/fernflower/util/FastSparseSetFactory.java | 2 +- src/de/fernflower/util/InterpreterUtil.java | 6 +- src/de/fernflower/util/ListStack.java | 2 +- src/de/fernflower/util/SFormsFastMap.java | 4 +- src/de/fernflower/util/SFormsFastMapDirect.java | 6 +- src/de/fernflower/util/SFormsFastMapOld.java | 4 +- src/de/fernflower/util/VBStyleCollection.java | 2 +- 355 files changed, 1583 insertions(+), 1583 deletions(-) diff --git a/src/de/fernflower/code/CodeConstants.java b/src/de/fernflower/code/CodeConstants.java index 111b3fd..78cbcf0 100644 --- a/src/de/fernflower/code/CodeConstants.java +++ b/src/de/fernflower/code/CodeConstants.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; public interface CodeConstants { diff --git a/src/de/fernflower/code/ConstantsUtil.java b/src/de/fernflower/code/ConstantsUtil.java index ed9c5bd..dcaea77 100644 --- a/src/de/fernflower/code/ConstantsUtil.java +++ b/src/de/fernflower/code/ConstantsUtil.java @@ -12,46 +12,46 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; -import de.fernflower.code.optinstructions.ALOAD; -import de.fernflower.code.optinstructions.ANEWARRAY; -import de.fernflower.code.optinstructions.ASTORE; -import de.fernflower.code.optinstructions.BIPUSH; -import de.fernflower.code.optinstructions.CHECKCAST; -import de.fernflower.code.optinstructions.DLOAD; -import de.fernflower.code.optinstructions.DSTORE; -import de.fernflower.code.optinstructions.FLOAD; -import de.fernflower.code.optinstructions.FSTORE; -import de.fernflower.code.optinstructions.GETFIELD; -import de.fernflower.code.optinstructions.GETSTATIC; -import de.fernflower.code.optinstructions.GOTO; -import de.fernflower.code.optinstructions.GOTO_W; -import de.fernflower.code.optinstructions.IINC; -import de.fernflower.code.optinstructions.ILOAD; -import de.fernflower.code.optinstructions.INSTANCEOF; -import de.fernflower.code.optinstructions.INVOKEDYNAMIC; -import de.fernflower.code.optinstructions.INVOKEINTERFACE; -import de.fernflower.code.optinstructions.INVOKESPECIAL; -import de.fernflower.code.optinstructions.INVOKESTATIC; -import de.fernflower.code.optinstructions.INVOKEVIRTUAL; -import de.fernflower.code.optinstructions.ISTORE; -import de.fernflower.code.optinstructions.JSR; -import de.fernflower.code.optinstructions.JSR_W; -import de.fernflower.code.optinstructions.LDC; -import de.fernflower.code.optinstructions.LDC2_W; -import de.fernflower.code.optinstructions.LDC_W; -import de.fernflower.code.optinstructions.LLOAD; -import de.fernflower.code.optinstructions.LOOKUPSWITCH; -import de.fernflower.code.optinstructions.LSTORE; -import de.fernflower.code.optinstructions.MULTIANEWARRAY; -import de.fernflower.code.optinstructions.NEW; -import de.fernflower.code.optinstructions.NEWARRAY; -import de.fernflower.code.optinstructions.PUTFIELD; -import de.fernflower.code.optinstructions.PUTSTATIC; -import de.fernflower.code.optinstructions.RET; -import de.fernflower.code.optinstructions.SIPUSH; -import de.fernflower.code.optinstructions.TABLESWITCH; +import org.jetbrains.java.decompiler.code.optinstructions.ALOAD; +import org.jetbrains.java.decompiler.code.optinstructions.ANEWARRAY; +import org.jetbrains.java.decompiler.code.optinstructions.ASTORE; +import org.jetbrains.java.decompiler.code.optinstructions.BIPUSH; +import org.jetbrains.java.decompiler.code.optinstructions.CHECKCAST; +import org.jetbrains.java.decompiler.code.optinstructions.DLOAD; +import org.jetbrains.java.decompiler.code.optinstructions.DSTORE; +import org.jetbrains.java.decompiler.code.optinstructions.FLOAD; +import org.jetbrains.java.decompiler.code.optinstructions.FSTORE; +import org.jetbrains.java.decompiler.code.optinstructions.GETFIELD; +import org.jetbrains.java.decompiler.code.optinstructions.GETSTATIC; +import org.jetbrains.java.decompiler.code.optinstructions.GOTO; +import org.jetbrains.java.decompiler.code.optinstructions.GOTO_W; +import org.jetbrains.java.decompiler.code.optinstructions.IINC; +import org.jetbrains.java.decompiler.code.optinstructions.ILOAD; +import org.jetbrains.java.decompiler.code.optinstructions.INSTANCEOF; +import org.jetbrains.java.decompiler.code.optinstructions.INVOKEDYNAMIC; +import org.jetbrains.java.decompiler.code.optinstructions.INVOKEINTERFACE; +import org.jetbrains.java.decompiler.code.optinstructions.INVOKESPECIAL; +import org.jetbrains.java.decompiler.code.optinstructions.INVOKESTATIC; +import org.jetbrains.java.decompiler.code.optinstructions.INVOKEVIRTUAL; +import org.jetbrains.java.decompiler.code.optinstructions.ISTORE; +import org.jetbrains.java.decompiler.code.optinstructions.JSR; +import org.jetbrains.java.decompiler.code.optinstructions.JSR_W; +import org.jetbrains.java.decompiler.code.optinstructions.LDC; +import org.jetbrains.java.decompiler.code.optinstructions.LDC2_W; +import org.jetbrains.java.decompiler.code.optinstructions.LDC_W; +import org.jetbrains.java.decompiler.code.optinstructions.LLOAD; +import org.jetbrains.java.decompiler.code.optinstructions.LOOKUPSWITCH; +import org.jetbrains.java.decompiler.code.optinstructions.LSTORE; +import org.jetbrains.java.decompiler.code.optinstructions.MULTIANEWARRAY; +import org.jetbrains.java.decompiler.code.optinstructions.NEW; +import org.jetbrains.java.decompiler.code.optinstructions.NEWARRAY; +import org.jetbrains.java.decompiler.code.optinstructions.PUTFIELD; +import org.jetbrains.java.decompiler.code.optinstructions.PUTSTATIC; +import org.jetbrains.java.decompiler.code.optinstructions.RET; +import org.jetbrains.java.decompiler.code.optinstructions.SIPUSH; +import org.jetbrains.java.decompiler.code.optinstructions.TABLESWITCH; public class ConstantsUtil { diff --git a/src/de/fernflower/code/ExceptionHandler.java b/src/de/fernflower/code/ExceptionHandler.java index cced828..87598ac 100644 --- a/src/de/fernflower/code/ExceptionHandler.java +++ b/src/de/fernflower/code/ExceptionHandler.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.DecompilerContext; public class ExceptionHandler { diff --git a/src/de/fernflower/code/ExceptionTable.java b/src/de/fernflower/code/ExceptionTable.java index 0e07790..da8ec22 100644 --- a/src/de/fernflower/code/ExceptionTable.java +++ b/src/de/fernflower/code/ExceptionTable.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.interpreter.Util; -import de.fernflower.struct.StructContext; +import org.jetbrains.java.decompiler.code.interpreter.Util; +import org.jetbrains.java.decompiler.struct.StructContext; public class ExceptionTable { diff --git a/src/de/fernflower/code/FullInstructionSequence.java b/src/de/fernflower/code/FullInstructionSequence.java index d169932..f879fd0 100644 --- a/src/de/fernflower/code/FullInstructionSequence.java +++ b/src/de/fernflower/code/FullInstructionSequence.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class FullInstructionSequence extends InstructionSequence { diff --git a/src/de/fernflower/code/IfInstruction.java b/src/de/fernflower/code/IfInstruction.java index 1c980ec..befae18 100644 --- a/src/de/fernflower/code/IfInstruction.java +++ b/src/de/fernflower/code/IfInstruction.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/de/fernflower/code/Instruction.java b/src/de/fernflower/code/Instruction.java index e74c4e9..faa8926 100644 --- a/src/de/fernflower/code/Instruction.java +++ b/src/de/fernflower/code/Instruction.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/de/fernflower/code/InstructionSequence.java b/src/de/fernflower/code/InstructionSequence.java index 40d85ea..4c29820 100644 --- a/src/de/fernflower/code/InstructionSequence.java +++ b/src/de/fernflower/code/InstructionSequence.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; import java.io.DataOutputStream; import java.io.IOException; @@ -20,11 +20,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import de.fernflower.code.interpreter.Util; -import de.fernflower.main.DecompilerContext; -import de.fernflower.struct.StructContext; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.interpreter.Util; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.struct.StructContext; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public abstract class InstructionSequence { diff --git a/src/de/fernflower/code/JumpInstruction.java b/src/de/fernflower/code/JumpInstruction.java index 812b22e..2daeeeb 100644 --- a/src/de/fernflower/code/JumpInstruction.java +++ b/src/de/fernflower/code/JumpInstruction.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; /* * opc_ifeq, opc_ifne, opc_iflt, opc_ifge, opc_ifgt, opc_ifle, opc_if_icmpeq, opc_if_icmpne, opc_if_icmplt, diff --git a/src/de/fernflower/code/SimpleInstructionSequence.java b/src/de/fernflower/code/SimpleInstructionSequence.java index eb9b1d8..c082092 100644 --- a/src/de/fernflower/code/SimpleInstructionSequence.java +++ b/src/de/fernflower/code/SimpleInstructionSequence.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class SimpleInstructionSequence extends InstructionSequence { diff --git a/src/de/fernflower/code/SwitchInstruction.java b/src/de/fernflower/code/SwitchInstruction.java index 33041b9..63d0f4c 100644 --- a/src/de/fernflower/code/SwitchInstruction.java +++ b/src/de/fernflower/code/SwitchInstruction.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code; +package org.jetbrains.java.decompiler.code; /* * opc_tableswitch, lookupswitch diff --git a/src/de/fernflower/code/cfg/BasicBlock.java b/src/de/fernflower/code/cfg/BasicBlock.java index fa2b1d5..917da08 100644 --- a/src/de/fernflower/code/cfg/BasicBlock.java +++ b/src/de/fernflower/code/cfg/BasicBlock.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.cfg; +package org.jetbrains.java.decompiler.code.cfg; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.SimpleInstructionSequence; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.decompiler.decompose.IGraphNode; +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.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode; public class BasicBlock implements IGraphNode { diff --git a/src/de/fernflower/code/cfg/ControlFlowGraph.java b/src/de/fernflower/code/cfg/ControlFlowGraph.java index 46bdf76..824e8af 100644 --- a/src/de/fernflower/code/cfg/ControlFlowGraph.java +++ b/src/de/fernflower/code/cfg/ControlFlowGraph.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.cfg; +package org.jetbrains.java.decompiler.code.cfg; import java.util.ArrayList; import java.util.Arrays; @@ -25,22 +25,22 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.ExceptionHandler; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.JumpInstruction; -import de.fernflower.code.SimpleInstructionSequence; -import de.fernflower.code.SwitchInstruction; -import de.fernflower.code.interpreter.InstructionImpact; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.code.DeadCodeHelper; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.gen.DataPoint; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.ListStack; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.ExceptionHandler; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.SimpleInstructionSequence; +import org.jetbrains.java.decompiler.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.interpreter.InstructionImpact; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.gen.DataPoint; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.ListStack; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class ControlFlowGraph implements CodeConstants { diff --git a/src/de/fernflower/code/cfg/ExceptionRangeCFG.java b/src/de/fernflower/code/cfg/ExceptionRangeCFG.java index d5971ec..53f4a77 100644 --- a/src/de/fernflower/code/cfg/ExceptionRangeCFG.java +++ b/src/de/fernflower/code/cfg/ExceptionRangeCFG.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.cfg; +package org.jetbrains.java.decompiler.code.cfg; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import de.fernflower.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.DecompilerContext; public class ExceptionRangeCFG { diff --git a/src/de/fernflower/code/instructions/AALOAD.java b/src/de/fernflower/code/instructions/AALOAD.java index 8d83812..6e92fe6 100644 --- a/src/de/fernflower/code/instructions/AALOAD.java +++ b/src/de/fernflower/code/instructions/AALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class AALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/AASTORE.java b/src/de/fernflower/code/instructions/AASTORE.java index 1f6732a..09f5c4b 100644 --- a/src/de/fernflower/code/instructions/AASTORE.java +++ b/src/de/fernflower/code/instructions/AASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class AASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/ACONST_NULL.java b/src/de/fernflower/code/instructions/ACONST_NULL.java index 7301461..5733d40 100644 --- a/src/de/fernflower/code/instructions/ACONST_NULL.java +++ b/src/de/fernflower/code/instructions/ACONST_NULL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ACONST_NULL extends Instruction { diff --git a/src/de/fernflower/code/instructions/ALOAD.java b/src/de/fernflower/code/instructions/ALOAD.java index e5fcb98..a9c9e05 100644 --- a/src/de/fernflower/code/instructions/ALOAD.java +++ b/src/de/fernflower/code/instructions/ALOAD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/ANEWARRAY.java b/src/de/fernflower/code/instructions/ANEWARRAY.java index 5b7a49c..aa9a6c9 100644 --- a/src/de/fernflower/code/instructions/ANEWARRAY.java +++ b/src/de/fernflower/code/instructions/ANEWARRAY.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ANEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/instructions/ARETURN.java b/src/de/fernflower/code/instructions/ARETURN.java index c2889e5..915a50f 100644 --- a/src/de/fernflower/code/instructions/ARETURN.java +++ b/src/de/fernflower/code/instructions/ARETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ARETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/ARRAYLENGTH.java b/src/de/fernflower/code/instructions/ARRAYLENGTH.java index 5e37353..a54aa41 100644 --- a/src/de/fernflower/code/instructions/ARRAYLENGTH.java +++ b/src/de/fernflower/code/instructions/ARRAYLENGTH.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ARRAYLENGTH extends Instruction { diff --git a/src/de/fernflower/code/instructions/ASTORE.java b/src/de/fernflower/code/instructions/ASTORE.java index 05c47fa..701f082 100644 --- a/src/de/fernflower/code/instructions/ASTORE.java +++ b/src/de/fernflower/code/instructions/ASTORE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/ATHROW.java b/src/de/fernflower/code/instructions/ATHROW.java index 5f2338d..1ca07c5 100644 --- a/src/de/fernflower/code/instructions/ATHROW.java +++ b/src/de/fernflower/code/instructions/ATHROW.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ATHROW extends Instruction { diff --git a/src/de/fernflower/code/instructions/BALOAD.java b/src/de/fernflower/code/instructions/BALOAD.java index 245e007..c9d9e79 100644 --- a/src/de/fernflower/code/instructions/BALOAD.java +++ b/src/de/fernflower/code/instructions/BALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class BALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/BASTORE.java b/src/de/fernflower/code/instructions/BASTORE.java index 9818f93..478a887 100644 --- a/src/de/fernflower/code/instructions/BASTORE.java +++ b/src/de/fernflower/code/instructions/BASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class BASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/BIPUSH.java b/src/de/fernflower/code/instructions/BIPUSH.java index 115259f..90874c5 100644 --- a/src/de/fernflower/code/instructions/BIPUSH.java +++ b/src/de/fernflower/code/instructions/BIPUSH.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class BIPUSH extends Instruction { diff --git a/src/de/fernflower/code/instructions/CALOAD.java b/src/de/fernflower/code/instructions/CALOAD.java index 3a57aa3..cf3fb87 100644 --- a/src/de/fernflower/code/instructions/CALOAD.java +++ b/src/de/fernflower/code/instructions/CALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class CALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/CASTORE.java b/src/de/fernflower/code/instructions/CASTORE.java index df9484d..2ed21e5 100644 --- a/src/de/fernflower/code/instructions/CASTORE.java +++ b/src/de/fernflower/code/instructions/CASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class CASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/CHECKCAST.java b/src/de/fernflower/code/instructions/CHECKCAST.java index 958a737..a3bb57e 100644 --- a/src/de/fernflower/code/instructions/CHECKCAST.java +++ b/src/de/fernflower/code/instructions/CHECKCAST.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class CHECKCAST extends Instruction { diff --git a/src/de/fernflower/code/instructions/D2F.java b/src/de/fernflower/code/instructions/D2F.java index 47ea440..fd42a2e 100644 --- a/src/de/fernflower/code/instructions/D2F.java +++ b/src/de/fernflower/code/instructions/D2F.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class D2F extends Instruction { diff --git a/src/de/fernflower/code/instructions/D2I.java b/src/de/fernflower/code/instructions/D2I.java index 65285ed..4fc7801 100644 --- a/src/de/fernflower/code/instructions/D2I.java +++ b/src/de/fernflower/code/instructions/D2I.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class D2I extends Instruction { diff --git a/src/de/fernflower/code/instructions/D2L.java b/src/de/fernflower/code/instructions/D2L.java index 69c683b..cc90f1c 100644 --- a/src/de/fernflower/code/instructions/D2L.java +++ b/src/de/fernflower/code/instructions/D2L.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class D2L extends Instruction { diff --git a/src/de/fernflower/code/instructions/DADD.java b/src/de/fernflower/code/instructions/DADD.java index f2dd0c4..ac84423 100644 --- a/src/de/fernflower/code/instructions/DADD.java +++ b/src/de/fernflower/code/instructions/DADD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DADD extends Instruction { diff --git a/src/de/fernflower/code/instructions/DALOAD.java b/src/de/fernflower/code/instructions/DALOAD.java index 663a702..00a0d17 100644 --- a/src/de/fernflower/code/instructions/DALOAD.java +++ b/src/de/fernflower/code/instructions/DALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/DASTORE.java b/src/de/fernflower/code/instructions/DASTORE.java index fabb04b..e33959f 100644 --- a/src/de/fernflower/code/instructions/DASTORE.java +++ b/src/de/fernflower/code/instructions/DASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/DCMPG.java b/src/de/fernflower/code/instructions/DCMPG.java index a4b6249..2b853ac 100644 --- a/src/de/fernflower/code/instructions/DCMPG.java +++ b/src/de/fernflower/code/instructions/DCMPG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DCMPG extends Instruction { diff --git a/src/de/fernflower/code/instructions/DCMPL.java b/src/de/fernflower/code/instructions/DCMPL.java index 4f9bec5..7fdba33 100644 --- a/src/de/fernflower/code/instructions/DCMPL.java +++ b/src/de/fernflower/code/instructions/DCMPL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DCMPL extends Instruction { diff --git a/src/de/fernflower/code/instructions/DCONST_0.java b/src/de/fernflower/code/instructions/DCONST_0.java index e9380bc..d0023f2 100644 --- a/src/de/fernflower/code/instructions/DCONST_0.java +++ b/src/de/fernflower/code/instructions/DCONST_0.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DCONST_0 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DCONST_1.java b/src/de/fernflower/code/instructions/DCONST_1.java index e240aa0..bcd7c67 100644 --- a/src/de/fernflower/code/instructions/DCONST_1.java +++ b/src/de/fernflower/code/instructions/DCONST_1.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DCONST_1 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DDIV.java b/src/de/fernflower/code/instructions/DDIV.java index b51fdb0..40d86a8 100644 --- a/src/de/fernflower/code/instructions/DDIV.java +++ b/src/de/fernflower/code/instructions/DDIV.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DDIV extends Instruction { diff --git a/src/de/fernflower/code/instructions/DLOAD.java b/src/de/fernflower/code/instructions/DLOAD.java index 34768bd..ee098d6 100644 --- a/src/de/fernflower/code/instructions/DLOAD.java +++ b/src/de/fernflower/code/instructions/DLOAD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DLOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/DMUL.java b/src/de/fernflower/code/instructions/DMUL.java index d92efa3..65bedca 100644 --- a/src/de/fernflower/code/instructions/DMUL.java +++ b/src/de/fernflower/code/instructions/DMUL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DMUL extends Instruction { diff --git a/src/de/fernflower/code/instructions/DNEG.java b/src/de/fernflower/code/instructions/DNEG.java index 0fc2db3..15bd9f3 100644 --- a/src/de/fernflower/code/instructions/DNEG.java +++ b/src/de/fernflower/code/instructions/DNEG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DNEG extends Instruction { diff --git a/src/de/fernflower/code/instructions/DREM.java b/src/de/fernflower/code/instructions/DREM.java index 9b3fafc..ab57911 100644 --- a/src/de/fernflower/code/instructions/DREM.java +++ b/src/de/fernflower/code/instructions/DREM.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DREM extends Instruction { diff --git a/src/de/fernflower/code/instructions/DRETURN.java b/src/de/fernflower/code/instructions/DRETURN.java index 4e81f67..0a6e376 100644 --- a/src/de/fernflower/code/instructions/DRETURN.java +++ b/src/de/fernflower/code/instructions/DRETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DRETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/DSTORE.java b/src/de/fernflower/code/instructions/DSTORE.java index 9bd6d5a..fe1feb8 100644 --- a/src/de/fernflower/code/instructions/DSTORE.java +++ b/src/de/fernflower/code/instructions/DSTORE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DSTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/DSUB.java b/src/de/fernflower/code/instructions/DSUB.java index 31af128..d683a63 100644 --- a/src/de/fernflower/code/instructions/DSUB.java +++ b/src/de/fernflower/code/instructions/DSUB.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DSUB extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP.java b/src/de/fernflower/code/instructions/DUP.java index 85fe016..50119da 100644 --- a/src/de/fernflower/code/instructions/DUP.java +++ b/src/de/fernflower/code/instructions/DUP.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP2.java b/src/de/fernflower/code/instructions/DUP2.java index f489d49..3929ee0 100644 --- a/src/de/fernflower/code/instructions/DUP2.java +++ b/src/de/fernflower/code/instructions/DUP2.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP2 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP2_X1.java b/src/de/fernflower/code/instructions/DUP2_X1.java index faf9bfb..ad59230 100644 --- a/src/de/fernflower/code/instructions/DUP2_X1.java +++ b/src/de/fernflower/code/instructions/DUP2_X1.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP2_X1 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP2_X2.java b/src/de/fernflower/code/instructions/DUP2_X2.java index ebc8eea..d27ca93 100644 --- a/src/de/fernflower/code/instructions/DUP2_X2.java +++ b/src/de/fernflower/code/instructions/DUP2_X2.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP2_X2 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP_X1.java b/src/de/fernflower/code/instructions/DUP_X1.java index 3cad4e4..9b6b271 100644 --- a/src/de/fernflower/code/instructions/DUP_X1.java +++ b/src/de/fernflower/code/instructions/DUP_X1.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP_X1 extends Instruction { diff --git a/src/de/fernflower/code/instructions/DUP_X2.java b/src/de/fernflower/code/instructions/DUP_X2.java index c275dbe..8c4b03e 100644 --- a/src/de/fernflower/code/instructions/DUP_X2.java +++ b/src/de/fernflower/code/instructions/DUP_X2.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DUP_X2 extends Instruction { diff --git a/src/de/fernflower/code/instructions/F2D.java b/src/de/fernflower/code/instructions/F2D.java index a947a0e..debb8de 100644 --- a/src/de/fernflower/code/instructions/F2D.java +++ b/src/de/fernflower/code/instructions/F2D.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class F2D extends Instruction { diff --git a/src/de/fernflower/code/instructions/F2I.java b/src/de/fernflower/code/instructions/F2I.java index 233fb1d..bbda5c8 100644 --- a/src/de/fernflower/code/instructions/F2I.java +++ b/src/de/fernflower/code/instructions/F2I.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class F2I extends Instruction { diff --git a/src/de/fernflower/code/instructions/F2L.java b/src/de/fernflower/code/instructions/F2L.java index 0aaa3cf..a58a398 100644 --- a/src/de/fernflower/code/instructions/F2L.java +++ b/src/de/fernflower/code/instructions/F2L.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class F2L extends Instruction { diff --git a/src/de/fernflower/code/instructions/FADD.java b/src/de/fernflower/code/instructions/FADD.java index cef9ed4..ab7a357 100644 --- a/src/de/fernflower/code/instructions/FADD.java +++ b/src/de/fernflower/code/instructions/FADD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FADD extends Instruction { diff --git a/src/de/fernflower/code/instructions/FALOAD.java b/src/de/fernflower/code/instructions/FALOAD.java index fd633fd..cc56e21 100644 --- a/src/de/fernflower/code/instructions/FALOAD.java +++ b/src/de/fernflower/code/instructions/FALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/FASTORE.java b/src/de/fernflower/code/instructions/FASTORE.java index 9533e1b..d18a2ef 100644 --- a/src/de/fernflower/code/instructions/FASTORE.java +++ b/src/de/fernflower/code/instructions/FASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/FCMPG.java b/src/de/fernflower/code/instructions/FCMPG.java index 44b9151..a86b2a9 100644 --- a/src/de/fernflower/code/instructions/FCMPG.java +++ b/src/de/fernflower/code/instructions/FCMPG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FCMPG extends Instruction { diff --git a/src/de/fernflower/code/instructions/FCMPL.java b/src/de/fernflower/code/instructions/FCMPL.java index 9ce0171..450546c 100644 --- a/src/de/fernflower/code/instructions/FCMPL.java +++ b/src/de/fernflower/code/instructions/FCMPL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FCMPL extends Instruction { diff --git a/src/de/fernflower/code/instructions/FCONST_0.java b/src/de/fernflower/code/instructions/FCONST_0.java index 356a003..77f4e84 100644 --- a/src/de/fernflower/code/instructions/FCONST_0.java +++ b/src/de/fernflower/code/instructions/FCONST_0.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FCONST_0 extends Instruction { diff --git a/src/de/fernflower/code/instructions/FCONST_1.java b/src/de/fernflower/code/instructions/FCONST_1.java index 4301536..e90fd44 100644 --- a/src/de/fernflower/code/instructions/FCONST_1.java +++ b/src/de/fernflower/code/instructions/FCONST_1.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FCONST_1 extends Instruction { diff --git a/src/de/fernflower/code/instructions/FCONST_2.java b/src/de/fernflower/code/instructions/FCONST_2.java index 87439f7..7736565 100644 --- a/src/de/fernflower/code/instructions/FCONST_2.java +++ b/src/de/fernflower/code/instructions/FCONST_2.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FCONST_2 extends Instruction { diff --git a/src/de/fernflower/code/instructions/FDIV.java b/src/de/fernflower/code/instructions/FDIV.java index ff1bec9..0524b01 100644 --- a/src/de/fernflower/code/instructions/FDIV.java +++ b/src/de/fernflower/code/instructions/FDIV.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FDIV extends Instruction { diff --git a/src/de/fernflower/code/instructions/FLOAD.java b/src/de/fernflower/code/instructions/FLOAD.java index 10be028..03ba1d2 100644 --- a/src/de/fernflower/code/instructions/FLOAD.java +++ b/src/de/fernflower/code/instructions/FLOAD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FLOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/FMUL.java b/src/de/fernflower/code/instructions/FMUL.java index 4237bd2..598145b 100644 --- a/src/de/fernflower/code/instructions/FMUL.java +++ b/src/de/fernflower/code/instructions/FMUL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FMUL extends Instruction { diff --git a/src/de/fernflower/code/instructions/FNEG.java b/src/de/fernflower/code/instructions/FNEG.java index 56d30fd..b1d96ea 100644 --- a/src/de/fernflower/code/instructions/FNEG.java +++ b/src/de/fernflower/code/instructions/FNEG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FNEG extends Instruction { diff --git a/src/de/fernflower/code/instructions/FREM.java b/src/de/fernflower/code/instructions/FREM.java index 80faef5..b8dc0fe 100644 --- a/src/de/fernflower/code/instructions/FREM.java +++ b/src/de/fernflower/code/instructions/FREM.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FREM extends Instruction { diff --git a/src/de/fernflower/code/instructions/FRETURN.java b/src/de/fernflower/code/instructions/FRETURN.java index 3b0f7f7..3781401 100644 --- a/src/de/fernflower/code/instructions/FRETURN.java +++ b/src/de/fernflower/code/instructions/FRETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FRETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/FSTORE.java b/src/de/fernflower/code/instructions/FSTORE.java index 2944d3c..203588b 100644 --- a/src/de/fernflower/code/instructions/FSTORE.java +++ b/src/de/fernflower/code/instructions/FSTORE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FSTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/FSUB.java b/src/de/fernflower/code/instructions/FSUB.java index 34c0d38..841ee0d 100644 --- a/src/de/fernflower/code/instructions/FSUB.java +++ b/src/de/fernflower/code/instructions/FSUB.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FSUB extends Instruction { diff --git a/src/de/fernflower/code/instructions/GETFIELD.java b/src/de/fernflower/code/instructions/GETFIELD.java index 7bcbfdc..8500f46 100644 --- a/src/de/fernflower/code/instructions/GETFIELD.java +++ b/src/de/fernflower/code/instructions/GETFIELD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class GETFIELD extends Instruction { diff --git a/src/de/fernflower/code/instructions/GETSTATIC.java b/src/de/fernflower/code/instructions/GETSTATIC.java index 5b469f0..761624f 100644 --- a/src/de/fernflower/code/instructions/GETSTATIC.java +++ b/src/de/fernflower/code/instructions/GETSTATIC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class GETSTATIC extends Instruction { diff --git a/src/de/fernflower/code/instructions/GOTO.java b/src/de/fernflower/code/instructions/GOTO.java index 912d83c..91f5081 100644 --- a/src/de/fernflower/code/instructions/GOTO.java +++ b/src/de/fernflower/code/instructions/GOTO.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class GOTO extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/GOTO_W.java b/src/de/fernflower/code/instructions/GOTO_W.java index b347f91..830b766 100644 --- a/src/de/fernflower/code/instructions/GOTO_W.java +++ b/src/de/fernflower/code/instructions/GOTO_W.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class GOTO_W extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/I2B.java b/src/de/fernflower/code/instructions/I2B.java index 2d0ecef..f5a3fbd 100644 --- a/src/de/fernflower/code/instructions/I2B.java +++ b/src/de/fernflower/code/instructions/I2B.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2B extends Instruction { diff --git a/src/de/fernflower/code/instructions/I2C.java b/src/de/fernflower/code/instructions/I2C.java index de530a2..a180a64 100644 --- a/src/de/fernflower/code/instructions/I2C.java +++ b/src/de/fernflower/code/instructions/I2C.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2C extends Instruction { diff --git a/src/de/fernflower/code/instructions/I2D.java b/src/de/fernflower/code/instructions/I2D.java index 4c8e9d1..b0bad9a 100644 --- a/src/de/fernflower/code/instructions/I2D.java +++ b/src/de/fernflower/code/instructions/I2D.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2D extends Instruction { diff --git a/src/de/fernflower/code/instructions/I2F.java b/src/de/fernflower/code/instructions/I2F.java index 6386bdb..ca1a0fb 100644 --- a/src/de/fernflower/code/instructions/I2F.java +++ b/src/de/fernflower/code/instructions/I2F.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2F extends Instruction { diff --git a/src/de/fernflower/code/instructions/I2L.java b/src/de/fernflower/code/instructions/I2L.java index 07609de..24bca4e 100644 --- a/src/de/fernflower/code/instructions/I2L.java +++ b/src/de/fernflower/code/instructions/I2L.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2L extends Instruction { diff --git a/src/de/fernflower/code/instructions/I2S.java b/src/de/fernflower/code/instructions/I2S.java index 1a2ee83..370ae2f 100644 --- a/src/de/fernflower/code/instructions/I2S.java +++ b/src/de/fernflower/code/instructions/I2S.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class I2S extends Instruction { diff --git a/src/de/fernflower/code/instructions/IADD.java b/src/de/fernflower/code/instructions/IADD.java index 1ded582..f427c40 100644 --- a/src/de/fernflower/code/instructions/IADD.java +++ b/src/de/fernflower/code/instructions/IADD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IADD extends Instruction { diff --git a/src/de/fernflower/code/instructions/IALOAD.java b/src/de/fernflower/code/instructions/IALOAD.java index cb03953..d70fae6 100644 --- a/src/de/fernflower/code/instructions/IALOAD.java +++ b/src/de/fernflower/code/instructions/IALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/IAND.java b/src/de/fernflower/code/instructions/IAND.java index e5faa4d..00ae7a6 100644 --- a/src/de/fernflower/code/instructions/IAND.java +++ b/src/de/fernflower/code/instructions/IAND.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IAND extends Instruction { diff --git a/src/de/fernflower/code/instructions/IASTORE.java b/src/de/fernflower/code/instructions/IASTORE.java index 5293836..78a1d28 100644 --- a/src/de/fernflower/code/instructions/IASTORE.java +++ b/src/de/fernflower/code/instructions/IASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/IDIV.java b/src/de/fernflower/code/instructions/IDIV.java index 26f21bb..bec8cc9 100644 --- a/src/de/fernflower/code/instructions/IDIV.java +++ b/src/de/fernflower/code/instructions/IDIV.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IDIV extends Instruction { diff --git a/src/de/fernflower/code/instructions/IFEQ.java b/src/de/fernflower/code/instructions/IFEQ.java index 8090df2..47711d8 100644 --- a/src/de/fernflower/code/instructions/IFEQ.java +++ b/src/de/fernflower/code/instructions/IFEQ.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFEQ extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFGE.java b/src/de/fernflower/code/instructions/IFGE.java index c0c1661..9cfaba4 100644 --- a/src/de/fernflower/code/instructions/IFGE.java +++ b/src/de/fernflower/code/instructions/IFGE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFGE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFGT.java b/src/de/fernflower/code/instructions/IFGT.java index b070d8b..99b171e 100644 --- a/src/de/fernflower/code/instructions/IFGT.java +++ b/src/de/fernflower/code/instructions/IFGT.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFGT extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFLE.java b/src/de/fernflower/code/instructions/IFLE.java index 3867741..b21b2cf 100644 --- a/src/de/fernflower/code/instructions/IFLE.java +++ b/src/de/fernflower/code/instructions/IFLE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFLE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFLT.java b/src/de/fernflower/code/instructions/IFLT.java index f021d86..66ba02b 100644 --- a/src/de/fernflower/code/instructions/IFLT.java +++ b/src/de/fernflower/code/instructions/IFLT.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFLT extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFNE.java b/src/de/fernflower/code/instructions/IFNE.java index 90463ce..983fea2 100644 --- a/src/de/fernflower/code/instructions/IFNE.java +++ b/src/de/fernflower/code/instructions/IFNE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFNE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFNONNULL.java b/src/de/fernflower/code/instructions/IFNONNULL.java index b8aeed3..2555a80 100644 --- a/src/de/fernflower/code/instructions/IFNONNULL.java +++ b/src/de/fernflower/code/instructions/IFNONNULL.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFNONNULL extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IFNULL.java b/src/de/fernflower/code/instructions/IFNULL.java index 8586571..b695787 100644 --- a/src/de/fernflower/code/instructions/IFNULL.java +++ b/src/de/fernflower/code/instructions/IFNULL.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IFNULL extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ACMPEQ.java b/src/de/fernflower/code/instructions/IF_ACMPEQ.java index 0f7a065..30e530b 100644 --- a/src/de/fernflower/code/instructions/IF_ACMPEQ.java +++ b/src/de/fernflower/code/instructions/IF_ACMPEQ.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ACMPEQ extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ACMPNE.java b/src/de/fernflower/code/instructions/IF_ACMPNE.java index ee76629..ccb513f 100644 --- a/src/de/fernflower/code/instructions/IF_ACMPNE.java +++ b/src/de/fernflower/code/instructions/IF_ACMPNE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ACMPNE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPEQ.java b/src/de/fernflower/code/instructions/IF_ICMPEQ.java index 87d2891..1343aca 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPEQ.java +++ b/src/de/fernflower/code/instructions/IF_ICMPEQ.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPEQ extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPGE.java b/src/de/fernflower/code/instructions/IF_ICMPGE.java index 00d7cc3..beeabec 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPGE.java +++ b/src/de/fernflower/code/instructions/IF_ICMPGE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPGE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPGT.java b/src/de/fernflower/code/instructions/IF_ICMPGT.java index 0a803b8..e41d261 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPGT.java +++ b/src/de/fernflower/code/instructions/IF_ICMPGT.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPGT extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPLE.java b/src/de/fernflower/code/instructions/IF_ICMPLE.java index e523462..c9288da 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPLE.java +++ b/src/de/fernflower/code/instructions/IF_ICMPLE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPLE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPLT.java b/src/de/fernflower/code/instructions/IF_ICMPLT.java index ab6bf37..107519e 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPLT.java +++ b/src/de/fernflower/code/instructions/IF_ICMPLT.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPLT extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IF_ICMPNE.java b/src/de/fernflower/code/instructions/IF_ICMPNE.java index 8594560..703c10c 100644 --- a/src/de/fernflower/code/instructions/IF_ICMPNE.java +++ b/src/de/fernflower/code/instructions/IF_ICMPNE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class IF_ICMPNE extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/IINC.java b/src/de/fernflower/code/instructions/IINC.java index 964eda8..763a192 100644 --- a/src/de/fernflower/code/instructions/IINC.java +++ b/src/de/fernflower/code/instructions/IINC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IINC extends Instruction { diff --git a/src/de/fernflower/code/instructions/ILOAD.java b/src/de/fernflower/code/instructions/ILOAD.java index b6d741e..4b9bd59 100644 --- a/src/de/fernflower/code/instructions/ILOAD.java +++ b/src/de/fernflower/code/instructions/ILOAD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ILOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/IMUL.java b/src/de/fernflower/code/instructions/IMUL.java index 9b9b466..64dd4cc 100644 --- a/src/de/fernflower/code/instructions/IMUL.java +++ b/src/de/fernflower/code/instructions/IMUL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IMUL extends Instruction { diff --git a/src/de/fernflower/code/instructions/INEG.java b/src/de/fernflower/code/instructions/INEG.java index c87fda6..cf341e7 100644 --- a/src/de/fernflower/code/instructions/INEG.java +++ b/src/de/fernflower/code/instructions/INEG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INEG extends Instruction { diff --git a/src/de/fernflower/code/instructions/INSTANCEOF.java b/src/de/fernflower/code/instructions/INSTANCEOF.java index abe9c01..a4214ec 100644 --- a/src/de/fernflower/code/instructions/INSTANCEOF.java +++ b/src/de/fernflower/code/instructions/INSTANCEOF.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INSTANCEOF extends Instruction { diff --git a/src/de/fernflower/code/instructions/INVOKEINTERFACE.java b/src/de/fernflower/code/instructions/INVOKEINTERFACE.java index 38653d9..bd1ce37 100644 --- a/src/de/fernflower/code/instructions/INVOKEINTERFACE.java +++ b/src/de/fernflower/code/instructions/INVOKEINTERFACE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKEINTERFACE extends Instruction { diff --git a/src/de/fernflower/code/instructions/INVOKESPECIAL.java b/src/de/fernflower/code/instructions/INVOKESPECIAL.java index 123acdc..d14a8ee 100644 --- a/src/de/fernflower/code/instructions/INVOKESPECIAL.java +++ b/src/de/fernflower/code/instructions/INVOKESPECIAL.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKESPECIAL extends Instruction { diff --git a/src/de/fernflower/code/instructions/INVOKESTATIC.java b/src/de/fernflower/code/instructions/INVOKESTATIC.java index 6ed4cb4..8ef9f26 100644 --- a/src/de/fernflower/code/instructions/INVOKESTATIC.java +++ b/src/de/fernflower/code/instructions/INVOKESTATIC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKESTATIC extends Instruction { diff --git a/src/de/fernflower/code/instructions/INVOKEVIRTUAL.java b/src/de/fernflower/code/instructions/INVOKEVIRTUAL.java index a2df666..687c6e4 100644 --- a/src/de/fernflower/code/instructions/INVOKEVIRTUAL.java +++ b/src/de/fernflower/code/instructions/INVOKEVIRTUAL.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKEVIRTUAL extends Instruction { diff --git a/src/de/fernflower/code/instructions/IOR.java b/src/de/fernflower/code/instructions/IOR.java index 3b4121e..b3e6bae 100644 --- a/src/de/fernflower/code/instructions/IOR.java +++ b/src/de/fernflower/code/instructions/IOR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IOR extends Instruction { diff --git a/src/de/fernflower/code/instructions/IREM.java b/src/de/fernflower/code/instructions/IREM.java index d5f7a28..db1fbb8 100644 --- a/src/de/fernflower/code/instructions/IREM.java +++ b/src/de/fernflower/code/instructions/IREM.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IREM extends Instruction { diff --git a/src/de/fernflower/code/instructions/IRETURN.java b/src/de/fernflower/code/instructions/IRETURN.java index c6c21b6..2a2e48c 100644 --- a/src/de/fernflower/code/instructions/IRETURN.java +++ b/src/de/fernflower/code/instructions/IRETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IRETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/ISHL.java b/src/de/fernflower/code/instructions/ISHL.java index 4828426..5e0b1e0 100644 --- a/src/de/fernflower/code/instructions/ISHL.java +++ b/src/de/fernflower/code/instructions/ISHL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ISHL extends Instruction { diff --git a/src/de/fernflower/code/instructions/ISHR.java b/src/de/fernflower/code/instructions/ISHR.java index 6306772..9a8c182 100644 --- a/src/de/fernflower/code/instructions/ISHR.java +++ b/src/de/fernflower/code/instructions/ISHR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ISHR extends Instruction { diff --git a/src/de/fernflower/code/instructions/ISTORE.java b/src/de/fernflower/code/instructions/ISTORE.java index 3cddc9f..7bc1647 100644 --- a/src/de/fernflower/code/instructions/ISTORE.java +++ b/src/de/fernflower/code/instructions/ISTORE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ISTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/ISUB.java b/src/de/fernflower/code/instructions/ISUB.java index d101758..3007c8a 100644 --- a/src/de/fernflower/code/instructions/ISUB.java +++ b/src/de/fernflower/code/instructions/ISUB.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ISUB extends Instruction { diff --git a/src/de/fernflower/code/instructions/IUSHR.java b/src/de/fernflower/code/instructions/IUSHR.java index dc2945d..3171c1a 100644 --- a/src/de/fernflower/code/instructions/IUSHR.java +++ b/src/de/fernflower/code/instructions/IUSHR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IUSHR extends Instruction { diff --git a/src/de/fernflower/code/instructions/IXOR.java b/src/de/fernflower/code/instructions/IXOR.java index 119afe3..f6568d2 100644 --- a/src/de/fernflower/code/instructions/IXOR.java +++ b/src/de/fernflower/code/instructions/IXOR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IXOR extends Instruction { diff --git a/src/de/fernflower/code/instructions/JSR.java b/src/de/fernflower/code/instructions/JSR.java index 5f7bd45..bb23f66 100644 --- a/src/de/fernflower/code/instructions/JSR.java +++ b/src/de/fernflower/code/instructions/JSR.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class JSR extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/JSR_W.java b/src/de/fernflower/code/instructions/JSR_W.java index 77287be..47af3e6 100644 --- a/src/de/fernflower/code/instructions/JSR_W.java +++ b/src/de/fernflower/code/instructions/JSR_W.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class JSR_W extends JumpInstruction { diff --git a/src/de/fernflower/code/instructions/L2D.java b/src/de/fernflower/code/instructions/L2D.java index 55779d7..59178d2 100644 --- a/src/de/fernflower/code/instructions/L2D.java +++ b/src/de/fernflower/code/instructions/L2D.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class L2D extends Instruction { diff --git a/src/de/fernflower/code/instructions/L2F.java b/src/de/fernflower/code/instructions/L2F.java index 74ad340..37932b6 100644 --- a/src/de/fernflower/code/instructions/L2F.java +++ b/src/de/fernflower/code/instructions/L2F.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class L2F extends Instruction { diff --git a/src/de/fernflower/code/instructions/L2I.java b/src/de/fernflower/code/instructions/L2I.java index 8d4d2f1..c197282 100644 --- a/src/de/fernflower/code/instructions/L2I.java +++ b/src/de/fernflower/code/instructions/L2I.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class L2I extends Instruction { diff --git a/src/de/fernflower/code/instructions/LADD.java b/src/de/fernflower/code/instructions/LADD.java index 2515285..8c5625c 100644 --- a/src/de/fernflower/code/instructions/LADD.java +++ b/src/de/fernflower/code/instructions/LADD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LADD extends Instruction { diff --git a/src/de/fernflower/code/instructions/LALOAD.java b/src/de/fernflower/code/instructions/LALOAD.java index afab7fe..3590f94 100644 --- a/src/de/fernflower/code/instructions/LALOAD.java +++ b/src/de/fernflower/code/instructions/LALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/LAND.java b/src/de/fernflower/code/instructions/LAND.java index 8ac4cf9..46a396c 100644 --- a/src/de/fernflower/code/instructions/LAND.java +++ b/src/de/fernflower/code/instructions/LAND.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LAND extends Instruction { diff --git a/src/de/fernflower/code/instructions/LASTORE.java b/src/de/fernflower/code/instructions/LASTORE.java index f174c37..107af51 100644 --- a/src/de/fernflower/code/instructions/LASTORE.java +++ b/src/de/fernflower/code/instructions/LASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/LCMP.java b/src/de/fernflower/code/instructions/LCMP.java index 2143e63..8a9dac5 100644 --- a/src/de/fernflower/code/instructions/LCMP.java +++ b/src/de/fernflower/code/instructions/LCMP.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LCMP extends Instruction { diff --git a/src/de/fernflower/code/instructions/LCONST_0.java b/src/de/fernflower/code/instructions/LCONST_0.java index 8518285..5617fbe 100644 --- a/src/de/fernflower/code/instructions/LCONST_0.java +++ b/src/de/fernflower/code/instructions/LCONST_0.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LCONST_0 extends Instruction { diff --git a/src/de/fernflower/code/instructions/LCONST_1.java b/src/de/fernflower/code/instructions/LCONST_1.java index 45e5686..8244407 100644 --- a/src/de/fernflower/code/instructions/LCONST_1.java +++ b/src/de/fernflower/code/instructions/LCONST_1.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LCONST_1 extends Instruction { diff --git a/src/de/fernflower/code/instructions/LDC.java b/src/de/fernflower/code/instructions/LDC.java index d0c0fbb..088e5a5 100644 --- a/src/de/fernflower/code/instructions/LDC.java +++ b/src/de/fernflower/code/instructions/LDC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC extends Instruction { diff --git a/src/de/fernflower/code/instructions/LDC2_W.java b/src/de/fernflower/code/instructions/LDC2_W.java index 4f93622..9b67a7e 100644 --- a/src/de/fernflower/code/instructions/LDC2_W.java +++ b/src/de/fernflower/code/instructions/LDC2_W.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC2_W extends Instruction { diff --git a/src/de/fernflower/code/instructions/LDC_W.java b/src/de/fernflower/code/instructions/LDC_W.java index 38ed121..290462e 100644 --- a/src/de/fernflower/code/instructions/LDC_W.java +++ b/src/de/fernflower/code/instructions/LDC_W.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC_W extends Instruction { diff --git a/src/de/fernflower/code/instructions/LDIV.java b/src/de/fernflower/code/instructions/LDIV.java index 06bb469..36b09ca 100644 --- a/src/de/fernflower/code/instructions/LDIV.java +++ b/src/de/fernflower/code/instructions/LDIV.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDIV extends Instruction { diff --git a/src/de/fernflower/code/instructions/LLOAD.java b/src/de/fernflower/code/instructions/LLOAD.java index 4822051..0cf9695 100644 --- a/src/de/fernflower/code/instructions/LLOAD.java +++ b/src/de/fernflower/code/instructions/LLOAD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LLOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/LMUL.java b/src/de/fernflower/code/instructions/LMUL.java index b673a59..075c50b 100644 --- a/src/de/fernflower/code/instructions/LMUL.java +++ b/src/de/fernflower/code/instructions/LMUL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LMUL extends Instruction { diff --git a/src/de/fernflower/code/instructions/LNEG.java b/src/de/fernflower/code/instructions/LNEG.java index 818936f..b2c9f10 100644 --- a/src/de/fernflower/code/instructions/LNEG.java +++ b/src/de/fernflower/code/instructions/LNEG.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LNEG extends Instruction { diff --git a/src/de/fernflower/code/instructions/LOOKUPSWITCH.java b/src/de/fernflower/code/instructions/LOOKUPSWITCH.java index 9528003..dbe5f03 100644 --- a/src/de/fernflower/code/instructions/LOOKUPSWITCH.java +++ b/src/de/fernflower/code/instructions/LOOKUPSWITCH.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.SwitchInstruction; public class LOOKUPSWITCH extends SwitchInstruction { diff --git a/src/de/fernflower/code/instructions/LOR.java b/src/de/fernflower/code/instructions/LOR.java index 3e32e8c..55921d4 100644 --- a/src/de/fernflower/code/instructions/LOR.java +++ b/src/de/fernflower/code/instructions/LOR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LOR extends Instruction { diff --git a/src/de/fernflower/code/instructions/LREM.java b/src/de/fernflower/code/instructions/LREM.java index 59c517b..cd5073b 100644 --- a/src/de/fernflower/code/instructions/LREM.java +++ b/src/de/fernflower/code/instructions/LREM.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LREM extends Instruction { diff --git a/src/de/fernflower/code/instructions/LRETURN.java b/src/de/fernflower/code/instructions/LRETURN.java index f53f792..e7dea00 100644 --- a/src/de/fernflower/code/instructions/LRETURN.java +++ b/src/de/fernflower/code/instructions/LRETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LRETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/LSHL.java b/src/de/fernflower/code/instructions/LSHL.java index 3aee163..206f91a 100644 --- a/src/de/fernflower/code/instructions/LSHL.java +++ b/src/de/fernflower/code/instructions/LSHL.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LSHL extends Instruction { diff --git a/src/de/fernflower/code/instructions/LSHR.java b/src/de/fernflower/code/instructions/LSHR.java index 1522e01..b4276ad 100644 --- a/src/de/fernflower/code/instructions/LSHR.java +++ b/src/de/fernflower/code/instructions/LSHR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LSHR extends Instruction { diff --git a/src/de/fernflower/code/instructions/LSTORE.java b/src/de/fernflower/code/instructions/LSTORE.java index df7c1f0..1f5dfea 100644 --- a/src/de/fernflower/code/instructions/LSTORE.java +++ b/src/de/fernflower/code/instructions/LSTORE.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LSTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/LSUB.java b/src/de/fernflower/code/instructions/LSUB.java index ee6eead..14b019f 100644 --- a/src/de/fernflower/code/instructions/LSUB.java +++ b/src/de/fernflower/code/instructions/LSUB.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LSUB extends Instruction { diff --git a/src/de/fernflower/code/instructions/LUSHR.java b/src/de/fernflower/code/instructions/LUSHR.java index 223c32f..63d5ca4 100644 --- a/src/de/fernflower/code/instructions/LUSHR.java +++ b/src/de/fernflower/code/instructions/LUSHR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LUSHR extends Instruction { diff --git a/src/de/fernflower/code/instructions/LXOR.java b/src/de/fernflower/code/instructions/LXOR.java index 20601ee..9812a1a 100644 --- a/src/de/fernflower/code/instructions/LXOR.java +++ b/src/de/fernflower/code/instructions/LXOR.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LXOR extends Instruction { diff --git a/src/de/fernflower/code/instructions/MONITORENTER.java b/src/de/fernflower/code/instructions/MONITORENTER.java index 6faadca..d2ed979 100644 --- a/src/de/fernflower/code/instructions/MONITORENTER.java +++ b/src/de/fernflower/code/instructions/MONITORENTER.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class MONITORENTER extends Instruction { diff --git a/src/de/fernflower/code/instructions/MONITOREXIT.java b/src/de/fernflower/code/instructions/MONITOREXIT.java index cfdf60c..f1324be 100644 --- a/src/de/fernflower/code/instructions/MONITOREXIT.java +++ b/src/de/fernflower/code/instructions/MONITOREXIT.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class MONITOREXIT extends Instruction { diff --git a/src/de/fernflower/code/instructions/MULTIANEWARRAY.java b/src/de/fernflower/code/instructions/MULTIANEWARRAY.java index 58cffaa..313b708 100644 --- a/src/de/fernflower/code/instructions/MULTIANEWARRAY.java +++ b/src/de/fernflower/code/instructions/MULTIANEWARRAY.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class MULTIANEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/instructions/NEW.java b/src/de/fernflower/code/instructions/NEW.java index c3ce818..8c5ab34 100644 --- a/src/de/fernflower/code/instructions/NEW.java +++ b/src/de/fernflower/code/instructions/NEW.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class NEW extends Instruction { diff --git a/src/de/fernflower/code/instructions/NEWARRAY.java b/src/de/fernflower/code/instructions/NEWARRAY.java index a78920a..eb25456 100644 --- a/src/de/fernflower/code/instructions/NEWARRAY.java +++ b/src/de/fernflower/code/instructions/NEWARRAY.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class NEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/instructions/NOP.java b/src/de/fernflower/code/instructions/NOP.java index d0627e6..ef11da8 100644 --- a/src/de/fernflower/code/instructions/NOP.java +++ b/src/de/fernflower/code/instructions/NOP.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class NOP extends Instruction { diff --git a/src/de/fernflower/code/instructions/POP.java b/src/de/fernflower/code/instructions/POP.java index 9933161..8848163 100644 --- a/src/de/fernflower/code/instructions/POP.java +++ b/src/de/fernflower/code/instructions/POP.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class POP extends Instruction { diff --git a/src/de/fernflower/code/instructions/POP2.java b/src/de/fernflower/code/instructions/POP2.java index 1e882b1..f07d5d5 100644 --- a/src/de/fernflower/code/instructions/POP2.java +++ b/src/de/fernflower/code/instructions/POP2.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class POP2 extends Instruction { diff --git a/src/de/fernflower/code/instructions/PUTFIELD.java b/src/de/fernflower/code/instructions/PUTFIELD.java index 1080d86..b37efb0 100644 --- a/src/de/fernflower/code/instructions/PUTFIELD.java +++ b/src/de/fernflower/code/instructions/PUTFIELD.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class PUTFIELD extends Instruction { diff --git a/src/de/fernflower/code/instructions/PUTSTATIC.java b/src/de/fernflower/code/instructions/PUTSTATIC.java index d384de0..260e57c 100644 --- a/src/de/fernflower/code/instructions/PUTSTATIC.java +++ b/src/de/fernflower/code/instructions/PUTSTATIC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class PUTSTATIC extends Instruction { diff --git a/src/de/fernflower/code/instructions/RET.java b/src/de/fernflower/code/instructions/RET.java index fa0be2a..490ad8c 100644 --- a/src/de/fernflower/code/instructions/RET.java +++ b/src/de/fernflower/code/instructions/RET.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class RET extends Instruction { diff --git a/src/de/fernflower/code/instructions/RETURN.java b/src/de/fernflower/code/instructions/RETURN.java index 2c5bf51..cbdcbfc 100644 --- a/src/de/fernflower/code/instructions/RETURN.java +++ b/src/de/fernflower/code/instructions/RETURN.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class RETURN extends Instruction { diff --git a/src/de/fernflower/code/instructions/SALOAD.java b/src/de/fernflower/code/instructions/SALOAD.java index a61b7e0..c9da26e 100644 --- a/src/de/fernflower/code/instructions/SALOAD.java +++ b/src/de/fernflower/code/instructions/SALOAD.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class SALOAD extends Instruction { diff --git a/src/de/fernflower/code/instructions/SASTORE.java b/src/de/fernflower/code/instructions/SASTORE.java index a7da9cd..4a90aac 100644 --- a/src/de/fernflower/code/instructions/SASTORE.java +++ b/src/de/fernflower/code/instructions/SASTORE.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class SASTORE extends Instruction { diff --git a/src/de/fernflower/code/instructions/SIPUSH.java b/src/de/fernflower/code/instructions/SIPUSH.java index 106132c..a5f7025 100644 --- a/src/de/fernflower/code/instructions/SIPUSH.java +++ b/src/de/fernflower/code/instructions/SIPUSH.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class SIPUSH extends Instruction { diff --git a/src/de/fernflower/code/instructions/SWAP.java b/src/de/fernflower/code/instructions/SWAP.java index 0ba7074..9fd99b3 100644 --- a/src/de/fernflower/code/instructions/SWAP.java +++ b/src/de/fernflower/code/instructions/SWAP.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class SWAP extends Instruction { diff --git a/src/de/fernflower/code/instructions/TABLESWITCH.java b/src/de/fernflower/code/instructions/TABLESWITCH.java index e75ec4c..4a4be0a 100644 --- a/src/de/fernflower/code/instructions/TABLESWITCH.java +++ b/src/de/fernflower/code/instructions/TABLESWITCH.java @@ -1,9 +1,9 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.SwitchInstruction; public class TABLESWITCH extends SwitchInstruction { diff --git a/src/de/fernflower/code/instructions/XXXUNUSEDXXX.java b/src/de/fernflower/code/instructions/XXXUNUSEDXXX.java index 27180ee..2907258 100644 --- a/src/de/fernflower/code/instructions/XXXUNUSEDXXX.java +++ b/src/de/fernflower/code/instructions/XXXUNUSEDXXX.java @@ -1,6 +1,6 @@ -package de.fernflower.code.instructions; +package org.jetbrains.java.decompiler.code.instructions; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class XXXUNUSEDXXX extends Instruction { diff --git a/src/de/fernflower/code/interpreter/InstructionImpact.java b/src/de/fernflower/code/interpreter/InstructionImpact.java index 588991e..b155f05 100644 --- a/src/de/fernflower/code/interpreter/InstructionImpact.java +++ b/src/de/fernflower/code/interpreter/InstructionImpact.java @@ -12,17 +12,17 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.interpreter; +package org.jetbrains.java.decompiler.code.interpreter; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.Instruction; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.LinkConstant; -import de.fernflower.struct.consts.PrimitiveConstant; -import de.fernflower.struct.gen.DataPoint; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant; +import org.jetbrains.java.decompiler.struct.gen.DataPoint; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.ListStack; public class InstructionImpact { diff --git a/src/de/fernflower/code/interpreter/Util.java b/src/de/fernflower/code/interpreter/Util.java index 006b0ff..30aaf2c 100644 --- a/src/de/fernflower/code/interpreter/Util.java +++ b/src/de/fernflower/code/interpreter/Util.java @@ -12,11 +12,11 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.interpreter; +package org.jetbrains.java.decompiler.code.interpreter; -import de.fernflower.code.Instruction; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructContext; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructContext; // FIXME: move to StructContext diff --git a/src/de/fernflower/code/optinstructions/ALOAD.java b/src/de/fernflower/code/optinstructions/ALOAD.java index fa62c5c..b2727cf 100644 --- a/src/de/fernflower/code/optinstructions/ALOAD.java +++ b/src/de/fernflower/code/optinstructions/ALOAD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ALOAD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/ANEWARRAY.java b/src/de/fernflower/code/optinstructions/ANEWARRAY.java index 1ab6cd5..1e0d4ff 100644 --- a/src/de/fernflower/code/optinstructions/ANEWARRAY.java +++ b/src/de/fernflower/code/optinstructions/ANEWARRAY.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ANEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/ASTORE.java b/src/de/fernflower/code/optinstructions/ASTORE.java index afc6320..475df11 100644 --- a/src/de/fernflower/code/optinstructions/ASTORE.java +++ b/src/de/fernflower/code/optinstructions/ASTORE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ASTORE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/BIPUSH.java b/src/de/fernflower/code/optinstructions/BIPUSH.java index 179cf83..2fb2db5 100644 --- a/src/de/fernflower/code/optinstructions/BIPUSH.java +++ b/src/de/fernflower/code/optinstructions/BIPUSH.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class BIPUSH extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/CHECKCAST.java b/src/de/fernflower/code/optinstructions/CHECKCAST.java index 8ac69d9..73417de 100644 --- a/src/de/fernflower/code/optinstructions/CHECKCAST.java +++ b/src/de/fernflower/code/optinstructions/CHECKCAST.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class CHECKCAST extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/DLOAD.java b/src/de/fernflower/code/optinstructions/DLOAD.java index f838dc4..96d5449 100644 --- a/src/de/fernflower/code/optinstructions/DLOAD.java +++ b/src/de/fernflower/code/optinstructions/DLOAD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DLOAD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/DSTORE.java b/src/de/fernflower/code/optinstructions/DSTORE.java index 8987906..61a8776 100644 --- a/src/de/fernflower/code/optinstructions/DSTORE.java +++ b/src/de/fernflower/code/optinstructions/DSTORE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class DSTORE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/FLOAD.java b/src/de/fernflower/code/optinstructions/FLOAD.java index f1624d0..5c8fe26 100644 --- a/src/de/fernflower/code/optinstructions/FLOAD.java +++ b/src/de/fernflower/code/optinstructions/FLOAD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FLOAD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/FSTORE.java b/src/de/fernflower/code/optinstructions/FSTORE.java index f9915d5..3685254 100644 --- a/src/de/fernflower/code/optinstructions/FSTORE.java +++ b/src/de/fernflower/code/optinstructions/FSTORE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class FSTORE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/GETFIELD.java b/src/de/fernflower/code/optinstructions/GETFIELD.java index 19c43c1..b9a8ab5 100644 --- a/src/de/fernflower/code/optinstructions/GETFIELD.java +++ b/src/de/fernflower/code/optinstructions/GETFIELD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class GETFIELD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/GETSTATIC.java b/src/de/fernflower/code/optinstructions/GETSTATIC.java index 93a8408..1890bc0 100644 --- a/src/de/fernflower/code/optinstructions/GETSTATIC.java +++ b/src/de/fernflower/code/optinstructions/GETSTATIC.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class GETSTATIC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/GOTO.java b/src/de/fernflower/code/optinstructions/GOTO.java index 6c380a7..3a81194 100644 --- a/src/de/fernflower/code/optinstructions/GOTO.java +++ b/src/de/fernflower/code/optinstructions/GOTO.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class GOTO extends JumpInstruction { diff --git a/src/de/fernflower/code/optinstructions/GOTO_W.java b/src/de/fernflower/code/optinstructions/GOTO_W.java index 3524b3f..6e1f6e7 100644 --- a/src/de/fernflower/code/optinstructions/GOTO_W.java +++ b/src/de/fernflower/code/optinstructions/GOTO_W.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class GOTO_W extends JumpInstruction { diff --git a/src/de/fernflower/code/optinstructions/IINC.java b/src/de/fernflower/code/optinstructions/IINC.java index cdf3159..e945969 100644 --- a/src/de/fernflower/code/optinstructions/IINC.java +++ b/src/de/fernflower/code/optinstructions/IINC.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class IINC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/ILOAD.java b/src/de/fernflower/code/optinstructions/ILOAD.java index 55204d7..40bfa4d 100644 --- a/src/de/fernflower/code/optinstructions/ILOAD.java +++ b/src/de/fernflower/code/optinstructions/ILOAD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ILOAD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INSTANCEOF.java b/src/de/fernflower/code/optinstructions/INSTANCEOF.java index fda687d..f02dfc6 100644 --- a/src/de/fernflower/code/optinstructions/INSTANCEOF.java +++ b/src/de/fernflower/code/optinstructions/INSTANCEOF.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INSTANCEOF extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java b/src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java index 488e1a6..ee8c785 100644 --- a/src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java +++ b/src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java @@ -1,9 +1,9 @@ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKEDYNAMIC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java b/src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java index 37c3607..e4f06f2 100644 --- a/src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java +++ b/src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKEINTERFACE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INVOKESPECIAL.java b/src/de/fernflower/code/optinstructions/INVOKESPECIAL.java index f743fd7..6b9b559 100644 --- a/src/de/fernflower/code/optinstructions/INVOKESPECIAL.java +++ b/src/de/fernflower/code/optinstructions/INVOKESPECIAL.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKESPECIAL extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INVOKESTATIC.java b/src/de/fernflower/code/optinstructions/INVOKESTATIC.java index 628cac6..0f1ad16 100644 --- a/src/de/fernflower/code/optinstructions/INVOKESTATIC.java +++ b/src/de/fernflower/code/optinstructions/INVOKESTATIC.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKESTATIC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java b/src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java index 256a342..f4537f3 100644 --- a/src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java +++ b/src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class INVOKEVIRTUAL extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/ISTORE.java b/src/de/fernflower/code/optinstructions/ISTORE.java index 5d2f899..0ced128 100644 --- a/src/de/fernflower/code/optinstructions/ISTORE.java +++ b/src/de/fernflower/code/optinstructions/ISTORE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class ISTORE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/JSR.java b/src/de/fernflower/code/optinstructions/JSR.java index 14b83b6..ef6c2ad 100644 --- a/src/de/fernflower/code/optinstructions/JSR.java +++ b/src/de/fernflower/code/optinstructions/JSR.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class JSR extends JumpInstruction { diff --git a/src/de/fernflower/code/optinstructions/JSR_W.java b/src/de/fernflower/code/optinstructions/JSR_W.java index d2ab5e5..bc7ae59 100644 --- a/src/de/fernflower/code/optinstructions/JSR_W.java +++ b/src/de/fernflower/code/optinstructions/JSR_W.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.JumpInstruction; +import org.jetbrains.java.decompiler.code.JumpInstruction; public class JSR_W extends JumpInstruction { diff --git a/src/de/fernflower/code/optinstructions/LDC.java b/src/de/fernflower/code/optinstructions/LDC.java index 18380e1..4b1a715 100644 --- a/src/de/fernflower/code/optinstructions/LDC.java +++ b/src/de/fernflower/code/optinstructions/LDC.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/LDC2_W.java b/src/de/fernflower/code/optinstructions/LDC2_W.java index 40d1e98..4b7ea0b 100644 --- a/src/de/fernflower/code/optinstructions/LDC2_W.java +++ b/src/de/fernflower/code/optinstructions/LDC2_W.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC2_W extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/LDC_W.java b/src/de/fernflower/code/optinstructions/LDC_W.java index 38a60ea..6a4e3a6 100644 --- a/src/de/fernflower/code/optinstructions/LDC_W.java +++ b/src/de/fernflower/code/optinstructions/LDC_W.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LDC_W extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/LLOAD.java b/src/de/fernflower/code/optinstructions/LLOAD.java index 30d4cc6..52f2b5c 100644 --- a/src/de/fernflower/code/optinstructions/LLOAD.java +++ b/src/de/fernflower/code/optinstructions/LLOAD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LLOAD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java b/src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java index a488e59..1654622 100644 --- a/src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java +++ b/src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.SwitchInstruction; public class LOOKUPSWITCH extends SwitchInstruction { diff --git a/src/de/fernflower/code/optinstructions/LSTORE.java b/src/de/fernflower/code/optinstructions/LSTORE.java index 3a20344..410d19a 100644 --- a/src/de/fernflower/code/optinstructions/LSTORE.java +++ b/src/de/fernflower/code/optinstructions/LSTORE.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class LSTORE extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java b/src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java index 73a5c93..c7eb0b9 100644 --- a/src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java +++ b/src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class MULTIANEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/NEW.java b/src/de/fernflower/code/optinstructions/NEW.java index b6c3c90..eafe17c 100644 --- a/src/de/fernflower/code/optinstructions/NEW.java +++ b/src/de/fernflower/code/optinstructions/NEW.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class NEW extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/NEWARRAY.java b/src/de/fernflower/code/optinstructions/NEWARRAY.java index 081797c..8764a6f 100644 --- a/src/de/fernflower/code/optinstructions/NEWARRAY.java +++ b/src/de/fernflower/code/optinstructions/NEWARRAY.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class NEWARRAY extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/PUTFIELD.java b/src/de/fernflower/code/optinstructions/PUTFIELD.java index 9e0c989..096da07 100644 --- a/src/de/fernflower/code/optinstructions/PUTFIELD.java +++ b/src/de/fernflower/code/optinstructions/PUTFIELD.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class PUTFIELD extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/PUTSTATIC.java b/src/de/fernflower/code/optinstructions/PUTSTATIC.java index 306a868..e543c88 100644 --- a/src/de/fernflower/code/optinstructions/PUTSTATIC.java +++ b/src/de/fernflower/code/optinstructions/PUTSTATIC.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class PUTSTATIC extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/RET.java b/src/de/fernflower/code/optinstructions/RET.java index fcc07b9..d52d2a2 100644 --- a/src/de/fernflower/code/optinstructions/RET.java +++ b/src/de/fernflower/code/optinstructions/RET.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class RET extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/SIPUSH.java b/src/de/fernflower/code/optinstructions/SIPUSH.java index 666d198..5bac32f 100644 --- a/src/de/fernflower/code/optinstructions/SIPUSH.java +++ b/src/de/fernflower/code/optinstructions/SIPUSH.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.Instruction; +import org.jetbrains.java.decompiler.code.Instruction; public class SIPUSH extends Instruction { diff --git a/src/de/fernflower/code/optinstructions/TABLESWITCH.java b/src/de/fernflower/code/optinstructions/TABLESWITCH.java index ffaeeb4..ca2eae5 100644 --- a/src/de/fernflower/code/optinstructions/TABLESWITCH.java +++ b/src/de/fernflower/code/optinstructions/TABLESWITCH.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.code.optinstructions; +package org.jetbrains.java.decompiler.code.optinstructions; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.SwitchInstruction; +import org.jetbrains.java.decompiler.code.SwitchInstruction; public class TABLESWITCH extends SwitchInstruction { diff --git a/src/de/fernflower/main/AssertProcessor.java b/src/de/fernflower/main/AssertProcessor.java index 2cf4297..86e5c59 100644 --- a/src/de/fernflower/main/AssertProcessor.java +++ b/src/de/fernflower/main/AssertProcessor.java @@ -12,38 +12,38 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.cfg.BasicBlock; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.SecondaryFunctionsHelper; -import de.fernflower.modules.decompiler.StatEdge; -import de.fernflower.modules.decompiler.exps.AssertExprent; -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.InvocationExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.stats.BasicBlockStatement; -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.StructField; -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.code.cfg.BasicBlock; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.SecondaryFunctionsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AssertExprent; +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.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement; +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.StructField; +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 AssertProcessor { diff --git a/src/de/fernflower/main/ClassReference14Processor.java b/src/de/fernflower/main/ClassReference14Processor.java index 2f4e6ab..cdad6ca 100644 --- a/src/de/fernflower/main/ClassReference14Processor.java +++ b/src/de/fernflower/main/ClassReference14Processor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.util.ArrayList; import java.util.Arrays; @@ -20,31 +20,31 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.MethodWrapper; -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.InvocationExprent; -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.stats.BasicBlockStatement; -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.StructField; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +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.InvocationExprent; +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.stats.BasicBlockStatement; +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.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +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.VBStyleCollection; public class ClassReference14Processor { diff --git a/src/de/fernflower/main/ClassWriter.java b/src/de/fernflower/main/ClassWriter.java index 7a5a2f0..c14fe79 100644 --- a/src/de/fernflower/main/ClassWriter.java +++ b/src/de/fernflower/main/ClassWriter.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.io.BufferedWriter; import java.io.IOException; @@ -22,42 +22,42 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.exps.AnnotationExprent; -import de.fernflower.modules.decompiler.exps.ConstExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.vars.VarTypeProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.modules.renamer.PoolInterceptor; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructAnnDefaultAttribute; -import de.fernflower.struct.attr.StructAnnotationAttribute; -import de.fernflower.struct.attr.StructAnnotationParameterAttribute; -import de.fernflower.struct.attr.StructConstantValueAttribute; -import de.fernflower.struct.attr.StructExceptionsAttribute; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.attr.StructGenericSignatureAttribute; -import de.fernflower.struct.consts.PrimitiveConstant; -import de.fernflower.struct.gen.FieldDescriptor; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.struct.gen.generics.GenericClassDescriptor; -import de.fernflower.struct.gen.generics.GenericFieldDescriptor; -import de.fernflower.struct.gen.generics.GenericMain; -import de.fernflower.struct.gen.generics.GenericMethodDescriptor; -import de.fernflower.struct.gen.generics.GenericType; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +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.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructAnnDefaultAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructAnnotationParameterAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructConstantValueAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute; +import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor; +import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain; +import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.generics.GenericType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class ClassWriter { diff --git a/src/de/fernflower/main/ClassesProcessor.java b/src/de/fernflower/main/ClassesProcessor.java index 9d761d2..e0e144f 100644 --- a/src/de/fernflower/main/ClassesProcessor.java +++ b/src/de/fernflower/main/ClassesProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.io.BufferedWriter; import java.io.IOException; @@ -27,24 +27,24 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.collectors.ImportCollector; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.extern.IIdentifierRenamer; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.LambdaProcessor; -import de.fernflower.main.rels.NestedClassProcessor; -import de.fernflower.main.rels.NestedMemberAccess; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructContext; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructInnerClassesAttribute; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.collectors.ImportCollector; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.LambdaProcessor; +import org.jetbrains.java.decompiler.main.rels.NestedClassProcessor; +import org.jetbrains.java.decompiler.main.rels.NestedMemberAccess; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructContext; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ClassesProcessor { diff --git a/src/de/fernflower/main/DecompilerContext.java b/src/de/fernflower/main/DecompilerContext.java index 63de9ba..fc721b7 100644 --- a/src/de/fernflower/main/DecompilerContext.java +++ b/src/de/fernflower/main/DecompilerContext.java @@ -12,17 +12,17 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.util.HashMap; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.collectors.ImportCollector; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.renamer.PoolInterceptor; -import de.fernflower.struct.StructContext; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.collectors.ImportCollector; +import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor; +import org.jetbrains.java.decompiler.struct.StructContext; public class DecompilerContext { diff --git a/src/de/fernflower/main/EnumProcessor.java b/src/de/fernflower/main/EnumProcessor.java index f5bede8..7537596 100644 --- a/src/de/fernflower/main/EnumProcessor.java +++ b/src/de/fernflower/main/EnumProcessor.java @@ -12,24 +12,24 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.struct.StructMethod; -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.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +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.stats.Statement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +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 EnumProcessor { diff --git a/src/de/fernflower/main/Fernflower.java b/src/de/fernflower/main/Fernflower.java index 4f84c89..021ab1a 100644 --- a/src/de/fernflower/main/Fernflower.java +++ b/src/de/fernflower/main/Fernflower.java @@ -12,22 +12,22 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.io.BufferedWriter; import java.io.StringWriter; import java.util.HashMap; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.extern.IBytecodeProvider; -import de.fernflower.main.extern.IDecompilatSaver; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.renamer.IdentifierConverter; -import de.fernflower.struct.IDecompiledData; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructContext; -import de.fernflower.struct.lazy.LazyLoader; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; +import org.jetbrains.java.decompiler.main.extern.IDecompilatSaver; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.renamer.IdentifierConverter; +import org.jetbrains.java.decompiler.struct.IDecompiledData; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructContext; +import org.jetbrains.java.decompiler.struct.lazy.LazyLoader; public class Fernflower implements IDecompiledData { diff --git a/src/de/fernflower/main/InitializerProcessor.java b/src/de/fernflower/main/InitializerProcessor.java index e0369cf..ff6233c 100644 --- a/src/de/fernflower/main/InitializerProcessor.java +++ b/src/de/fernflower/main/InitializerProcessor.java @@ -12,27 +12,27 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main; +package org.jetbrains.java.decompiler.main; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.rels.ClassWrapper; -import de.fernflower.main.rels.MethodWrapper; -import de.fernflower.modules.decompiler.exps.AssignmentExprent; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.exps.FieldExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -import de.fernflower.modules.decompiler.exps.VarExprent; -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.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.rels.ClassWrapper; +import org.jetbrains.java.decompiler.main.rels.MethodWrapper; +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.FieldExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +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.StructClass; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class InitializerProcessor { diff --git a/src/de/fernflower/main/collectors/CounterContainer.java b/src/de/fernflower/main/collectors/CounterContainer.java index f174b85..dcc1968 100644 --- a/src/de/fernflower/main/collectors/CounterContainer.java +++ b/src/de/fernflower/main/collectors/CounterContainer.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.collectors; +package org.jetbrains.java.decompiler.main.collectors; public class CounterContainer { diff --git a/src/de/fernflower/main/collectors/ImportCollector.java b/src/de/fernflower/main/collectors/ImportCollector.java index 0191897..cdc6529 100644 --- a/src/de/fernflower/main/collectors/ImportCollector.java +++ b/src/de/fernflower/main/collectors/ImportCollector.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.collectors; +package org.jetbrains.java.decompiler.main.collectors; import java.io.BufferedWriter; import java.io.IOException; @@ -24,10 +24,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; -import de.fernflower.main.ClassesProcessor; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.struct.StructContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.struct.StructContext; public class ImportCollector { diff --git a/src/de/fernflower/main/collectors/VarNamesCollector.java b/src/de/fernflower/main/collectors/VarNamesCollector.java index d8b8708..5fd33c0 100644 --- a/src/de/fernflower/main/collectors/VarNamesCollector.java +++ b/src/de/fernflower/main/collectors/VarNamesCollector.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.collectors; +package org.jetbrains.java.decompiler.main.collectors; import java.util.HashSet; diff --git a/src/de/fernflower/main/decompiler/ConsoleDecompiler.java b/src/de/fernflower/main/decompiler/ConsoleDecompiler.java index b1c0334..408c430 100644 --- a/src/de/fernflower/main/decompiler/ConsoleDecompiler.java +++ b/src/de/fernflower/main/decompiler/ConsoleDecompiler.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.decompiler; +package org.jetbrains.java.decompiler.main.decompiler; import java.io.BufferedWriter; import java.io.File; @@ -32,13 +32,13 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.Fernflower; -import de.fernflower.main.decompiler.helper.PrintStreamLogger; -import de.fernflower.main.extern.IBytecodeProvider; -import de.fernflower.main.extern.IDecompilatSaver; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.Fernflower; +import org.jetbrains.java.decompiler.main.decompiler.helper.PrintStreamLogger; +import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; +import org.jetbrains.java.decompiler.main.extern.IDecompilatSaver; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class ConsoleDecompiler implements IBytecodeProvider, IDecompilatSaver { diff --git a/src/de/fernflower/main/decompiler/IdeDecompiler.java b/src/de/fernflower/main/decompiler/IdeDecompiler.java index d3dc36b..07dd0f0 100644 --- a/src/de/fernflower/main/decompiler/IdeDecompiler.java +++ b/src/de/fernflower/main/decompiler/IdeDecompiler.java @@ -12,17 +12,17 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.decompiler; +package org.jetbrains.java.decompiler.main.decompiler; import java.io.File; import java.io.IOException; import java.util.HashMap; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.Fernflower; -import de.fernflower.main.extern.IBytecodeProvider; -import de.fernflower.main.extern.IDecompilatSaver; -import de.fernflower.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.Fernflower; +import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; +import org.jetbrains.java.decompiler.main.extern.IDecompilatSaver; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; public class IdeDecompiler { diff --git a/src/de/fernflower/main/decompiler/WebDecompiler.java b/src/de/fernflower/main/decompiler/WebDecompiler.java index 7daf2a7..5f20c01 100644 --- a/src/de/fernflower/main/decompiler/WebDecompiler.java +++ b/src/de/fernflower/main/decompiler/WebDecompiler.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.decompiler; +package org.jetbrains.java.decompiler.main.decompiler; import java.io.File; import java.util.HashMap; import java.util.HashSet; -import de.fernflower.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; public class WebDecompiler extends ConsoleDecompiler { diff --git a/src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java b/src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java index 32211b1..6d03b34 100644 --- a/src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java +++ b/src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.decompiler.helper; +package org.jetbrains.java.decompiler.main.decompiler.helper; import java.io.PrintStream; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class PrintStreamLogger implements IFernflowerLogger { diff --git a/src/de/fernflower/main/extern/IBytecodeProvider.java b/src/de/fernflower/main/extern/IBytecodeProvider.java index 85ac985..6e13e51 100644 --- a/src/de/fernflower/main/extern/IBytecodeProvider.java +++ b/src/de/fernflower/main/extern/IBytecodeProvider.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.extern; +package org.jetbrains.java.decompiler.main.extern; import java.io.InputStream; diff --git a/src/de/fernflower/main/extern/IDecompilatSaver.java b/src/de/fernflower/main/extern/IDecompilatSaver.java index 333c6a7..855f95c 100644 --- a/src/de/fernflower/main/extern/IDecompilatSaver.java +++ b/src/de/fernflower/main/extern/IDecompilatSaver.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.extern; +package org.jetbrains.java.decompiler.main.extern; import java.util.jar.Manifest; diff --git a/src/de/fernflower/main/extern/IFernflowerLogger.java b/src/de/fernflower/main/extern/IFernflowerLogger.java index c33ce50..eb1427c 100644 --- a/src/de/fernflower/main/extern/IFernflowerLogger.java +++ b/src/de/fernflower/main/extern/IFernflowerLogger.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.extern; +package org.jetbrains.java.decompiler.main.extern; import java.util.HashMap; diff --git a/src/de/fernflower/main/extern/IFernflowerPreferences.java b/src/de/fernflower/main/extern/IFernflowerPreferences.java index 2cc0cea..9f19127 100644 --- a/src/de/fernflower/main/extern/IFernflowerPreferences.java +++ b/src/de/fernflower/main/extern/IFernflowerPreferences.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.extern; +package org.jetbrains.java.decompiler.main.extern; public interface IFernflowerPreferences { diff --git a/src/de/fernflower/main/extern/IIdentifierRenamer.java b/src/de/fernflower/main/extern/IIdentifierRenamer.java index 0fb21f3..f379da6 100644 --- a/src/de/fernflower/main/extern/IIdentifierRenamer.java +++ b/src/de/fernflower/main/extern/IIdentifierRenamer.java @@ -1,4 +1,4 @@ -package de.fernflower.main.extern; +package org.jetbrains.java.decompiler.main.extern; public interface IIdentifierRenamer { diff --git a/src/de/fernflower/main/rels/ClassWrapper.java b/src/de/fernflower/main/rels/ClassWrapper.java index e09b1df..dcbeaea 100644 --- a/src/de/fernflower/main/rels/ClassWrapper.java +++ b/src/de/fernflower/main/rels/ClassWrapper.java @@ -12,29 +12,29 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.io.IOException; import java.util.HashSet; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.attr.StructLocalVariableTableAttribute; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; +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.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +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.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class ClassWrapper { diff --git a/src/de/fernflower/main/rels/LambdaProcessor.java b/src/de/fernflower/main/rels/LambdaProcessor.java index 8e94646..bf5f72f 100644 --- a/src/de/fernflower/main/rels/LambdaProcessor.java +++ b/src/de/fernflower/main/rels/LambdaProcessor.java @@ -1,4 +1,4 @@ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.io.IOException; import java.util.HashMap; @@ -7,21 +7,21 @@ 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.main.ClassesProcessor; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.DecompilerContext; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructBootstrapMethodsAttribute; -import de.fernflower.struct.attr.StructGeneralAttribute; -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.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.main.ClassesProcessor; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructBootstrapMethodsAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +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.util.InterpreterUtil; public class LambdaProcessor { diff --git a/src/de/fernflower/main/rels/MethodProcessorThread.java b/src/de/fernflower/main/rels/MethodProcessorThread.java index 976c838..c3c180b 100644 --- a/src/de/fernflower/main/rels/MethodProcessorThread.java +++ b/src/de/fernflower/main/rels/MethodProcessorThread.java @@ -12,37 +12,37 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.io.IOException; -import de.fernflower.code.InstructionSequence; -import de.fernflower.code.cfg.ControlFlowGraph; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.modules.code.DeadCodeHelper; -import de.fernflower.modules.decompiler.ClearStructHelper; -import de.fernflower.modules.decompiler.DomHelper; -import de.fernflower.modules.decompiler.ExitHelper; -import de.fernflower.modules.decompiler.ExprProcessor; -import de.fernflower.modules.decompiler.FinallyProcessor; -import de.fernflower.modules.decompiler.IdeaNotNullHelper; -import de.fernflower.modules.decompiler.IfHelper; -import de.fernflower.modules.decompiler.InlineSingleBlockHelper; -import de.fernflower.modules.decompiler.LabelHelper; -import de.fernflower.modules.decompiler.LoopExtractHelper; -import de.fernflower.modules.decompiler.MergeHelper; -import de.fernflower.modules.decompiler.PPandMMHelper; -import de.fernflower.modules.decompiler.SecondaryFunctionsHelper; -import de.fernflower.modules.decompiler.SequenceHelper; -import de.fernflower.modules.decompiler.StackVarsProcessor; -import de.fernflower.modules.decompiler.deobfuscator.ExceptionDeobfuscator; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructMethod; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph; +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.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ClearStructHelper; +import org.jetbrains.java.decompiler.modules.decompiler.DomHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExitHelper; +import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.FinallyProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.IdeaNotNullHelper; +import org.jetbrains.java.decompiler.modules.decompiler.IfHelper; +import org.jetbrains.java.decompiler.modules.decompiler.InlineSingleBlockHelper; +import org.jetbrains.java.decompiler.modules.decompiler.LabelHelper; +import org.jetbrains.java.decompiler.modules.decompiler.LoopExtractHelper; +import org.jetbrains.java.decompiler.modules.decompiler.MergeHelper; +import org.jetbrains.java.decompiler.modules.decompiler.PPandMMHelper; +import org.jetbrains.java.decompiler.modules.decompiler.SecondaryFunctionsHelper; +import org.jetbrains.java.decompiler.modules.decompiler.SequenceHelper; +import org.jetbrains.java.decompiler.modules.decompiler.StackVarsProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator; +import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructMethod; public class MethodProcessorThread implements Runnable { diff --git a/src/de/fernflower/main/rels/MethodWrapper.java b/src/de/fernflower/main/rels/MethodWrapper.java index 050f74d..4f8d6f8 100644 --- a/src/de/fernflower/main/rels/MethodWrapper.java +++ b/src/de/fernflower/main/rels/MethodWrapper.java @@ -12,18 +12,18 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.util.HashSet; import java.util.List; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.modules.decompiler.sforms.DirectGraph; -import de.fernflower.modules.decompiler.sforms.FlattenStatementsHelper; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.vars.VarProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructMethod; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +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.stats.RootStatement; +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; public class MethodWrapper { diff --git a/src/de/fernflower/main/rels/NestedClassProcessor.java b/src/de/fernflower/main/rels/NestedClassProcessor.java index b785a75..1c962ec 100644 --- a/src/de/fernflower/main/rels/NestedClassProcessor.java +++ b/src/de/fernflower/main/rels/NestedClassProcessor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.util.ArrayList; import java.util.HashMap; @@ -22,34 +22,34 @@ 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.ClassesProcessor.ClassNode; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.main.extern.IFernflowerPreferences; -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.FieldExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -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.stats.DoStatement; -import de.fernflower.modules.decompiler.stats.RootStatement; -import de.fernflower.modules.decompiler.stats.Statement; -import de.fernflower.modules.decompiler.vars.VarTypeProcessor; -import de.fernflower.modules.decompiler.vars.VarVersionPaar; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructField; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructEnclosingMethodAttribute; -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.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +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.FieldExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +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.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.VarTypeProcessor; +import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute; +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 NestedClassProcessor { diff --git a/src/de/fernflower/main/rels/NestedMemberAccess.java b/src/de/fernflower/main/rels/NestedMemberAccess.java index 236b611..3eda632 100644 --- a/src/de/fernflower/main/rels/NestedMemberAccess.java +++ b/src/de/fernflower/main/rels/NestedMemberAccess.java @@ -12,30 +12,30 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.main.rels; +package org.jetbrains.java.decompiler.main.rels; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.ClassesProcessor.ClassNode; -import de.fernflower.main.collectors.CounterContainer; -import de.fernflower.main.collectors.VarNamesCollector; -import de.fernflower.main.extern.IFernflowerPreferences; -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.FieldExprent; -import de.fernflower.modules.decompiler.exps.InvocationExprent; -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.vars.VarVersionPaar; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.MethodDescriptor; -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.collectors.CounterContainer; +import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; +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.FieldExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent; +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.vars.VarVersionPaar; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class NestedMemberAccess { diff --git a/src/de/fernflower/modules/code/DeadCodeHelper.java b/src/de/fernflower/modules/code/DeadCodeHelper.java index 394da3d..4d39e68 100644 --- a/src/de/fernflower/modules/code/DeadCodeHelper.java +++ b/src/de/fernflower/modules/code/DeadCodeHelper.java @@ -12,21 +12,21 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.modules.code; +package org.jetbrains.java.decompiler.modules.code; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -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.IFernflowerPreferences; +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.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.IFernflowerPreferences; public class DeadCodeHelper { 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 { 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 escapes = new HashMap(); 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 { diff --git a/src/de/fernflower/modules/renamer/ClassWrapperNode.java b/src/de/fernflower/modules/renamer/ClassWrapperNode.java index 49a353e..a3015a8 100644 --- a/src/de/fernflower/modules/renamer/ClassWrapperNode.java +++ b/src/de/fernflower/modules/renamer/ClassWrapperNode.java @@ -1,9 +1,9 @@ -package de.fernflower.modules.renamer; +package org.jetbrains.java.decompiler.modules.renamer; import java.util.ArrayList; import java.util.List; -import de.fernflower.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructClass; public class ClassWrapperNode { diff --git a/src/de/fernflower/modules/renamer/ConverterHelper.java b/src/de/fernflower/modules/renamer/ConverterHelper.java index c6ea09a..d85d51f 100644 --- a/src/de/fernflower/modules/renamer/ConverterHelper.java +++ b/src/de/fernflower/modules/renamer/ConverterHelper.java @@ -1,8 +1,8 @@ -package de.fernflower.modules.renamer; +package org.jetbrains.java.decompiler.modules.renamer; import java.util.HashSet; -import de.fernflower.main.extern.IIdentifierRenamer; +import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer; public class ConverterHelper implements IIdentifierRenamer { diff --git a/src/de/fernflower/modules/renamer/IdentifierConverter.java b/src/de/fernflower/modules/renamer/IdentifierConverter.java index f2b124c..634dc59 100644 --- a/src/de/fernflower/modules/renamer/IdentifierConverter.java +++ b/src/de/fernflower/modules/renamer/IdentifierConverter.java @@ -1,4 +1,4 @@ -package de.fernflower.modules.renamer; +package org.jetbrains.java.decompiler.modules.renamer; import java.io.IOException; import java.util.ArrayList; @@ -7,18 +7,18 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerPreferences; -import de.fernflower.main.extern.IIdentifierRenamer; -import de.fernflower.struct.StructClass; -import de.fernflower.struct.StructContext; -import de.fernflower.struct.StructField; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.gen.FieldDescriptor; -import de.fernflower.struct.gen.MethodDescriptor; -import de.fernflower.struct.gen.VarType; -import de.fernflower.util.VBStyleCollection; +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.main.extern.IIdentifierRenamer; +import org.jetbrains.java.decompiler.struct.StructClass; +import org.jetbrains.java.decompiler.struct.StructContext; +import org.jetbrains.java.decompiler.struct.StructField; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.VBStyleCollection; public class IdentifierConverter { diff --git a/src/de/fernflower/modules/renamer/PoolInterceptor.java b/src/de/fernflower/modules/renamer/PoolInterceptor.java index 3e40dbb..73260f4 100644 --- a/src/de/fernflower/modules/renamer/PoolInterceptor.java +++ b/src/de/fernflower/modules/renamer/PoolInterceptor.java @@ -1,8 +1,8 @@ -package de.fernflower.modules.renamer; +package org.jetbrains.java.decompiler.modules.renamer; import java.util.HashMap; -import de.fernflower.main.extern.IIdentifierRenamer; +import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer; public class PoolInterceptor { diff --git a/src/de/fernflower/struct/ContextUnit.java b/src/de/fernflower/struct/ContextUnit.java index 4c47641..d859b29 100644 --- a/src/de/fernflower/struct/ContextUnit.java +++ b/src/de/fernflower/struct/ContextUnit.java @@ -12,16 +12,16 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.jar.Manifest; -import de.fernflower.main.extern.IDecompilatSaver; -import de.fernflower.struct.lazy.LazyLoader; -import de.fernflower.struct.lazy.LazyLoader.Link; +import org.jetbrains.java.decompiler.main.extern.IDecompilatSaver; +import org.jetbrains.java.decompiler.struct.lazy.LazyLoader; +import org.jetbrains.java.decompiler.struct.lazy.LazyLoader.Link; public class ContextUnit { diff --git a/src/de/fernflower/struct/IDecompiledData.java b/src/de/fernflower/struct/IDecompiledData.java index ea0684e..9c8bc14 100644 --- a/src/de/fernflower/struct/IDecompiledData.java +++ b/src/de/fernflower/struct/IDecompiledData.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; public interface IDecompiledData { diff --git a/src/de/fernflower/struct/ISaveClass.java b/src/de/fernflower/struct/ISaveClass.java index 9d45a4e..6fbfb9c 100644 --- a/src/de/fernflower/struct/ISaveClass.java +++ b/src/de/fernflower/struct/ISaveClass.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.DataOutputStream; import java.io.File; diff --git a/src/de/fernflower/struct/StructClass.java b/src/de/fernflower/struct/StructClass.java index 6824304..456cc70 100644 --- a/src/de/fernflower/struct/StructClass.java +++ b/src/de/fernflower/struct/StructClass.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.DataOutputStream; import java.io.File; @@ -22,14 +22,14 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import de.fernflower.code.CodeConstants; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.PrimitiveConstant; -import de.fernflower.struct.lazy.LazyLoader; -import de.fernflower.util.DataInputFullStream; -import de.fernflower.util.InterpreterUtil; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant; +import org.jetbrains.java.decompiler.struct.lazy.LazyLoader; +import org.jetbrains.java.decompiler.util.DataInputFullStream; +import org.jetbrains.java.decompiler.util.InterpreterUtil; +import org.jetbrains.java.decompiler.util.VBStyleCollection; /* ClassFile { diff --git a/src/de/fernflower/struct/StructContext.java b/src/de/fernflower/struct/StructContext.java index 1cef3b0..c253a10 100644 --- a/src/de/fernflower/struct/StructContext.java +++ b/src/de/fernflower/struct/StructContext.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.File; import java.io.IOException; @@ -22,10 +22,10 @@ import java.util.jar.JarFile; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IDecompilatSaver; -import de.fernflower.main.extern.IFernflowerLogger; -import de.fernflower.struct.lazy.LazyLoader; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IDecompilatSaver; +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; +import org.jetbrains.java.decompiler.struct.lazy.LazyLoader; public class StructContext { diff --git a/src/de/fernflower/struct/StructField.java b/src/de/fernflower/struct/StructField.java index 6cbb912..2537e7b 100644 --- a/src/de/fernflower/struct/StructField.java +++ b/src/de/fernflower/struct/StructField.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.util.VBStyleCollection; /* field_info { diff --git a/src/de/fernflower/struct/StructMethod.java b/src/de/fernflower/struct/StructMethod.java index 035fa68..20fdae9 100644 --- a/src/de/fernflower/struct/StructMethod.java +++ b/src/de/fernflower/struct/StructMethod.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct; +package org.jetbrains.java.decompiler.struct; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -21,18 +21,18 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.code.ConstantsUtil; -import de.fernflower.code.ExceptionHandler; -import de.fernflower.code.ExceptionTable; -import de.fernflower.code.FullInstructionSequence; -import de.fernflower.code.Instruction; -import de.fernflower.code.InstructionSequence; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.attr.StructLocalVariableTableAttribute; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.util.DataInputFullStream; -import de.fernflower.util.VBStyleCollection; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.ConstantsUtil; +import org.jetbrains.java.decompiler.code.ExceptionHandler; +import org.jetbrains.java.decompiler.code.ExceptionTable; +import org.jetbrains.java.decompiler.code.FullInstructionSequence; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.util.DataInputFullStream; +import org.jetbrains.java.decompiler.util.VBStyleCollection; /* method_info { diff --git a/src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java b/src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java index bbf3556..d171349 100644 --- a/src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java +++ b/src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java @@ -12,13 +12,13 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import de.fernflower.modules.decompiler.exps.Exprent; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructAnnDefaultAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructAnnotationAttribute.java b/src/de/fernflower/struct/attr/StructAnnotationAttribute.java index 5458d0b..8958299 100644 --- a/src/de/fernflower/struct/attr/StructAnnotationAttribute.java +++ b/src/de/fernflower/struct/attr/StructAnnotationAttribute.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -20,16 +20,16 @@ import java.io.IOException; import java.util.ArrayList; 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.Exprent; -import de.fernflower.modules.decompiler.exps.FieldExprent; -import de.fernflower.modules.decompiler.exps.NewExprent; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.PrimitiveConstant; -import de.fernflower.struct.gen.FieldDescriptor; -import de.fernflower.struct.gen.VarType; +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.Exprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class StructAnnotationAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java b/src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java index c7f9f7c..dd28aa7 100644 --- a/src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java +++ b/src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -20,8 +20,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.exps.AnnotationExprent; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructAnnotationParameterAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java b/src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java index 0c8aec9..9677ddd 100644 --- a/src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java +++ b/src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java @@ -1,4 +1,4 @@ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -6,8 +6,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.modules.decompiler.exps.AnnotationExprent; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructAnnotationTypeAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java b/src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java index 37b10a6..ac51027 100644 --- a/src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java +++ b/src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java @@ -1,4 +1,4 @@ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -6,9 +6,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.LinkConstant; -import de.fernflower.struct.consts.PooledConstant; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.consts.PooledConstant; public class StructBootstrapMethodsAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructConstantValueAttribute.java b/src/de/fernflower/struct/attr/StructConstantValueAttribute.java index a6d4542..f186767 100644 --- a/src/de/fernflower/struct/attr/StructConstantValueAttribute.java +++ b/src/de/fernflower/struct/attr/StructConstantValueAttribute.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructConstantValueAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java b/src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java index bbb31f2..61bb886 100644 --- a/src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java +++ b/src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java @@ -12,10 +12,10 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.struct.consts.LinkConstant; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.LinkConstant; public class StructEnclosingMethodAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructExceptionsAttribute.java b/src/de/fernflower/struct/attr/StructExceptionsAttribute.java index 2939e0d..4d6bd4c 100644 --- a/src/de/fernflower/struct/attr/StructExceptionsAttribute.java +++ b/src/de/fernflower/struct/attr/StructExceptionsAttribute.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructExceptionsAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructGeneralAttribute.java b/src/de/fernflower/struct/attr/StructGeneralAttribute.java index 05a0e8e..2648b3c 100644 --- a/src/de/fernflower/struct/attr/StructGeneralAttribute.java +++ b/src/de/fernflower/struct/attr/StructGeneralAttribute.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; /* attribute_info { diff --git a/src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java b/src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java index db2dd63..11206e0 100644 --- a/src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java +++ b/src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java @@ -12,9 +12,9 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructGenericSignatureAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructInnerClassesAttribute.java b/src/de/fernflower/struct/attr/StructInnerClassesAttribute.java index 8ecf017..794da15 100644 --- a/src/de/fernflower/struct/attr/StructInnerClassesAttribute.java +++ b/src/de/fernflower/struct/attr/StructInnerClassesAttribute.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.util.ArrayList; import java.util.List; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructInnerClassesAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java b/src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java index d8e3b1d..119d1ff 100644 --- a/src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java +++ b/src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java @@ -12,11 +12,11 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.attr; +package org.jetbrains.java.decompiler.struct.attr; import java.util.HashMap; -import de.fernflower.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; public class StructLocalVariableTableAttribute extends StructGeneralAttribute { diff --git a/src/de/fernflower/struct/consts/ConstantPool.java b/src/de/fernflower/struct/consts/ConstantPool.java index c1d6976..8951cd1 100644 --- a/src/de/fernflower/struct/consts/ConstantPool.java +++ b/src/de/fernflower/struct/consts/ConstantPool.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.consts; +package org.jetbrains.java.decompiler.struct.consts; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -21,12 +21,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.modules.renamer.PoolInterceptor; -import de.fernflower.struct.gen.FieldDescriptor; -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.renamer.PoolInterceptor; +import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor; +import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor; +import org.jetbrains.java.decompiler.struct.gen.VarType; public class ConstantPool { diff --git a/src/de/fernflower/struct/consts/LinkConstant.java b/src/de/fernflower/struct/consts/LinkConstant.java index 66d6531..770a5e3 100644 --- a/src/de/fernflower/struct/consts/LinkConstant.java +++ b/src/de/fernflower/struct/consts/LinkConstant.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.consts; +package org.jetbrains.java.decompiler.struct.consts; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/de/fernflower/struct/consts/PooledConstant.java b/src/de/fernflower/struct/consts/PooledConstant.java index aab1091..ae46604 100644 --- a/src/de/fernflower/struct/consts/PooledConstant.java +++ b/src/de/fernflower/struct/consts/PooledConstant.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.consts; +package org.jetbrains.java.decompiler.struct.consts; import java.io.DataOutputStream; import java.io.IOException; -import de.fernflower.code.CodeConstants; +import org.jetbrains.java.decompiler.code.CodeConstants; /* cp_info { diff --git a/src/de/fernflower/struct/consts/PrimitiveConstant.java b/src/de/fernflower/struct/consts/PrimitiveConstant.java index 0532822..f01a695 100644 --- a/src/de/fernflower/struct/consts/PrimitiveConstant.java +++ b/src/de/fernflower/struct/consts/PrimitiveConstant.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.consts; +package org.jetbrains.java.decompiler.struct.consts; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/de/fernflower/struct/consts/VariableTypeEnum.java b/src/de/fernflower/struct/consts/VariableTypeEnum.java index 22758b7..fc58c7e 100644 --- a/src/de/fernflower/struct/consts/VariableTypeEnum.java +++ b/src/de/fernflower/struct/consts/VariableTypeEnum.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.consts; +package org.jetbrains.java.decompiler.struct.consts; public interface VariableTypeEnum { diff --git a/src/de/fernflower/struct/gen/DataPoint.java b/src/de/fernflower/struct/gen/DataPoint.java index 571285d..db6ecd1 100644 --- a/src/de/fernflower/struct/gen/DataPoint.java +++ b/src/de/fernflower/struct/gen/DataPoint.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen; +package org.jetbrains.java.decompiler.struct.gen; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.struct.StructMethod; -import de.fernflower.util.ListStack; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.util.ListStack; public class DataPoint { diff --git a/src/de/fernflower/struct/gen/FieldDescriptor.java b/src/de/fernflower/struct/gen/FieldDescriptor.java index b2669f6..a475937 100644 --- a/src/de/fernflower/struct/gen/FieldDescriptor.java +++ b/src/de/fernflower/struct/gen/FieldDescriptor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen; +package org.jetbrains.java.decompiler.struct.gen; public class FieldDescriptor { diff --git a/src/de/fernflower/struct/gen/MethodDescriptor.java b/src/de/fernflower/struct/gen/MethodDescriptor.java index bb1be09..77a8394 100644 --- a/src/de/fernflower/struct/gen/MethodDescriptor.java +++ b/src/de/fernflower/struct/gen/MethodDescriptor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen; +package org.jetbrains.java.decompiler.struct.gen; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/de/fernflower/struct/gen/VarType.java b/src/de/fernflower/struct/gen/VarType.java index 2ddde86..5ee0c4b 100644 --- a/src/de/fernflower/struct/gen/VarType.java +++ b/src/de/fernflower/struct/gen/VarType.java @@ -12,10 +12,10 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen; +package org.jetbrains.java.decompiler.struct.gen; -import de.fernflower.code.CodeConstants; -import de.fernflower.util.InterpreterUtil; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.util.InterpreterUtil; public class VarType { // TODO: optimize switch diff --git a/src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java b/src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java index 3007ccb..d4551ac 100644 --- a/src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java +++ b/src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen.generics; +package org.jetbrains.java.decompiler.struct.gen.generics; import java.util.ArrayList; import java.util.List; diff --git a/src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java b/src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java index 98fe617..4b4114d 100644 --- a/src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java +++ b/src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen.generics; +package org.jetbrains.java.decompiler.struct.gen.generics; public class GenericFieldDescriptor { diff --git a/src/de/fernflower/struct/gen/generics/GenericMain.java b/src/de/fernflower/struct/gen/generics/GenericMain.java index cd81683..50433a9 100644 --- a/src/de/fernflower/struct/gen/generics/GenericMain.java +++ b/src/de/fernflower/struct/gen/generics/GenericMain.java @@ -12,14 +12,14 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen.generics; +package org.jetbrains.java.decompiler.struct.gen.generics; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; -import de.fernflower.main.DecompilerContext; -import de.fernflower.struct.StructClass; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.struct.StructClass; public class GenericMain { diff --git a/src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java b/src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java index 704e410..7a0a4d1 100644 --- a/src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java +++ b/src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen.generics; +package org.jetbrains.java.decompiler.struct.gen.generics; import java.util.ArrayList; import java.util.List; diff --git a/src/de/fernflower/struct/gen/generics/GenericType.java b/src/de/fernflower/struct/gen/generics/GenericType.java index b158a86..1f720e6 100644 --- a/src/de/fernflower/struct/gen/generics/GenericType.java +++ b/src/de/fernflower/struct/gen/generics/GenericType.java @@ -12,12 +12,12 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.gen.generics; +package org.jetbrains.java.decompiler.struct.gen.generics; import java.util.ArrayList; import java.util.List; -import de.fernflower.code.CodeConstants; +import org.jetbrains.java.decompiler.code.CodeConstants; public class GenericType { diff --git a/src/de/fernflower/struct/lazy/LazyLoader.java b/src/de/fernflower/struct/lazy/LazyLoader.java index 51d3b08..94cef9a 100644 --- a/src/de/fernflower/struct/lazy/LazyLoader.java +++ b/src/de/fernflower/struct/lazy/LazyLoader.java @@ -12,17 +12,17 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.struct.lazy; +package org.jetbrains.java.decompiler.struct.lazy; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; -import de.fernflower.main.extern.IBytecodeProvider; -import de.fernflower.struct.StructMethod; -import de.fernflower.struct.attr.StructGeneralAttribute; -import de.fernflower.struct.consts.ConstantPool; -import de.fernflower.util.DataInputFullStream; +import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; +import org.jetbrains.java.decompiler.struct.StructMethod; +import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; +import org.jetbrains.java.decompiler.struct.consts.ConstantPool; +import org.jetbrains.java.decompiler.util.DataInputFullStream; public class LazyLoader { diff --git a/src/de/fernflower/util/DataInputFullStream.java b/src/de/fernflower/util/DataInputFullStream.java index ad62fe6..94b68b5 100644 --- a/src/de/fernflower/util/DataInputFullStream.java +++ b/src/de/fernflower/util/DataInputFullStream.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/de/fernflower/util/FastFixedSetFactory.java b/src/de/fernflower/util/FastFixedSetFactory.java index 1340376..524f50d 100644 --- a/src/de/fernflower/util/FastFixedSetFactory.java +++ b/src/de/fernflower/util/FastFixedSetFactory.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; import java.util.Collection; diff --git a/src/de/fernflower/util/FastSetFactory.java b/src/de/fernflower/util/FastSetFactory.java index 7543e0d..4e5a631 100644 --- a/src/de/fernflower/util/FastSetFactory.java +++ b/src/de/fernflower/util/FastSetFactory.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.Collection; import java.util.HashSet; diff --git a/src/de/fernflower/util/FastSparseSetFactory.java b/src/de/fernflower/util/FastSparseSetFactory.java index b0b8b26..352dc2a 100644 --- a/src/de/fernflower/util/FastSparseSetFactory.java +++ b/src/de/fernflower/util/FastSparseSetFactory.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.Collection; import java.util.HashSet; diff --git a/src/de/fernflower/util/InterpreterUtil.java b/src/de/fernflower/util/InterpreterUtil.java index 6f418a2..4914d36 100644 --- a/src/de/fernflower/util/InterpreterUtil.java +++ b/src/de/fernflower/util/InterpreterUtil.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.io.File; import java.io.FileInputStream; @@ -25,8 +25,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import de.fernflower.main.DecompilerContext; -import de.fernflower.main.extern.IFernflowerPreferences; +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; public class InterpreterUtil { diff --git a/src/de/fernflower/util/ListStack.java b/src/de/fernflower/util/ListStack.java index 30cad03..fa36a0b 100644 --- a/src/de/fernflower/util/ListStack.java +++ b/src/de/fernflower/util/ListStack.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; diff --git a/src/de/fernflower/util/SFormsFastMap.java b/src/de/fernflower/util/SFormsFastMap.java index 992d53f..546e32e 100644 --- a/src/de/fernflower/util/SFormsFastMap.java +++ b/src/de/fernflower/util/SFormsFastMap.java @@ -1,10 +1,10 @@ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; public class SFormsFastMap { diff --git a/src/de/fernflower/util/SFormsFastMapDirect.java b/src/de/fernflower/util/SFormsFastMapDirect.java index fb6eae6..615162f 100644 --- a/src/de/fernflower/util/SFormsFastMapDirect.java +++ b/src/de/fernflower/util/SFormsFastMapDirect.java @@ -12,15 +12,15 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.exps.VarExprent; -import de.fernflower.util.FastSparseSetFactory.FastSparseSet; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet; public class SFormsFastMapDirect { diff --git a/src/de/fernflower/util/SFormsFastMapOld.java b/src/de/fernflower/util/SFormsFastMapOld.java index e686f4d..be3e7b7 100644 --- a/src/de/fernflower/util/SFormsFastMapOld.java +++ b/src/de/fernflower/util/SFormsFastMapOld.java @@ -1,10 +1,10 @@ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import de.fernflower.modules.decompiler.exps.VarExprent; +import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; public class SFormsFastMapOld { diff --git a/src/de/fernflower/util/VBStyleCollection.java b/src/de/fernflower/util/VBStyleCollection.java index 2a8f64a..8542019 100644 --- a/src/de/fernflower/util/VBStyleCollection.java +++ b/src/de/fernflower/util/VBStyleCollection.java @@ -12,7 +12,7 @@ * A PARTICULAR PURPOSE. */ -package de.fernflower.util; +package org.jetbrains.java.decompiler.util; import java.util.ArrayList; import java.util.Collection; -- cgit v1.2.3