diff --git a/jode/ChangeLog b/jode/ChangeLog index d533d79..6f538ab 100644 --- a/jode/ChangeLog +++ b/jode/ChangeLog @@ -1,3 +1,7 @@ +2001-07-30 Jochen Hoenicke + + Changed compilation procedure to ant. + 2001-07-30 Jochen Hoenicke * jode/bytecode/BasicBlockReader.java: Fixed import of non diff --git a/jode/Makefile.am b/jode/Makefile.am deleted file mode 100644 index 25734a8..0000000 --- a/jode/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -SUBDIRS = bin doc jode test diff --git a/jode/acinclude.m4 b/jode/acinclude.m4 deleted file mode 100644 index 296d1ad..0000000 --- a/jode/acinclude.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl -dnl Add macros -dnl JODE_CHECK_JAVA -dnl - -dnl JODE_CHECK_JAVA(path) -AC_DEFUN(JODE_CHECK_JAVA, -[ - AC_PATH_PROG(JAVA, java, "", $1/bin:$1/jre/bin:$PATH) - AC_PATH_PROG(JAVAC, javac, "", $1/bin:$PATH) - AC_PATH_PROG(JAR, jar, "", $1/bin:$PATH) - for path in $1/lib $1/jre/lib $1/shared; do - for classlib in classes.zip rt.jar; do - AC_CHECK_FILES($path/$classlib, - [ CLASSLIB=$path/$classlib - break 3 - ], [ true ]) - done - done - AC_SUBST(CLASSPATH) - AC_SUBST(CLASSLIB) -]) - -AC_DEFUN(JODE_CHECK_CLASS, -[ - if (IFS=":" - clazz=`echo $1 | sed -e 's/\./\//g' -e 's/\(.*\)/\1.class/'` - myclasspath=$2; - for path in $myclasspath; do - if test -d $path; then - if test -f $path/$clazz; then - exit 0 - fi - elif CLASS_CHECK $path $clazz ; then - exit 0 - fi - done; - exit 1) - then - $3 - else - $4 - fi -]) diff --git a/jode/build.xml b/jode/build.xml new file mode 100644 index 0000000..4fd4c1d --- /dev/null +++ b/jode/build.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jode/configure.in b/jode/configure.in deleted file mode 100644 index 1897d48..0000000 --- a/jode/configure.in +++ /dev/null @@ -1,187 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT() - -AM_INIT_AUTOMAKE(jode, 1.1) - -dnl Checks for programs. -AC_PROG_MAKE_SET -AC_PATH_PROG(PERL, perl) -AC_PATH_PROG(CYGPATH, cygpath) - -dnl Checks for libraries. - -dnl Checks for header files. - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. - -dnl hack to quote Makefile lines -QUOTE="" -AC_SUBST(QUOTE) - -AC_SUBST(SHELL) - -if test -n "$CYGPATH"; then - # Extra check if java take windows path? - CLASSPATH=`$CYGPATH --unix --path $CLASSPATH` - SUBSTCP="$CYGPATH --windows --path" -else - SUBSTCP="echo" -fi - -AC_SUBST(SUBSTCP) - -AC_ARG_WITH(java, - [ --with-java specify path to a java-like program ], - [ - if test ${withval} != "" || test ${withval} != "yes" || test ${withval} != "no"; then - # set javac to user input value - JODE_CHECK_JAVA(${withval}) - else - JODE_CHECK_JAVA(/usr/lib/java) - fi - ], - [ - JODE_CHECK_JAVA(/usr/lib/java) - ]) - -dnl jikes can also handle dependancies. -AC_ARG_WITH(jikes, -[ --with-jikes specify location of jikes ], -[ - USER_SPECIFIED_JIKES=true - if test "${withval}" = "yes" || test "${withval}" = ""; then - AC_PATH_PROG(JIKES, jikes, "", $PATH) - else - echo "searching jikes in ${withval}:$PATH" - AC_PATH_PROG(JIKES, jikes, "", ${withval}:$PATH) - fi - if test -n "$JIKES"; then - JAVAC=$JIKES - fi -], -[ - USER_SPECIFIED_JIKES= - AC_PATH_PROG(JIKES, jikes, "", $PATH) -]) -AM_CONDITIONAL(HAVE_JIKES, test x"$JIKES" != x) - -AC_ARG_WITH(javac, - [ --with-javac specify location of javac ], - [ - if test x$USER_SPECIFIED_JIKES = xtrue; then - AC_MSG_ERROR(You must only give one option --with-javac or --with-jikes) - fi - if test ${withval} != "" || test ${withval} != "yes" || test ${withval} != "no"; then - AC_CHECK_FILES(${withval}, - [ JAVAC=${withval} ], - [ AC_MSG_ERROR(${withval} does not exists) ]) - fi -], [ -dnl use jikes as default, if javac option not given. - if test -n "$JIKES"; then - JAVAC=$JIKES - fi -]) - -AC_PATH_PROG(UNZIP, unzip) -if test -n "$UNZIP"; then - CLASS_CHECK () { - $UNZIP -v -C `$SUBSTCP $1` $2 >/dev/null 2>&1 - } -else - if test -n "$JAR"; then - CLASS_CHECK () { - $JAR -tf `$SUBSTCP $1` 2>&1 | grep $2 >/dev/null - } - else - AC_MSG_ERROR(You need either unzip or jar.) - fi -fi - -AC_MSG_CHECKING(for java.lang.Object) -JODE_CHECK_CLASS(java.lang.Object, $CLASSLIB, - [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no) - AC_MSG_ERROR(Please specify location of core java class library) ]) - -AC_MSG_CHECKING(for java.lang.ref.WeakReference) -JODE_CHECK_CLASS(java.lang.ref.WeakReference, $CLASSLIB, - [ AC_MSG_RESULT(yes) - JCPPFLAGS="-DJDK12" ], - [ AC_MSG_RESULT(no) - JCPPFLAGS="-DJDK11" ]) - -AC_MSG_CHECKING(for collection classes) -JODE_CHECK_CLASS(java.util.Set, $CLASSPATH:$CLASSLIB, - [ COLLECTIONS="java.util" - COLLECTIONEXTRA="java.lang" ], - [ JODE_CHECK_CLASS(gnu.java.util.collections.Set, $CLASSPATH:$CLASSLIB, - [ COLLECTIONS="gnu.java.util.collections" - COLLECTIONEXTRA="gnu.java.util.collections" ], - [ JODE_CHECK_CLASS(com.sun.java.util.collections.Set, $CLASSPATH:$CLASSLIB, - [ COLLECTIONS="com.sun.java.util.collections" - COLLECTIONEXTRA="com.sun.java.util.collections" ], - [ AC_MSG_RESULT(no) - AC_MSG_ERROR(You need the Java 1.2 collection classes in your classpath) - ]) - ]) - ]) -AC_MSG_RESULT($COLLECTIONS) -AC_SUBST(COLLECTIONS) -AC_SUBST(COLLECTIONEXTRA) - -AC_MSG_CHECKING(for gnu.getopt) -JODE_CHECK_CLASS(gnu.getopt.Getopt, $CLASSPATH:$CLASSLIB, - [ AC_MSG_RESULT(yes) ], - [ AC_MSG_RESULT(no) - AC_MSG_ERROR(You need gnu getopt for java.) ]) - -AC_MSG_CHECKING(for swing) -JODE_CHECK_CLASS(javax.swing.JFrame, $CLASSPATH:$CLASSLIB, - [ JAVAX_SWING="javax.swing" ], - [ JODE_CHECK_CLASS(com.sun.java.swing.JFrame, $CLASSPATH:$CLASSLIB, - [ JAVAX_SWING="com.sun.java.swing" ], - [ JAVAX_SWING="no" ]) ] ) -AC_MSG_RESULT($JAVAX_SWING) -AC_SUBST(JAVAX_SWING) -if test "$JAVAX_SWING" != "no"; then - SWINGUI="swingui" -else - AC_MSG_WARN(Swing is not in classpath ... skipping swingui) - SWINGUI="" -fi -AC_SUBST(SWINGUI) - -JCPPFLAGS="$JCPPFLAGS -DCOLLECTIONS=$COLLECTIONS -DCOLLECTIONEXTRA=$COLLECTIONEXTRA -DJAVAX_SWING=$JAVAX_SWING" - -AC_SUBST(CLASSPATH) -AC_SUBST(JAVAC) -AC_SUBST(JAR) - -AC_OUTPUT(Makefile -jode/Makefile -jode/bytecode/Makefile -jode/decompiler/Makefile -jode/expr/Makefile -jode/flow/Makefile -jode/jvm/Makefile -jode/obfuscator/Makefile -jode/obfuscator/modules/Makefile -jode/swingui/Makefile -jode/type/Makefile -jode/util/Makefile -bin/Makefile -bin/jode -bin/jode.bat -doc/Makefile -test/Makefile, -[chmod 755 bin/jode], -[for i in \$CONFIG_FILES; do -changequote(, )dnl - if [ \$i != \${i%.java} ]; then -changequote([, ])dnl - $PERL $srcdir/scripts/jcpp.pl $JCPPFLAGS \$i - fi -done]) diff --git a/jode/jode/.cvsignore b/jode/jode/.cvsignore deleted file mode 100644 index 9f5ef71..0000000 --- a/jode/jode/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.java.deps -jode.jar diff --git a/jode/jode/Makefile.am b/jode/jode/Makefile.am deleted file mode 100644 index 6b58cac..0000000 --- a/jode/jode/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -SUBDIRS = util bytecode type jvm expr flow decompiler @SWINGUI@ # obfuscator - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - GlobalOptions.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -JARFILE = jode-@VERSION@.jar -#data_DATA = $(JARFILE) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep - -$(JARFILE): $(noinst_DATA) - CLASSPATH=$(top_builddir):$(CLASSPATH) $(JAVA) -mx80m \ - jode.obfuscator.Main --classpath=$(top_builddir) \ - --dest=$(JARFILE) -v -v $(srcdir)/jode.jodescript diff --git a/jode/jode/bytecode/.cvsignore b/jode/jode/bytecode/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/bytecode/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/bytecode/Makefile.am b/jode/jode/bytecode/Makefile.am deleted file mode 100644 index 4f62b13..0000000 --- a/jode/jode/bytecode/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - BasicBlocks.java \ - BasicBlockReader.java \ - BasicBlockWriter.java \ - BinaryInfo.java \ - Block.java \ - ClassFormatException.java \ - ClassInfo.java \ - ClassPath.java \ - ConstantPool.java \ - FieldInfo.java \ - GrowableConstantPool.java \ - Handler.java \ - Instruction.java \ - LocalVariableInfo.java \ - MethodInfo.java \ - Opcodes.java \ - Reference.java \ - TypeSignature.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/decompiler/.cvsignore b/jode/jode/decompiler/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/decompiler/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/decompiler/Makefile.am b/jode/jode/decompiler/Makefile.am deleted file mode 100644 index 51ac7aa..0000000 --- a/jode/jode/decompiler/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - Analyzer.java \ - Applet.java \ - ClassAnalyzer.java \ - ClassDeclarer.java \ - Declarable.java \ - Decompiler.java \ - FieldAnalyzer.java \ - ImportHandler.java \ - LocalInfo.java \ - Main.java \ - MethodAnalyzer.java \ - Opcodes.java \ - Options.java \ - OuterValueListener.java \ - OuterValues.java \ - ProgressListener.java \ - Scope.java \ - TabbedPrintWriter.java \ - Window.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/expr/.cvsignore b/jode/jode/expr/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/expr/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/expr/Makefile.am b/jode/jode/expr/Makefile.am deleted file mode 100644 index 82cae20..0000000 --- a/jode/jode/expr/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ArrayLengthOperator.java \ - ArrayLoadOperator.java \ - ArrayStoreOperator.java \ - BinaryOperator.java \ - CheckCastOperator.java \ - CheckNullOperator.java \ - ClassFieldOperator.java \ - CombineableOperator.java \ - CompareBinaryOperator.java \ - CompareToIntOperator.java \ - CompareUnaryOperator.java \ - ConstOperator.java \ - ConstantArrayOperator.java \ - ConvertOperator.java \ - Expression.java \ - FieldOperator.java \ - GetFieldOperator.java \ - IIncOperator.java \ - IfThenElseOperator.java \ - InstanceOfOperator.java \ - InvokeOperator.java \ - LValueExpression.java \ - LocalLoadOperator.java \ - LocalStoreOperator.java \ - LocalVarOperator.java \ - MatchableOperator.java \ - MonitorEnterOperator.java \ - MonitorExitOperator.java \ - NewArrayOperator.java \ - NewOperator.java \ - NoArgOperator.java \ - NopOperator.java \ - Operator.java \ - OuterLocalOperator.java \ - PopOperator.java \ - PrePostFixOperator.java \ - PutFieldOperator.java \ - ShiftOperator.java \ - SimpleOperator.java \ - StoreInstruction.java \ - StringAddOperator.java \ - ThisOperator.java \ - UnaryOperator.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/flow/.cvsignore b/jode/jode/flow/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/flow/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/flow/Makefile.am b/jode/jode/flow/Makefile.am deleted file mode 100644 index 907f655..0000000 --- a/jode/jode/flow/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - BreakBlock.java \ - BreakableBlock.java \ - CaseBlock.java \ - CatchBlock.java \ - CombineIfGotoExpressions.java \ - CompleteSynchronized.java \ - ConditionalBlock.java \ - ContinueBlock.java \ - CreateAssignExpression.java \ - CreateCheckNull.java \ - CreateClassField.java \ - CreateConstantArray.java \ - CreateExpression.java \ - CreateForInitializer.java \ - CreateIfThenElseOperator.java \ - CreateNewConstructor.java \ - CreatePrePostIncExpression.java \ - DescriptionBlock.java \ - EmptyBlock.java \ - FinallyBlock.java \ - FlowBlock.java \ - IfThenElseBlock.java \ - InstructionBlock.java \ - InstructionContainer.java \ - JsrBlock.java \ - Jump.java \ - LoopBlock.java \ - RetBlock.java \ - ReturnBlock.java \ - SequentialBlock.java \ - SlotSet.java \ - SpecialBlock.java \ - StructuredBlock.java \ - SwitchBlock.java \ - SynchronizedBlock.java \ - ThrowBlock.java \ - TransformConstructors.java \ - TransformExceptionHandlers.java \ - TryBlock.java \ - VariableSet.java \ - VariableStack.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/jvm/.cvsignore b/jode/jode/jvm/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/jvm/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/jvm/Makefile.am b/jode/jode/jvm/Makefile.am deleted file mode 100644 index f73feab..0000000 --- a/jode/jode/jvm/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - CodeVerifier.java \ - Interpreter.java \ - InterpreterException.java \ - NewObject.java \ - RuntimeEnvironment.java \ - SimpleRuntimeEnvironment.java \ - SyntheticAnalyzer.java \ - Value.java \ - VerifyException.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/obfuscator/.cvsignore b/jode/jode/obfuscator/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/obfuscator/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/obfuscator/Makefile.am b/jode/jode/obfuscator/Makefile.am deleted file mode 100644 index 34290fa..0000000 --- a/jode/jode/obfuscator/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -SUBDIRS = modules - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ClassBundle.java \ - ClassIdentifier.java \ - CodeAnalyzer.java \ - CodeTransformer.java \ - ConstantRuntimeEnvironment.java \ - FieldIdentifier.java \ - Identifier.java \ - IdentifierMatcher.java \ - LocalIdentifier.java \ - Main.java \ - MethodIdentifier.java \ - OptionHandler.java \ - PackageIdentifier.java \ - ParseException.java \ - Renamer.java \ - ScriptParser.java \ - TranslationTable.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/obfuscator/modules/.cvsignore b/jode/jode/obfuscator/modules/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/obfuscator/modules/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/obfuscator/modules/Makefile.am b/jode/jode/obfuscator/modules/Makefile.am deleted file mode 100644 index 6d84d59..0000000 --- a/jode/jode/obfuscator/modules/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ConstantAnalyzer.java \ - IdentityRenamer.java \ - KeywordRenamer.java \ - LocalOptimizer.java \ - ModifierMatcher.java \ - MultiIdentifierMatcher.java \ - NameSwapper.java \ - RemovePopAnalyzer.java \ - SerializePreserver.java \ - SimpleAnalyzer.java \ - StrongRenamer.java \ - UniqueRenamer.java \ - WildCard.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/swingui/.cvsignore b/jode/jode/swingui/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/swingui/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/swingui/Makefile.am b/jode/jode/swingui/Makefile.am deleted file mode 100644 index 5883bd4..0000000 --- a/jode/jode/swingui/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ClassPathDialog.java \ - HierarchyTreeModel.java \ - Main.java \ - PackagesTreeModel.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/type/.cvsignore b/jode/jode/type/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/type/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/type/Makefile.am b/jode/jode/type/Makefile.am deleted file mode 100644 index d08c985..0000000 --- a/jode/jode/type/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ArrayType.java \ - ClassType.java \ - ClassInfoType.java \ - IntegerType.java \ - MethodType.java \ - MultiClassType.java \ - NullType.java \ - RangeType.java \ - ReferenceType.java \ - SystemClassType.java \ - Type.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/jode/util/.cvsignore b/jode/jode/util/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/jode/jode/util/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/jode/jode/util/Makefile.am b/jode/jode/util/Makefile.am deleted file mode 100644 index 64fe8d1..0000000 --- a/jode/jode/util/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -JAVADEP = $(PERL) -w -s $(top_srcdir)/scripts/javaDependencies.pl \ - -subdir=$(subdir) -dependdir=$(top_builddir) \ - -classpath=$(top_builddir):$(top_srcdir) -depfile=Makefile.dep -CLASSPATH = @CLASSPATH@ -CLASSLIB = @CLASSLIB@ -SUBSTCP = @SUBSTCP@ -FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)) - -MY_JAVA_FILES = \ - ArrayEnum.java \ - SimpleMap.java \ - SimpleSet.java \ - StringQuoter.java \ - UnifyHash.java - -noinst_DATA = $(MY_JAVA_FILES:.java=.class) -EXTRA_DIST = $(MY_JAVA_FILES) - -@QUOTE@-include Makefile.dep - -%.class: %.java - $(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $< - -Makefile.dep: $(MY_JAVA_FILES:.java=.class) - $(JAVADEP) $^ - -clean-local: - @rm -f *.class - @rm -f *.dep diff --git a/jode/project-ext.dtd b/jode/project-ext.dtd new file mode 100644 index 0000000..0924399 --- /dev/null +++ b/jode/project-ext.dtd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + diff --git a/jode/project.dtd b/jode/project.dtd new file mode 100644 index 0000000..7320ac2 --- /dev/null +++ b/jode/project.dtd @@ -0,0 +1,273 @@ + + + + + + + + +%ext-file; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jode/jode/decompiler/OptionNames.properties b/jode/props/net/sf/jode/decompiler/OptionNames.properties similarity index 100% rename from jode/jode/decompiler/OptionNames.properties rename to jode/props/net/sf/jode/decompiler/OptionNames.properties diff --git a/jode/jode/swingui/Resources.properties b/jode/props/net/sf/jode/swingui/Resources.properties similarity index 100% rename from jode/jode/swingui/Resources.properties rename to jode/props/net/sf/jode/swingui/Resources.properties diff --git a/jode/jode/swingui/Resources_de.properties b/jode/props/net/sf/jode/swingui/Resources_de.properties similarity index 100% rename from jode/jode/swingui/Resources_de.properties rename to jode/props/net/sf/jode/swingui/Resources_de.properties diff --git a/jode/src/foo b/jode/src/foo new file mode 100644 index 0000000..0d868a4 --- /dev/null +++ b/jode/src/foo @@ -0,0 +1,192 @@ +foo +net/sf/jode/GlobalOptions.java +net/sf/jode/bytecode/ClassInfo.java +net/sf/jode/bytecode/BasicBlocks.java +net/sf/jode/bytecode/TransformSubroutine.java +net/sf/jode/bytecode/BasicBlockReader.java +net/sf/jode/bytecode/TypeInstruction.java +net/sf/jode/bytecode/SwitchInstruction.java +net/sf/jode/bytecode/BasicBlockWriter.java +net/sf/jode/bytecode/Block.java +net/sf/jode/bytecode/Handler.java +net/sf/jode/bytecode/ClassPath.java +net/sf/jode/bytecode/TypeSignature.java +net/sf/jode/bytecode/SlotInstruction.java +net/sf/jode/bytecode/LocalVariableInfo.java +net/sf/jode/bytecode/ClassFormatException.java +net/sf/jode/bytecode/ConstantInstruction.java +net/sf/jode/bytecode/TypeDimensionInstruction.java +net/sf/jode/bytecode/IncInstruction.java +net/sf/jode/bytecode/BinaryInfo.java +net/sf/jode/bytecode/Opcodes.java +net/sf/jode/bytecode/Subroutine.java +net/sf/jode/bytecode/ConstantPool.java +net/sf/jode/bytecode/MethodInfo.java +net/sf/jode/bytecode/Reference.java +net/sf/jode/bytecode/ReferenceInstruction.java +net/sf/jode/bytecode/Instruction.java +net/sf/jode/bytecode/FieldInfo.java +net/sf/jode/bytecode/GrowableConstantPool.java +net/sf/jode/decompiler/Applet.java +net/sf/jode/decompiler/TabbedPrintWriter.java +net/sf/jode/decompiler/LocalInfo.java +net/sf/jode/decompiler/OuterValues.java +net/sf/jode/decompiler/Declarable.java +net/sf/jode/decompiler/Scope.java +net/sf/jode/decompiler/Decompiler.java +net/sf/jode/decompiler/Main.java +net/sf/jode/decompiler/Window.java +net/sf/jode/decompiler/ClassAnalyzer.java +net/sf/jode/decompiler/OuterValueListener.java +net/sf/jode/decompiler/ImportHandler.java +net/sf/jode/decompiler/Analyzer.java +net/sf/jode/decompiler/Options.java +net/sf/jode/decompiler/ClassDeclarer.java +net/sf/jode/decompiler/MethodAnalyzer.java +net/sf/jode/decompiler/Opcodes.java +net/sf/jode/decompiler/ProgressListener.java +net/sf/jode/decompiler/FieldAnalyzer.java +net/sf/jode/expr/StringAddOperator.java +net/sf/jode/expr/CombineableOperator.java +net/sf/jode/expr/LValueExpression.java +net/sf/jode/expr/GetFieldOperator.java +net/sf/jode/expr/Expression.java +net/sf/jode/expr/CompareUnaryOperator.java +net/sf/jode/expr/LocalVarOperator.java +net/sf/jode/expr/ConstOperator.java +net/sf/jode/expr/UnaryOperator.java +net/sf/jode/expr/IfThenElseOperator.java +net/sf/jode/expr/BinaryOperator.java +net/sf/jode/expr/OuterLocalOperator.java +net/sf/jode/expr/NoArgOperator.java +net/sf/jode/expr/Operator.java +net/sf/jode/expr/CheckNullOperator.java +net/sf/jode/expr/IIncOperator.java +net/sf/jode/expr/ArrayLengthOperator.java +net/sf/jode/expr/LocalLoadOperator.java +net/sf/jode/expr/LocalStoreOperator.java +net/sf/jode/expr/ConvertOperator.java +net/sf/jode/expr/MonitorEnterOperator.java +net/sf/jode/expr/CompareToIntOperator.java +net/sf/jode/expr/NewOperator.java +net/sf/jode/expr/PutFieldOperator.java +net/sf/jode/expr/PrePostFixOperator.java +net/sf/jode/expr/MonitorExitOperator.java +net/sf/jode/expr/NewArrayOperator.java +net/sf/jode/expr/ShiftOperator.java +net/sf/jode/expr/CheckCastOperator.java +net/sf/jode/expr/StoreInstruction.java +net/sf/jode/expr/PopOperator.java +net/sf/jode/expr/ThisOperator.java +net/sf/jode/expr/ConstantArrayOperator.java +net/sf/jode/expr/ArrayLoadOperator.java +net/sf/jode/expr/InstanceOfOperator.java +net/sf/jode/expr/NopOperator.java +net/sf/jode/expr/FieldOperator.java +net/sf/jode/expr/InvokeOperator.java +net/sf/jode/expr/MatchableOperator.java +net/sf/jode/expr/SimpleOperator.java +net/sf/jode/expr/ArrayStoreOperator.java +net/sf/jode/expr/ClassFieldOperator.java +net/sf/jode/expr/CompareBinaryOperator.java +net/sf/jode/flow/StructuredBlock.java +net/sf/jode/flow/TryBlock.java +net/sf/jode/flow/CreateConstantArray.java +net/sf/jode/flow/CompleteSynchronized.java +net/sf/jode/flow/SlotSet.java +net/sf/jode/flow/SynchronizedBlock.java +net/sf/jode/flow/EmptyBlock.java +net/sf/jode/flow/CreateCheckNull.java +net/sf/jode/flow/CombineIfGotoExpressions.java +net/sf/jode/flow/CreateIfThenElseOperator.java +net/sf/jode/flow/Jump.java +net/sf/jode/flow/SequentialBlock.java +net/sf/jode/flow/CreateNewConstructor.java +net/sf/jode/flow/CaseBlock.java +net/sf/jode/flow/BreakBlock.java +net/sf/jode/flow/VariableSet.java +net/sf/jode/flow/CreateForInitializer.java +net/sf/jode/flow/TransformConstructors.java +net/sf/jode/flow/ReturnBlock.java +net/sf/jode/flow/VariableStack.java +net/sf/jode/flow/InstructionContainer.java +net/sf/jode/flow/IfThenElseBlock.java +net/sf/jode/flow/SwitchBlock.java +net/sf/jode/flow/CatchBlock.java +net/sf/jode/flow/CreateClassField.java +net/sf/jode/flow/ThrowBlock.java +net/sf/jode/flow/SpecialBlock.java +net/sf/jode/flow/FinallyBlock.java +net/sf/jode/flow/ContinueBlock.java +net/sf/jode/flow/BreakableBlock.java +net/sf/jode/flow/ConditionalBlock.java +net/sf/jode/flow/LoopBlock.java +net/sf/jode/flow/FlowBlock.java +net/sf/jode/flow/TransformExceptionHandlers.java +net/sf/jode/flow/CreateExpression.java +net/sf/jode/flow/JsrBlock.java +net/sf/jode/flow/CreatePrePostIncExpression.java +net/sf/jode/flow/DescriptionBlock.java +net/sf/jode/flow/InstructionBlock.java +net/sf/jode/flow/RetBlock.java +net/sf/jode/flow/CreateAssignExpression.java +net/sf/jode/jvm/Interpreter.java +net/sf/jode/jvm/NewObject.java +net/sf/jode/jvm/Value.java +net/sf/jode/jvm/InterpreterException.java +net/sf/jode/jvm/SyntheticAnalyzer.java +net/sf/jode/jvm/RuntimeEnvironment.java +net/sf/jode/jvm/SimpleRuntimeEnvironment.java +net/sf/jode/jvm/CodeVerifier.java +net/sf/jode/jvm/VerifyException.java +net/sf/jode/obfuscator/PackageIdentifier.java +net/sf/jode/obfuscator/Identifier.java +net/sf/jode/obfuscator/TranslationTable.java +net/sf/jode/obfuscator/MethodIdentifier.java +net/sf/jode/obfuscator/FieldIdentifier.java +net/sf/jode/obfuscator/Main.java +net/sf/jode/obfuscator/LocalIdentifier.java +net/sf/jode/obfuscator/CodeTransformer.java +net/sf/jode/obfuscator/CodeAnalyzer.java +net/sf/jode/obfuscator/OptionHandler.java +net/sf/jode/obfuscator/ParseException.java +net/sf/jode/obfuscator/ScriptParser.java +net/sf/jode/obfuscator/ClassBundle.java +net/sf/jode/obfuscator/ClassIdentifier.java +net/sf/jode/obfuscator/Renamer.java +net/sf/jode/obfuscator/ConstantRuntimeEnvironment.java +net/sf/jode/obfuscator/IdentifierMatcher.java +net/sf/jode/obfuscator/modules/StrongRenamer.java +net/sf/jode/obfuscator/modules/SerializePreserver.java +net/sf/jode/obfuscator/modules/ConstantAnalyzer.java +net/sf/jode/obfuscator/modules/SimpleAnalyzer.java +net/sf/jode/obfuscator/modules/WildCard.java +net/sf/jode/obfuscator/modules/LocalizeFieldTransformer.java +net/sf/jode/obfuscator/modules/KeywordRenamer.java +net/sf/jode/obfuscator/modules/NameSwapper.java +net/sf/jode/obfuscator/modules/LocalOptimizer.java +net/sf/jode/obfuscator/modules/RemovePopAnalyzer.java +net/sf/jode/obfuscator/modules/MultiIdentifierMatcher.java +net/sf/jode/obfuscator/modules/UniqueRenamer.java +net/sf/jode/obfuscator/modules/ModifierMatcher.java +net/sf/jode/obfuscator/modules/IdentityRenamer.java +net/sf/jode/swingui/Main.java +net/sf/jode/swingui/ClassPathDialog.java +net/sf/jode/swingui/HierarchyTreeModel.java +net/sf/jode/swingui/PackagesTreeModel.java +net/sf/jode/type/ReferenceType.java +net/sf/jode/type/NullType.java +net/sf/jode/type/SystemClassType.java +net/sf/jode/type/MethodType.java +net/sf/jode/type/ArrayType.java +net/sf/jode/type/RangeType.java +net/sf/jode/type/IntegerType.java +net/sf/jode/type/ClassType.java +net/sf/jode/type/Type.java +net/sf/jode/type/ClassInfoType.java +net/sf/jode/type/MultiClassType.java +net/sf/jode/util/SimpleMap.java +net/sf/jode/util/StringQuoter.java +net/sf/jode/util/ArrayEnum.java +net/sf/jode/util/UnifyHash.java +net/sf/jode/util/SimpleSet.java diff --git a/jode/jode/GlobalOptions.java b/jode/src/net/sf/jode/GlobalOptions.java similarity index 99% rename from jode/jode/GlobalOptions.java rename to jode/src/net/sf/jode/GlobalOptions.java index bbaba84..b4b96c1 100644 --- a/jode/jode/GlobalOptions.java +++ b/jode/src/net/sf/jode/GlobalOptions.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode; +package net.sf.jode; import java.io.PrintWriter; import java.util.StringTokenizer; diff --git a/jode/jode/bytecode/BasicBlockReader.java b/jode/src/net/sf/jode/bytecode/BasicBlockReader.java similarity index 99% rename from jode/jode/bytecode/BasicBlockReader.java rename to jode/src/net/sf/jode/bytecode/BasicBlockReader.java index 95d4cf7..8c6db86 100644 --- a/jode/jode/bytecode/BasicBlockReader.java +++ b/jode/src/net/sf/jode/bytecode/BasicBlockReader.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; -import jode.GlobalOptions; +import net.sf.jode.GlobalOptions; import java.io.DataInputStream; import java.io.IOException; import java.util.Stack; diff --git a/jode/jode/bytecode/BasicBlockWriter.java b/jode/src/net/sf/jode/bytecode/BasicBlockWriter.java similarity index 99% rename from jode/jode/bytecode/BasicBlockWriter.java rename to jode/src/net/sf/jode/bytecode/BasicBlockWriter.java index 7b100eb..0a7ec37 100644 --- a/jode/jode/bytecode/BasicBlockWriter.java +++ b/jode/src/net/sf/jode/bytecode/BasicBlockWriter.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataOutputStream; import java.io.IOException; diff --git a/jode/jode/bytecode/BasicBlocks.java b/jode/src/net/sf/jode/bytecode/BasicBlocks.java similarity index 98% rename from jode/jode/bytecode/BasicBlocks.java rename to jode/src/net/sf/jode/bytecode/BasicBlocks.java index bb960e2..dd0812b 100644 --- a/jode/jode/bytecode/BasicBlocks.java +++ b/jode/src/net/sf/jode/bytecode/BasicBlocks.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; -import jode.GlobalOptions; +import net.sf.jode.GlobalOptions; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -67,8 +67,8 @@ import java.lang.UnsupportedOperationException; * in the given order. Goto and return instructions are inserted as * necessary, you don't have to care about that.

* - * @see jode.bytecode.Block - * @see jode.bytecode.Instruction */ + * @see net.sf.jode.bytecode.Block + * @see net.sf.jode.bytecode.Instruction */ public class BasicBlocks extends BinaryInfo { /** diff --git a/jode/jode/bytecode/BinaryInfo.java b/jode/src/net/sf/jode/bytecode/BinaryInfo.java similarity index 99% rename from jode/jode/bytecode/BinaryInfo.java rename to jode/src/net/sf/jode/bytecode/BinaryInfo.java index c808232..8989219 100644 --- a/jode/jode/bytecode/BinaryInfo.java +++ b/jode/src/net/sf/jode/bytecode/BinaryInfo.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.EOFException; import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; -import jode.util.SimpleMap; +import net.sf.jode.util.SimpleMap; ///#def COLLECTIONS java.util import java.util.Map; diff --git a/jode/jode/bytecode/Block.java b/jode/src/net/sf/jode/bytecode/Block.java similarity index 98% rename from jode/jode/bytecode/Block.java rename to jode/src/net/sf/jode/bytecode/Block.java index 3e4dd20..3337aee 100644 --- a/jode/jode/bytecode/Block.java +++ b/jode/src/net/sf/jode/bytecode/Block.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.PrintWriter; ///#def COLLECTIONS java.util @@ -67,8 +67,8 @@ import java.util.Iterator; * a non-empty stack.

* * @author Jochen Hoenicke - * @see jode.bytecode.BasicBlocks - * @see jode.bytecode.Instruction + * @see net.sf.jode.bytecode.BasicBlocks + * @see net.sf.jode.bytecode.Instruction */ public final class Block { /** @@ -238,7 +238,7 @@ public final class Block { try { initCode(); } catch (IllegalArgumentException ex) { - dumpCode(jode.GlobalOptions.err); + dumpCode(net.sf.jode.GlobalOptions.err); throw ex; } } diff --git a/jode/jode/bytecode/ClassFormatException.java b/jode/src/net/sf/jode/bytecode/ClassFormatException.java similarity index 97% rename from jode/jode/bytecode/ClassFormatException.java rename to jode/src/net/sf/jode/bytecode/ClassFormatException.java index d262200..357e7fb 100644 --- a/jode/jode/bytecode/ClassFormatException.java +++ b/jode/src/net/sf/jode/bytecode/ClassFormatException.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * Thrown when a class file with an unknown or illegal format is loaded. diff --git a/jode/jode/bytecode/ClassInfo.java b/jode/src/net/sf/jode/bytecode/ClassInfo.java similarity index 99% rename from jode/jode/bytecode/ClassInfo.java rename to jode/src/net/sf/jode/bytecode/ClassInfo.java index 6298d8e..b8fb9fd 100644 --- a/jode/jode/bytecode/ClassInfo.java +++ b/jode/src/net/sf/jode/bytecode/ClassInfo.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.bytecode; -import jode.GlobalOptions; -import jode.util.UnifyHash; +package net.sf.jode.bytecode; +import net.sf.jode.GlobalOptions; +import net.sf.jode.util.UnifyHash; import java.io.DataInputStream; import java.io.BufferedInputStream; diff --git a/jode/jode/bytecode/ClassPath.java b/jode/src/net/sf/jode/bytecode/ClassPath.java similarity index 99% rename from jode/jode/bytecode/ClassPath.java rename to jode/src/net/sf/jode/bytecode/ClassPath.java index 3cd8038..2ccea9e 100644 --- a/jode/jode/bytecode/ClassPath.java +++ b/jode/src/net/sf/jode/bytecode/ClassPath.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.ByteArrayInputStream; import java.io.BufferedInputStream; @@ -46,8 +46,8 @@ import java.util.zip.ZipInputStream; import java.util.Iterator; ///#enddef -import jode.GlobalOptions; -import jode.util.UnifyHash; +import net.sf.jode.GlobalOptions; +import net.sf.jode.util.UnifyHash; /** * A path in which class files are searched for. diff --git a/jode/jode/bytecode/ConstantInstruction.java b/jode/src/net/sf/jode/bytecode/ConstantInstruction.java similarity index 95% rename from jode/jode/bytecode/ConstantInstruction.java rename to jode/src/net/sf/jode/bytecode/ConstantInstruction.java index 16e319b..3f6b77a 100644 --- a/jode/jode/bytecode/ConstantInstruction.java +++ b/jode/src/net/sf/jode/bytecode/ConstantInstruction.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.bytecode; -import jode.util.StringQuoter; +package net.sf.jode.bytecode; +import net.sf.jode.util.StringQuoter; /** * This class represents an instruction in the byte code. diff --git a/jode/jode/bytecode/ConstantPool.java b/jode/src/net/sf/jode/bytecode/ConstantPool.java similarity index 99% rename from jode/jode/bytecode/ConstantPool.java rename to jode/src/net/sf/jode/bytecode/ConstantPool.java index 9735959..867b2b2 100644 --- a/jode/jode/bytecode/ConstantPool.java +++ b/jode/src/net/sf/jode/bytecode/ConstantPool.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataInputStream; import java.io.IOException; diff --git a/jode/jode/bytecode/FieldInfo.java b/jode/src/net/sf/jode/bytecode/FieldInfo.java similarity index 99% rename from jode/jode/bytecode/FieldInfo.java rename to jode/src/net/sf/jode/bytecode/FieldInfo.java index 6da18a9..82b5fdd 100644 --- a/jode/jode/bytecode/FieldInfo.java +++ b/jode/src/net/sf/jode/bytecode/FieldInfo.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/jode/jode/bytecode/GrowableConstantPool.java b/jode/src/net/sf/jode/bytecode/GrowableConstantPool.java similarity index 99% rename from jode/jode/bytecode/GrowableConstantPool.java rename to jode/src/net/sf/jode/bytecode/GrowableConstantPool.java index 6319cfa..56432f5 100644 --- a/jode/jode/bytecode/GrowableConstantPool.java +++ b/jode/src/net/sf/jode/bytecode/GrowableConstantPool.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataOutputStream; import java.io.IOException; import java.util.Hashtable; diff --git a/jode/jode/bytecode/Handler.java b/jode/src/net/sf/jode/bytecode/Handler.java similarity index 98% rename from jode/jode/bytecode/Handler.java rename to jode/src/net/sf/jode/bytecode/Handler.java index 5751e0d..d67bd94 100644 --- a/jode/jode/bytecode/Handler.java +++ b/jode/src/net/sf/jode/bytecode/Handler.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * A simple class containing the info about one try-catch block. diff --git a/jode/jode/bytecode/IncInstruction.java b/jode/src/net/sf/jode/bytecode/IncInstruction.java similarity index 98% rename from jode/jode/bytecode/IncInstruction.java rename to jode/src/net/sf/jode/bytecode/IncInstruction.java index d51cd2b..783cc2c 100644 --- a/jode/jode/bytecode/IncInstruction.java +++ b/jode/src/net/sf/jode/bytecode/IncInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an instruction in the byte code. diff --git a/jode/jode/bytecode/Instruction.java b/jode/src/net/sf/jode/bytecode/Instruction.java similarity index 99% rename from jode/jode/bytecode/Instruction.java rename to jode/src/net/sf/jode/bytecode/Instruction.java index 15d5ae2..7063205 100644 --- a/jode/jode/bytecode/Instruction.java +++ b/jode/src/net/sf/jode/bytecode/Instruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an instruction in the byte code. diff --git a/jode/jode/bytecode/LocalVariableInfo.java b/jode/src/net/sf/jode/bytecode/LocalVariableInfo.java similarity index 97% rename from jode/jode/bytecode/LocalVariableInfo.java rename to jode/src/net/sf/jode/bytecode/LocalVariableInfo.java index 4b1cf2e..f2cdeaa 100644 --- a/jode/jode/bytecode/LocalVariableInfo.java +++ b/jode/src/net/sf/jode/bytecode/LocalVariableInfo.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.bytecode; -import jode.util.UnifyHash; +package net.sf.jode.bytecode; +import net.sf.jode.util.UnifyHash; ///#def COLLECTIONS java.util import java.util.Iterator; ///#enddef diff --git a/jode/jode/bytecode/MethodInfo.java b/jode/src/net/sf/jode/bytecode/MethodInfo.java similarity index 99% rename from jode/jode/bytecode/MethodInfo.java rename to jode/src/net/sf/jode/bytecode/MethodInfo.java index f4227e0..47ea39d 100644 --- a/jode/jode/bytecode/MethodInfo.java +++ b/jode/src/net/sf/jode/bytecode/MethodInfo.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/jode/jode/bytecode/Opcodes.java b/jode/src/net/sf/jode/bytecode/Opcodes.java similarity index 99% rename from jode/jode/bytecode/Opcodes.java rename to jode/src/net/sf/jode/bytecode/Opcodes.java index 4b3cc28..579503f 100644 --- a/jode/jode/bytecode/Opcodes.java +++ b/jode/src/net/sf/jode/bytecode/Opcodes.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This is an interface containing the constants for the byte code opcodes. diff --git a/jode/jode/bytecode/Reference.java b/jode/src/net/sf/jode/bytecode/Reference.java similarity index 97% rename from jode/jode/bytecode/Reference.java rename to jode/src/net/sf/jode/bytecode/Reference.java index d22aa54..1c1a8a8 100644 --- a/jode/jode/bytecode/Reference.java +++ b/jode/src/net/sf/jode/bytecode/Reference.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.bytecode; -import jode.util.UnifyHash; +package net.sf.jode.bytecode; +import net.sf.jode.util.UnifyHash; ///#def COLLECTIONS java.util import java.util.Iterator; ///#enddef diff --git a/jode/jode/bytecode/ReferenceInstruction.java b/jode/src/net/sf/jode/bytecode/ReferenceInstruction.java similarity index 98% rename from jode/jode/bytecode/ReferenceInstruction.java rename to jode/src/net/sf/jode/bytecode/ReferenceInstruction.java index 271d198..021c510 100644 --- a/jode/jode/bytecode/ReferenceInstruction.java +++ b/jode/src/net/sf/jode/bytecode/ReferenceInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an instruction that needs a reference, i.e. diff --git a/jode/jode/bytecode/SlotInstruction.java b/jode/src/net/sf/jode/bytecode/SlotInstruction.java similarity index 98% rename from jode/jode/bytecode/SlotInstruction.java rename to jode/src/net/sf/jode/bytecode/SlotInstruction.java index 02246e9..3b09d00 100644 --- a/jode/jode/bytecode/SlotInstruction.java +++ b/jode/src/net/sf/jode/bytecode/SlotInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an instruction in the byte code. diff --git a/jode/src/net/sf/jode/bytecode/Subroutine.java b/jode/src/net/sf/jode/bytecode/Subroutine.java new file mode 100644 index 0000000..5b91bbe --- /dev/null +++ b/jode/src/net/sf/jode/bytecode/Subroutine.java @@ -0,0 +1,73 @@ +/* Subroutine Copyright (C) 2000 Jochen Hoenicke. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +package net.sf.jode.bytecode; + +import java.io.PrintWriter; +///#def COLLECTIONS java.util +import java.util.Collection; +import java.util.Arrays; +import java.util.List; +import java.util.Iterator; +///#enddef + +/** + *

Represents a jsr-Subroutine.

+ * + *

In my representation a subroutine consists of all blocks from + * which the ret instruction is reachable. Every subroutine must have + * a reachable ret instruction, or the jsr is replaced by a simple goto. + *

+ * + * @author Jochen Hoenicke + * @see net.sf.jode.bytecode.BasicBlocks + * @see net.sf.jode.bytecode.Block + */ +public final class Subroutine { + /** + * Subroutines may be nested. This points to the outer subroutine + * or to null if this doesn't have an outer. + */ + private Subroutine outer; + + /** + * Each subroutine has exactly one ret instruction, which is the + * last instruction in the retBlock. The local of the ret + * instruction must equal the local where the first instruction of + * the subroutine stores to. + */ + private Block retBlock; + + /** + * The set of locals that are accessed inside this subroutine. + */ + private BitSet accessedLocals; + + public Block getRetBlock() { + return retBlock; + } + + public Subroutine getOuter() { + return outer; + } + + public boolean isAccessed(int slot) { + return accessedLocals.get(slot); + } +} diff --git a/jode/jode/bytecode/SwitchInstruction.java b/jode/src/net/sf/jode/bytecode/SwitchInstruction.java similarity index 95% rename from jode/jode/bytecode/SwitchInstruction.java rename to jode/src/net/sf/jode/bytecode/SwitchInstruction.java index 8e22e0a..92299c4 100644 --- a/jode/jode/bytecode/SwitchInstruction.java +++ b/jode/src/net/sf/jode/bytecode/SwitchInstruction.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.bytecode; -import jode.util.StringQuoter; +package net.sf.jode.bytecode; +import net.sf.jode.util.StringQuoter; /** * This class represents an instruction in the byte code. diff --git a/jode/src/net/sf/jode/bytecode/TransformSubroutine.java b/jode/src/net/sf/jode/bytecode/TransformSubroutine.java new file mode 100644 index 0000000..b5cb075 --- /dev/null +++ b/jode/src/net/sf/jode/bytecode/TransformSubroutine.java @@ -0,0 +1,228 @@ +/* TransformSubroutine Copyright (C) 1999-2000 Jochen Hoenicke. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +package net.sf.jode.bytecode; +import java.util.BitSet; + +/** + *

This class contains some code to transform the subroutines of + * a method into a normal form. The normal form is as following.

+ * + *

Each subroutine block, meaning a block where some jsr + * instructions may jump to, must store the return address in a local + * variable immediately. There must be exactly one block with the + * corresponding opc_ret instruction and this block must + * be reachable from all blocks that belong to this subroutine. + * + *

The JVM spec allows a subroutine, to leave the return address on + * stack for a while, even longer than the subroutine actually exists. + * One can also pop that value instead of storing it in a local + * variable. And finally its possible to store it in a variable, but + * there exists no reachable opc_ret instruction that returns + * to that address.

+ * + *

If the return address is not used by the subroutine, we simply + * replace the jsr by a jump and remove the pop/store instruction that + * popped the return address.

+ * + *

If the return address is used, but not immediately stored, we simply + * move the corresponding astore to the start of the subroutine.

+ * + * @see net.sf.jode.bytecode.Block + * @see net.sf.jode.bytecode.Instruction + */ +public class TransformSubroutine implements Opcodes { + private final static int SUBSTATUS_SUBROUTINE = 1; + private final static int SUBSTATUS_REMOVEDSUB = 2; + private final static int SUBSTATUS_NOTSUB = 3; + private final static int SUBSTATUS_INPROGRESS = 4; + + BasicBlocks bb; + Blocks[] blocks; + byte[] substatus; + Subroutine[] subInfo; + +// { +// for (int i=0; i < blocks.length; i++) { +// Instructions[] instrs = blocks[i].getInstructions(); +// if (instrs[instrs.length-1].getOpcode() == opc_jsr) { +// int srBlock = instrs.getSuccs()[0].getBlockNr(); +// if (substatus[srBlock] == 0) +// analyzeSubroutine(srBlock); +// if (substatus[srBlock] == SUBSTATUS_REMOVED) { +// Instructions[] newInstrs +// = new Instruction[instrs.length-1]; +// System.arraycopy(instrs, 0, newInstrs, 0, +// newInstrs.length); +// Block[] newSuccs = new Block[1] { instrs.getSuccs()[1]; }; +// blocks[i].setCode(newInstrs, newSuccs); +// } +// } +// } +// } + + class SubroutineInfo { + int retPosition; + BitSet accessedLocals; + SubroutineInfo outer; + + SubroutineInfo(int retPos, Bitset accLocals, SubroutineInfo outer) { + this.outer = outer; + this.retPosition = retPos; + this.accessedLocals = accLocals; + } + + boolean merge(int retPos, BitSet accLocals, SubroutineInfo outer) { + if ((retPos < 0 || this.retPosition < 0) + && retPos != this.retPosition) + throw new + } + } + + public TransformSubroutine(BasicBlocks bb) + throws ClassFormatException + { + if (bb.getStartBlock() == null) + return; + + blocks = bb.getBlocks(); + substatus = new byte[blocks.length]; + analyzeBlock(blockNr, SUBSTATUS_NOTSUB, null); + } + + public void analyzeBlock(int blockNr, int status, SubroutineInfo outer, + BitSet retsOnStack) { + Block block = blocks[blockNr]; + if (status == SUBSTATUS_INPROGRESS) { + + } + + } + + public void analyzeBlock(int blockNr, int status, SubroutineInfo outer) { + substatus[blockNr] = status; + accessedLocals[blockNr] = accessed; + Stack todo = new Stack(); + + todo.add(new BlockInfo(startBlockNr, 0, null)); + while (!todo.isEmpty()) { + BlockInfo info = todo.pop(); + Block block = blocks[info.blockNr]; + Instruction[] instrs = block.getInstructions(); + Instruction[] newInstrs = null; + Block[] succs = block.getSuccessors(); + + + if (substatus[info.blockNr] + == SUBSTATUS_INPROGRESS) { + int retPosition = info.retPosition; + BitSet = + retPosition < 0 ? info.accessedLocals.clone() : null; + + for (int i = 0; i < instrs.length; i++) { + Instruction instr = instrs[i]; + if (instr instanceof SlotInstruction) { + if (instr.getOpcode() == opc_astore + && retPosition == -1) { + + /* We found the store operation. At least + * a candidate, since there may not be a + * corresponding ret. + */ + + retPosition = instr.getLocalSlot(); + accessedLocals = null; + /* remove store Instruction. + */ + newInstrs = new Instruction[instrs.length - 1]; + System.arraycopy(instrs, 0, newInstrs, 0, i); + System.arraycopy(instrs, i+1, newInstrs, i, + newInstrs.length - i); + + } else { + if (retPosition < 0) { + accessedLocals.add(instr.getLocalSlot()); + switch (instr.getOpcode()) { + case opc_lload: + case opc_dload: + case opc_lstore: + case opc_dstore: + accessedLocals.add(instr.getLocalSlot()+1); + } + } + } + } else if (instr.getOpcode() == opc_pop + && retPosition == -1) { + /* We spontanously left the subroutine by popping. + * Remove the pop Instruction. + */ + newInstrs = new Instruction[instrs.length - 1]; + System.arraycopy(instrs, 0, newInstrs, 0, i); + System.arraycopy(instrs, i+1, newInstrs, i, + newInstrs.length - i); + substatus[info.blockNr] = SUBSTATUS_NOTSUB; + break; + } else if ((instr.getOpcode() == opc_pop2 && + (retPosition == -1 || retPosition == -2))) { + /* We spontanously left the subroutine by popping. + * Replace the pop2 with a pop. + */ + newInstrs = new Instruction[instrs.length]; + System.arraycopy(instrs, 0, newInstrs, 0, + instrs.length); + newInstrs[i] = Instruction.forOpcode(opc_pop); + substatus[info.blockNr] = SUBSTATUS_NOTSUB; + break; + } else if (instr.getOpcode() == opc_jsr) { + /* A recursive subroutine (or have we already + * spontanously left this subroutine?) + */ + int srBlock = instrs.getSuccs()[0].getBlockNr(); + if (substatus[srBlock] == 0) + analyzeSubroutine(srBlock); + if (substatus[srBlock] == SUBSTATUS_INPROGRESS) { + /* We spontanously left this subroutine! */ + if (retPosition < 0) + /* This can't happen in valid code. + */ + throw new CodeFormatException + ("Can't merge return instr on Stack."); + substatus[info.blockNr] = SUBSTATUS_NOTSUB; + } + leftSub = true; + break; + } else if (substatus[srBlock] == SUBSTATUS_REMOVED) { + Instructions[] newInstrs + = new Instruction[instrs.length-1]; + System.arraycopy(instrs, 0, newInstrs, 0, + newInstrs.length); + Block[] newSuccs = new Block[1] { instrs.getSuccs()[1]; }; + blocks[i].setCode(newInstrs, newSuccs); + } + } + } + if (!leftSub) { + + + } + } + } +} + + diff --git a/jode/jode/bytecode/TypeDimensionInstruction.java b/jode/src/net/sf/jode/bytecode/TypeDimensionInstruction.java similarity index 98% rename from jode/jode/bytecode/TypeDimensionInstruction.java rename to jode/src/net/sf/jode/bytecode/TypeDimensionInstruction.java index 4281481..1cbcf16 100644 --- a/jode/jode/bytecode/TypeDimensionInstruction.java +++ b/jode/src/net/sf/jode/bytecode/TypeDimensionInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an opc_multianewarray instruction. diff --git a/jode/jode/bytecode/TypeInstruction.java b/jode/src/net/sf/jode/bytecode/TypeInstruction.java similarity index 97% rename from jode/jode/bytecode/TypeInstruction.java rename to jode/src/net/sf/jode/bytecode/TypeInstruction.java index 37719e7..5d09d07 100644 --- a/jode/jode/bytecode/TypeInstruction.java +++ b/jode/src/net/sf/jode/bytecode/TypeInstruction.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.bytecode; +package net.sf.jode.bytecode; /** * This class represents an instruction in the byte code. diff --git a/jode/jode/bytecode/TypeSignature.java b/jode/src/net/sf/jode/bytecode/TypeSignature.java similarity index 99% rename from jode/jode/bytecode/TypeSignature.java rename to jode/src/net/sf/jode/bytecode/TypeSignature.java index e633c44..a088afe 100644 --- a/jode/jode/bytecode/TypeSignature.java +++ b/jode/src/net/sf/jode/bytecode/TypeSignature.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.bytecode; -import jode.util.UnifyHash; +package net.sf.jode.bytecode; +import net.sf.jode.util.UnifyHash; /** * This class contains some static methods to handle type signatures. diff --git a/jode/jode/decompiler/Analyzer.java b/jode/src/net/sf/jode/decompiler/Analyzer.java similarity index 96% rename from jode/jode/decompiler/Analyzer.java rename to jode/src/net/sf/jode/decompiler/Analyzer.java index 2628d02..243b567 100644 --- a/jode/jode/decompiler/Analyzer.java +++ b/jode/src/net/sf/jode/decompiler/Analyzer.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; public interface Analyzer { diff --git a/jode/jode/decompiler/Applet.java b/jode/src/net/sf/jode/decompiler/Applet.java similarity index 99% rename from jode/jode/decompiler/Applet.java rename to jode/src/net/sf/jode/decompiler/Applet.java index 083d09a..1058c7e 100644 --- a/jode/jode/decompiler/Applet.java +++ b/jode/src/net/sf/jode/decompiler/Applet.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; diff --git a/jode/jode/decompiler/ClassAnalyzer.java b/jode/src/net/sf/jode/decompiler/ClassAnalyzer.java similarity index 97% rename from jode/jode/decompiler/ClassAnalyzer.java rename to jode/src/net/sf/jode/decompiler/ClassAnalyzer.java index e2b1f07..6be45fd 100644 --- a/jode/jode/decompiler/ClassAnalyzer.java +++ b/jode/src/net/sf/jode/decompiler/ClassAnalyzer.java @@ -17,20 +17,20 @@ * $Id$ */ -package jode.decompiler; -import jode.GlobalOptions; -import jode.type.MethodType; -import jode.type.Type; -import jode.bytecode.ClassFormatException; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; -import jode.bytecode.FieldInfo; -import jode.bytecode.MethodInfo; -import jode.expr.Expression; -import jode.expr.ThisOperator; -import jode.flow.TransformConstructors; -import jode.flow.StructuredBlock; -import jode.util.SimpleSet; +package net.sf.jode.decompiler; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.MethodType; +import net.sf.jode.type.Type; +import net.sf.jode.bytecode.ClassFormatException; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.FieldInfo; +import net.sf.jode.bytecode.MethodInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.ThisOperator; +import net.sf.jode.flow.TransformConstructors; +import net.sf.jode.flow.StructuredBlock; +import net.sf.jode.util.SimpleSet; import java.lang.reflect.Modifier; import java.util.NoSuchElementException; diff --git a/jode/jode/decompiler/ClassDeclarer.java b/jode/src/net/sf/jode/decompiler/ClassDeclarer.java similarity index 95% rename from jode/jode/decompiler/ClassDeclarer.java rename to jode/src/net/sf/jode/decompiler/ClassDeclarer.java index a768537..b73480a 100644 --- a/jode/jode/decompiler/ClassDeclarer.java +++ b/jode/src/net/sf/jode/decompiler/ClassDeclarer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.decompiler; -import jode.bytecode.ClassInfo; +package net.sf.jode.decompiler; +import net.sf.jode.bytecode.ClassInfo; /** * This is the interface for objects, that a method can declare diff --git a/jode/jode/decompiler/Declarable.java b/jode/src/net/sf/jode/decompiler/Declarable.java similarity index 97% rename from jode/jode/decompiler/Declarable.java rename to jode/src/net/sf/jode/decompiler/Declarable.java index 5491e68..db75c97 100644 --- a/jode/jode/decompiler/Declarable.java +++ b/jode/src/net/sf/jode/decompiler/Declarable.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; /** * This is the interface for objects, that a method can declare diff --git a/jode/jode/decompiler/Decompiler.java b/jode/src/net/sf/jode/decompiler/Decompiler.java similarity index 97% rename from jode/jode/decompiler/Decompiler.java rename to jode/src/net/sf/jode/decompiler/Decompiler.java index d63289b..8476c95 100644 --- a/jode/jode/decompiler/Decompiler.java +++ b/jode/src/net/sf/jode/decompiler/Decompiler.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.decompiler; -import jode.GlobalOptions; -import jode.bytecode.ClassPath; -import jode.bytecode.ClassInfo; +package net.sf.jode.decompiler; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.ClassInfo; import java.io.File; import java.io.PrintWriter; import java.io.Writer; @@ -203,7 +203,7 @@ public class Decompiler { * @param progress A progress listener (see below). Null if you * don't need information about progress. * @exception IllegalArgumentException if className isn't correct. - * @exception jode.jvm.VerifyException The code + * @exception net.sf.jode.jvm.VerifyException The code * isn't valid or a dependent class, needed for type * guessing, couldn't be found. * @exception IOException if writer throws an exception. diff --git a/jode/jode/decompiler/FieldAnalyzer.java b/jode/src/net/sf/jode/decompiler/FieldAnalyzer.java similarity index 94% rename from jode/jode/decompiler/FieldAnalyzer.java rename to jode/src/net/sf/jode/decompiler/FieldAnalyzer.java index 2f20b73..90a28e7 100644 --- a/jode/jode/decompiler/FieldAnalyzer.java +++ b/jode/src/net/sf/jode/decompiler/FieldAnalyzer.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.decompiler; -import jode.type.Type; -import jode.bytecode.FieldInfo; -import jode.expr.Expression; -import jode.expr.ThisOperator; -import jode.expr.LocalLoadOperator; -import jode.expr.ConstOperator; -import jode.expr.OuterLocalOperator; +package net.sf.jode.decompiler; +import net.sf.jode.type.Type; +import net.sf.jode.bytecode.FieldInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.ThisOperator; +import net.sf.jode.expr.LocalLoadOperator; +import net.sf.jode.expr.ConstOperator; +import net.sf.jode.expr.OuterLocalOperator; import java.lang.reflect.Modifier; import java.io.IOException; diff --git a/jode/jode/decompiler/ImportHandler.java b/jode/src/net/sf/jode/decompiler/ImportHandler.java similarity index 97% rename from jode/jode/decompiler/ImportHandler.java rename to jode/src/net/sf/jode/decompiler/ImportHandler.java index fb4754d..47eb6a2 100644 --- a/jode/jode/decompiler/ImportHandler.java +++ b/jode/src/net/sf/jode/decompiler/ImportHandler.java @@ -17,15 +17,15 @@ * $Id$ */ -package jode.decompiler; -import jode.GlobalOptions; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; -import jode.type.Type; -import jode.type.ArrayType; -import jode.type.ClassInfoType; -import jode.type.ClassType; -import jode.type.NullType; +package net.sf.jode.decompiler; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.type.Type; +import net.sf.jode.type.ArrayType; +import net.sf.jode.type.ClassInfoType; +import net.sf.jode.type.ClassType; +import net.sf.jode.type.NullType; ///#def COLLECTIONS java.util import java.util.SortedMap; diff --git a/jode/jode/decompiler/LocalInfo.java b/jode/src/net/sf/jode/decompiler/LocalInfo.java similarity index 98% rename from jode/jode/decompiler/LocalInfo.java rename to jode/src/net/sf/jode/decompiler/LocalInfo.java index 7cedffe..41aaab5 100644 --- a/jode/jode/decompiler/LocalInfo.java +++ b/jode/src/net/sf/jode/decompiler/LocalInfo.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; import java.util.Enumeration; import java.util.Vector; -import jode.GlobalOptions; -import jode.type.Type; -import jode.expr.Expression; -import jode.expr.LocalVarOperator; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.LocalVarOperator; /** * The LocalInfo represents a local variable of a method. diff --git a/jode/jode/decompiler/Main.java b/jode/src/net/sf/jode/decompiler/Main.java similarity index 94% rename from jode/jode/decompiler/Main.java rename to jode/src/net/sf/jode/decompiler/Main.java index 4e51d4b..d9c1e52 100644 --- a/jode/jode/decompiler/Main.java +++ b/jode/src/net/sf/jode/decompiler/Main.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.decompiler; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; -import jode.GlobalOptions; +package net.sf.jode.decompiler; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.GlobalOptions; import java.io.BufferedOutputStream; import java.io.File; @@ -76,8 +76,8 @@ public class Main extends Options { public static void usage() { PrintWriter err = GlobalOptions.err; err.println("Version: " + GlobalOptions.version); - err.println("Usage: java jode.decompiler.Main [OPTION]* {CLASS|JAR}*"); - err.println("Give a fully qualified CLASS name, e.g. jode.decompiler.Main, if you want to"); + err.println("Usage: java net.sf.jode.decompiler.Main [OPTION]* {CLASS|JAR}*"); + err.println("Give a fully qualified CLASS name, e.g. net.sf.jode.decompiler.Main, if you want to"); err.println("decompile a single class, or a JAR file containing many classes."); err.println("OPTION is any of these:"); err.println(" -h, --help "+ @@ -112,7 +112,7 @@ public class Main extends Options { options &= ~(1 << option); else { GlobalOptions.err.println - ("jode.decompiler.Main: option --"+longOptions[longind].getName() + ("net.sf.jode.decompiler.Main: option --"+longOptions[longind].getName() +" takes one of `yes', `no', `on', `off' as parameter"); return false; } @@ -222,7 +222,7 @@ public class Main extends Options { GlobalOptions.err.println(GlobalOptions.copyright); boolean errorInParams = false; - Getopt g = new Getopt("jode.decompiler.Main", params, "hVvc:d:D:i:s:", + Getopt g = new Getopt("net.sf.jode.decompiler.Main", params, "hVvc:d:D:i:s:", longOptions, true); for (int opt = g.getopt(); opt != -1; opt = g.getopt()) { switch(opt) { @@ -250,7 +250,7 @@ public class Main extends Options { GlobalOptions.verboseLevel = Integer.parseInt(arg); } catch (NumberFormatException ex) { GlobalOptions.err.println - ("jode.decompiler.Main: Argument `" + ("net.sf.jode.decompiler.Main: Argument `" +arg+"' to --verbose must be numeric:"); errorInParams = true; } @@ -278,7 +278,7 @@ public class Main extends Options { indentSize = 4; } else { GlobalOptions.err.println - ("jode.decompiler.Main: Unknown style `"+arg+"'."); + ("net.sf.jode.decompiler.Main: Unknown style `"+arg+"'."); errorInParams = true; } break; @@ -303,7 +303,7 @@ public class Main extends Options { } catch (RuntimeException ex) { GlobalOptions.err.println - ("jode.decompiler.Main: Invalid argument for -i option."); + ("net.sf.jode.decompiler.Main: Invalid argument for -i option."); errorInParams = true; } break; diff --git a/jode/jode/decompiler/MethodAnalyzer.java b/jode/src/net/sf/jode/decompiler/MethodAnalyzer.java similarity index 97% rename from jode/jode/decompiler/MethodAnalyzer.java rename to jode/src/net/sf/jode/decompiler/MethodAnalyzer.java index 9423c63..6c593a7 100644 --- a/jode/jode/decompiler/MethodAnalyzer.java +++ b/jode/src/net/sf/jode/decompiler/MethodAnalyzer.java @@ -17,31 +17,31 @@ * $Id$ */ -package jode.decompiler; -import jode.GlobalOptions; -import jode.bytecode.BasicBlocks; -import jode.bytecode.Block; -import jode.bytecode.ClassInfo; -import jode.bytecode.Handler; -import jode.bytecode.Instruction; -import jode.bytecode.LocalVariableInfo; -import jode.bytecode.MethodInfo; -import jode.jvm.SyntheticAnalyzer; -import jode.type.*; -import jode.expr.Expression; -import jode.expr.ConstOperator; -import jode.expr.CheckNullOperator; -import jode.expr.ThisOperator; -import jode.expr.LocalLoadOperator; -import jode.expr.OuterLocalOperator; -import jode.expr.InvokeOperator; -import jode.flow.StructuredBlock; -import jode.flow.FlowBlock; -import jode.flow.TransformExceptionHandlers; -import jode.flow.Jump; -import jode.jvm.CodeVerifier; -import jode.jvm.VerifyException; -import jode.util.SimpleMap; +package net.sf.jode.decompiler; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.Block; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.Handler; +import net.sf.jode.bytecode.Instruction; +import net.sf.jode.bytecode.LocalVariableInfo; +import net.sf.jode.bytecode.MethodInfo; +import net.sf.jode.jvm.SyntheticAnalyzer; +import net.sf.jode.type.*; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.ConstOperator; +import net.sf.jode.expr.CheckNullOperator; +import net.sf.jode.expr.ThisOperator; +import net.sf.jode.expr.LocalLoadOperator; +import net.sf.jode.expr.OuterLocalOperator; +import net.sf.jode.expr.InvokeOperator; +import net.sf.jode.flow.StructuredBlock; +import net.sf.jode.flow.FlowBlock; +import net.sf.jode.flow.TransformExceptionHandlers; +import net.sf.jode.flow.Jump; +import net.sf.jode.jvm.CodeVerifier; +import net.sf.jode.jvm.VerifyException; +import net.sf.jode.util.SimpleMap; import java.lang.reflect.Modifier; import java.util.BitSet; @@ -726,7 +726,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { /* The default constructor must be empty * and mustn't throw exceptions */ if (getMethodHeader() == null - || !(getMethodHeader().getBlock() instanceof jode.flow.EmptyBlock) + || !(getMethodHeader().getBlock() instanceof net.sf.jode.flow.EmptyBlock) || !getMethodHeader().hasNoJumps() || exceptions.length > 0) return false; diff --git a/jode/jode/decompiler/Opcodes.java b/jode/src/net/sf/jode/decompiler/Opcodes.java similarity index 98% rename from jode/jode/decompiler/Opcodes.java rename to jode/src/net/sf/jode/decompiler/Opcodes.java index 86de104..f9e0af4 100644 --- a/jode/jode/decompiler/Opcodes.java +++ b/jode/src/net/sf/jode/decompiler/Opcodes.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.decompiler; -import jode.type.Type; -import jode.type.IntegerType; -import jode.type.MethodType; -import jode.expr.*; -import jode.flow.*; -import jode.bytecode.*; +package net.sf.jode.decompiler; +import net.sf.jode.type.Type; +import net.sf.jode.type.IntegerType; +import net.sf.jode.type.MethodType; +import net.sf.jode.expr.*; +import net.sf.jode.flow.*; +import net.sf.jode.bytecode.*; import java.io.*; import java.util.Vector; @@ -31,7 +31,7 @@ import java.util.Vector; * This is an abstract class which creates flow blocks for the * opcodes in a byte stream. */ -public abstract class Opcodes implements jode.bytecode.Opcodes { +public abstract class Opcodes implements net.sf.jode.bytecode.Opcodes { private final static Type tIntHint = new IntegerType(IntegerType.IT_I, diff --git a/jode/jode/decompiler/Options.java b/jode/src/net/sf/jode/decompiler/Options.java similarity index 96% rename from jode/jode/decompiler/Options.java rename to jode/src/net/sf/jode/decompiler/Options.java index 811bbc4..ecec381 100644 --- a/jode/jode/decompiler/Options.java +++ b/jode/src/net/sf/jode/decompiler/Options.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.decompiler; -import jode.bytecode.ClassInfo; +package net.sf.jode.decompiler; +import net.sf.jode.bytecode.ClassInfo; import java.io.IOException; public class Options { diff --git a/jode/jode/decompiler/OuterValueListener.java b/jode/src/net/sf/jode/decompiler/OuterValueListener.java similarity index 97% rename from jode/jode/decompiler/OuterValueListener.java rename to jode/src/net/sf/jode/decompiler/OuterValueListener.java index dcd7caa..a090311 100644 --- a/jode/jode/decompiler/OuterValueListener.java +++ b/jode/src/net/sf/jode/decompiler/OuterValueListener.java @@ -16,7 +16,7 @@ * * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; /** * Interface, that every one should implement who is interested in diff --git a/jode/jode/decompiler/OuterValues.java b/jode/src/net/sf/jode/decompiler/OuterValues.java similarity index 97% rename from jode/jode/decompiler/OuterValues.java rename to jode/src/net/sf/jode/decompiler/OuterValues.java index 8dd9a38..8686e4e 100644 --- a/jode/jode/decompiler/OuterValues.java +++ b/jode/src/net/sf/jode/decompiler/OuterValues.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.decompiler; -import jode.GlobalOptions; -import jode.expr.Expression; -import jode.expr.ThisOperator; -import jode.expr.LocalLoadOperator; -import jode.expr.OuterLocalOperator; -import jode.util.SimpleMap; -import jode.type.Type; +package net.sf.jode.decompiler; +import net.sf.jode.GlobalOptions; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.ThisOperator; +import net.sf.jode.expr.LocalLoadOperator; +import net.sf.jode.expr.OuterLocalOperator; +import net.sf.jode.util.SimpleMap; +import net.sf.jode.type.Type; import java.util.Vector; import java.util.Enumeration; diff --git a/jode/jode/decompiler/ProgressListener.java b/jode/src/net/sf/jode/decompiler/ProgressListener.java similarity index 97% rename from jode/jode/decompiler/ProgressListener.java rename to jode/src/net/sf/jode/decompiler/ProgressListener.java index 4b1b092..3a7d454 100644 --- a/jode/jode/decompiler/ProgressListener.java +++ b/jode/src/net/sf/jode/decompiler/ProgressListener.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; /** * This interface is used by jode to tell about its progress. You diff --git a/jode/jode/decompiler/Scope.java b/jode/src/net/sf/jode/decompiler/Scope.java similarity index 98% rename from jode/jode/decompiler/Scope.java rename to jode/src/net/sf/jode/decompiler/Scope.java index aaf5beb..8b31a65 100644 --- a/jode/jode/decompiler/Scope.java +++ b/jode/src/net/sf/jode/decompiler/Scope.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; /** * This interface describes a scope. The basic scopes are: the package diff --git a/jode/jode/decompiler/TabbedPrintWriter.java b/jode/src/net/sf/jode/decompiler/TabbedPrintWriter.java similarity index 99% rename from jode/jode/decompiler/TabbedPrintWriter.java rename to jode/src/net/sf/jode/decompiler/TabbedPrintWriter.java index 33ec13e..101dbfb 100644 --- a/jode/jode/decompiler/TabbedPrintWriter.java +++ b/jode/src/net/sf/jode/decompiler/TabbedPrintWriter.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; import java.io.*; import java.util.Stack; import java.util.Vector; import java.util.Enumeration; -import jode.GlobalOptions; -import jode.bytecode.ClassInfo; -import jode.type.*; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.type.*; public class TabbedPrintWriter { /* The indentation size. */ diff --git a/jode/jode/decompiler/Window.java b/jode/src/net/sf/jode/decompiler/Window.java similarity index 99% rename from jode/jode/decompiler/Window.java rename to jode/src/net/sf/jode/decompiler/Window.java index fc7b328..765577f 100644 --- a/jode/jode/decompiler/Window.java +++ b/jode/src/net/sf/jode/decompiler/Window.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.decompiler; +package net.sf.jode.decompiler; import java.applet.*; import java.awt.*; ///#ifndef AWT10 import java.awt.event.*; ///#endif import java.io.*; -import jode.GlobalOptions; +import net.sf.jode.GlobalOptions; public class Window implements Runnable diff --git a/jode/jode/expr/ArrayLengthOperator.java b/jode/src/net/sf/jode/expr/ArrayLengthOperator.java similarity index 92% rename from jode/jode/expr/ArrayLengthOperator.java rename to jode/src/net/sf/jode/expr/ArrayLengthOperator.java index e4c128f..34dbccc 100644 --- a/jode/jode/expr/ArrayLengthOperator.java +++ b/jode/src/net/sf/jode/expr/ArrayLengthOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ArrayLengthOperator extends Operator { diff --git a/jode/jode/expr/ArrayLoadOperator.java b/jode/src/net/sf/jode/expr/ArrayLoadOperator.java similarity index 92% rename from jode/jode/expr/ArrayLoadOperator.java rename to jode/src/net/sf/jode/expr/ArrayLoadOperator.java index 73f7ab5..1eedba1 100644 --- a/jode/jode/expr/ArrayLoadOperator.java +++ b/jode/src/net/sf/jode/expr/ArrayLoadOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.type.ArrayType; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.type.ArrayType; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ArrayLoadOperator extends Operator { diff --git a/jode/jode/expr/ArrayStoreOperator.java b/jode/src/net/sf/jode/expr/ArrayStoreOperator.java similarity index 92% rename from jode/jode/expr/ArrayStoreOperator.java rename to jode/src/net/sf/jode/expr/ArrayStoreOperator.java index 3f1e736..6e5a94e 100644 --- a/jode/jode/expr/ArrayStoreOperator.java +++ b/jode/src/net/sf/jode/expr/ArrayStoreOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.type.ArrayType; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.type.ArrayType; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ArrayStoreOperator extends ArrayLoadOperator implements LValueExpression { diff --git a/jode/jode/expr/BinaryOperator.java b/jode/src/net/sf/jode/expr/BinaryOperator.java similarity index 96% rename from jode/jode/expr/BinaryOperator.java rename to jode/src/net/sf/jode/expr/BinaryOperator.java index 06e033d..a62b901 100644 --- a/jode/jode/expr/BinaryOperator.java +++ b/jode/src/net/sf/jode/expr/BinaryOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class BinaryOperator extends Operator { diff --git a/jode/jode/expr/CheckCastOperator.java b/jode/src/net/sf/jode/expr/CheckCastOperator.java similarity index 95% rename from jode/jode/expr/CheckCastOperator.java rename to jode/src/net/sf/jode/expr/CheckCastOperator.java index 8de6151..d5ec166 100644 --- a/jode/jode/expr/CheckCastOperator.java +++ b/jode/src/net/sf/jode/expr/CheckCastOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class CheckCastOperator extends Operator { Type castType; diff --git a/jode/jode/expr/CheckNullOperator.java b/jode/src/net/sf/jode/expr/CheckNullOperator.java similarity index 94% rename from jode/jode/expr/CheckNullOperator.java rename to jode/src/net/sf/jode/expr/CheckNullOperator.java index d42c38a..e812afc 100644 --- a/jode/jode/expr/CheckNullOperator.java +++ b/jode/src/net/sf/jode/expr/CheckNullOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/expr/ClassFieldOperator.java b/jode/src/net/sf/jode/expr/ClassFieldOperator.java similarity index 88% rename from jode/jode/expr/ClassFieldOperator.java rename to jode/src/net/sf/jode/expr/ClassFieldOperator.java index f3e3f3a..d7aab04 100644 --- a/jode/jode/expr/ClassFieldOperator.java +++ b/jode/src/net/sf/jode/expr/ClassFieldOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ClassFieldOperator extends NoArgOperator { Type classType; diff --git a/jode/jode/expr/CombineableOperator.java b/jode/src/net/sf/jode/expr/CombineableOperator.java similarity index 97% rename from jode/jode/expr/CombineableOperator.java rename to jode/src/net/sf/jode/expr/CombineableOperator.java index cae38b3..fa25241 100644 --- a/jode/jode/expr/CombineableOperator.java +++ b/jode/src/net/sf/jode/expr/CombineableOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.expr; +package net.sf.jode.expr; public interface CombineableOperator { /** diff --git a/jode/jode/expr/CompareBinaryOperator.java b/jode/src/net/sf/jode/expr/CompareBinaryOperator.java similarity index 96% rename from jode/jode/expr/CompareBinaryOperator.java rename to jode/src/net/sf/jode/expr/CompareBinaryOperator.java index 7e964f5..0857076 100644 --- a/jode/jode/expr/CompareBinaryOperator.java +++ b/jode/src/net/sf/jode/expr/CompareBinaryOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class CompareBinaryOperator extends Operator { boolean allowsNaN = false; diff --git a/jode/jode/expr/CompareToIntOperator.java b/jode/src/net/sf/jode/expr/CompareToIntOperator.java similarity index 94% rename from jode/jode/expr/CompareToIntOperator.java rename to jode/src/net/sf/jode/expr/CompareToIntOperator.java index 82f77f3..470c18d 100644 --- a/jode/jode/expr/CompareToIntOperator.java +++ b/jode/src/net/sf/jode/expr/CompareToIntOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class CompareToIntOperator extends Operator { boolean allowsNaN; diff --git a/jode/jode/expr/CompareUnaryOperator.java b/jode/src/net/sf/jode/expr/CompareUnaryOperator.java similarity index 96% rename from jode/jode/expr/CompareUnaryOperator.java rename to jode/src/net/sf/jode/expr/CompareUnaryOperator.java index 93e6f8a..33ce7b7 100644 --- a/jode/jode/expr/CompareUnaryOperator.java +++ b/jode/src/net/sf/jode/expr/CompareUnaryOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class CompareUnaryOperator extends Operator { boolean objectType; diff --git a/jode/jode/expr/ConstOperator.java b/jode/src/net/sf/jode/expr/ConstOperator.java similarity index 97% rename from jode/jode/expr/ConstOperator.java rename to jode/src/net/sf/jode/expr/ConstOperator.java index ea779b0..2d98f2c 100644 --- a/jode/jode/expr/ConstOperator.java +++ b/jode/src/net/sf/jode/expr/ConstOperator.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.type.IntegerType; -import jode.util.StringQuoter; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.type.IntegerType; +import net.sf.jode.util.StringQuoter; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ConstOperator extends NoArgOperator { Object value; diff --git a/jode/jode/expr/ConstantArrayOperator.java b/jode/src/net/sf/jode/expr/ConstantArrayOperator.java similarity index 96% rename from jode/jode/expr/ConstantArrayOperator.java rename to jode/src/net/sf/jode/expr/ConstantArrayOperator.java index eb9269e..7c535d0 100644 --- a/jode/jode/expr/ConstantArrayOperator.java +++ b/jode/src/net/sf/jode/expr/ConstantArrayOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.type.ArrayType; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.type.ArrayType; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ConstantArrayOperator extends Operator { boolean isInitializer; diff --git a/jode/jode/expr/ConvertOperator.java b/jode/src/net/sf/jode/expr/ConvertOperator.java similarity index 93% rename from jode/jode/expr/ConvertOperator.java rename to jode/src/net/sf/jode/expr/ConvertOperator.java index 5cc3566..e7de6f9 100644 --- a/jode/jode/expr/ConvertOperator.java +++ b/jode/src/net/sf/jode/expr/ConvertOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ConvertOperator extends Operator { Type from; diff --git a/jode/jode/expr/Expression.java b/jode/src/net/sf/jode/expr/Expression.java similarity index 98% rename from jode/jode/expr/Expression.java rename to jode/src/net/sf/jode/expr/Expression.java index 59bf41f..ecfe97e 100644 --- a/jode/jode/expr/Expression.java +++ b/jode/src/net/sf/jode/expr/Expression.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/expr/FieldOperator.java b/jode/src/net/sf/jode/expr/FieldOperator.java similarity index 93% rename from jode/jode/expr/FieldOperator.java rename to jode/src/net/sf/jode/expr/FieldOperator.java index a42a78b..9c433b9 100644 --- a/jode/jode/expr/FieldOperator.java +++ b/jode/src/net/sf/jode/expr/FieldOperator.java @@ -17,23 +17,23 @@ * $Id$ */ -package jode.expr; -import jode.GlobalOptions; -import jode.type.Type; -import jode.type.NullType; -import jode.type.ClassInfoType; -import jode.bytecode.FieldInfo; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.FieldAnalyzer; -import jode.decompiler.Options; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.Scope; +package net.sf.jode.expr; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.type.NullType; +import net.sf.jode.type.ClassInfoType; +import net.sf.jode.bytecode.FieldInfo; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.FieldAnalyzer; +import net.sf.jode.decompiler.Options; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.Scope; import java.io.IOException; import java.lang.reflect.Modifier; diff --git a/jode/jode/expr/GetFieldOperator.java b/jode/src/net/sf/jode/expr/GetFieldOperator.java similarity index 91% rename from jode/jode/expr/GetFieldOperator.java rename to jode/src/net/sf/jode/expr/GetFieldOperator.java index 04555b5..2ca1553 100644 --- a/jode/jode/expr/GetFieldOperator.java +++ b/jode/src/net/sf/jode/expr/GetFieldOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.bytecode.Reference; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.FieldAnalyzer; +package net.sf.jode.expr; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.FieldAnalyzer; public class GetFieldOperator extends FieldOperator { public GetFieldOperator(MethodAnalyzer methodAnalyzer, boolean staticFlag, diff --git a/jode/jode/expr/IIncOperator.java b/jode/src/net/sf/jode/expr/IIncOperator.java similarity index 94% rename from jode/jode/expr/IIncOperator.java rename to jode/src/net/sf/jode/expr/IIncOperator.java index f0e4b92..a3163f1 100644 --- a/jode/jode/expr/IIncOperator.java +++ b/jode/src/net/sf/jode/expr/IIncOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; public class IIncOperator extends Operator implements CombineableOperator { diff --git a/jode/jode/expr/IfThenElseOperator.java b/jode/src/net/sf/jode/expr/IfThenElseOperator.java similarity index 96% rename from jode/jode/expr/IfThenElseOperator.java rename to jode/src/net/sf/jode/expr/IfThenElseOperator.java index 8b82e5c..2cd743f 100644 --- a/jode/jode/expr/IfThenElseOperator.java +++ b/jode/src/net/sf/jode/expr/IfThenElseOperator.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.bytecode.ClassPath; -import jode.decompiler.FieldAnalyzer; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.decompiler.FieldAnalyzer; +import net.sf.jode.decompiler.TabbedPrintWriter; public class IfThenElseOperator extends Operator { public IfThenElseOperator(Type type) { diff --git a/jode/jode/expr/InstanceOfOperator.java b/jode/src/net/sf/jode/expr/InstanceOfOperator.java similarity index 94% rename from jode/jode/expr/InstanceOfOperator.java rename to jode/src/net/sf/jode/expr/InstanceOfOperator.java index 44b3366..74cf03f 100644 --- a/jode/jode/expr/InstanceOfOperator.java +++ b/jode/src/net/sf/jode/expr/InstanceOfOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class InstanceOfOperator extends Operator { diff --git a/jode/jode/expr/InvokeOperator.java b/jode/src/net/sf/jode/expr/InvokeOperator.java similarity index 98% rename from jode/jode/expr/InvokeOperator.java rename to jode/src/net/sf/jode/expr/InvokeOperator.java index aa4a040..d49f377 100644 --- a/jode/jode/expr/InvokeOperator.java +++ b/jode/src/net/sf/jode/expr/InvokeOperator.java @@ -17,21 +17,21 @@ * $Id$ */ -package jode.expr; +package net.sf.jode.expr; import java.lang.reflect.Modifier; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.Options; -import jode.decompiler.OuterValues; -import jode.decompiler.Scope; -import jode.GlobalOptions; -import jode.bytecode.*; -import jode.jvm.*; -import jode.type.*; -import jode.util.SimpleMap; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.Options; +import net.sf.jode.decompiler.OuterValues; +import net.sf.jode.decompiler.Scope; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.*; +import net.sf.jode.jvm.*; +import net.sf.jode.type.*; +import net.sf.jode.util.SimpleMap; import java.lang.reflect.InvocationTargetException; import java.io.IOException; diff --git a/jode/jode/expr/LValueExpression.java b/jode/src/net/sf/jode/expr/LValueExpression.java similarity index 85% rename from jode/jode/expr/LValueExpression.java rename to jode/src/net/sf/jode/expr/LValueExpression.java index 6b12dde..d02263a 100644 --- a/jode/jode/expr/LValueExpression.java +++ b/jode/src/net/sf/jode/expr/LValueExpression.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; public interface LValueExpression extends MatchableOperator { } diff --git a/jode/jode/expr/LocalLoadOperator.java b/jode/src/net/sf/jode/expr/LocalLoadOperator.java similarity index 85% rename from jode/jode/expr/LocalLoadOperator.java rename to jode/src/net/sf/jode/expr/LocalLoadOperator.java index 81a4e36..343c332 100644 --- a/jode/jode/expr/LocalLoadOperator.java +++ b/jode/src/net/sf/jode/expr/LocalLoadOperator.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.expr; -import jode.GlobalOptions; -import jode.type.Type; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; public class LocalLoadOperator extends LocalVarOperator { diff --git a/jode/jode/expr/LocalStoreOperator.java b/jode/src/net/sf/jode/expr/LocalStoreOperator.java similarity index 88% rename from jode/jode/expr/LocalStoreOperator.java rename to jode/src/net/sf/jode/expr/LocalStoreOperator.java index 2d31d9b..20222b7 100644 --- a/jode/jode/expr/LocalStoreOperator.java +++ b/jode/src/net/sf/jode/expr/LocalStoreOperator.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.expr; -import jode.GlobalOptions; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; public class LocalStoreOperator extends LocalVarOperator implements LValueExpression { diff --git a/jode/jode/expr/LocalVarOperator.java b/jode/src/net/sf/jode/expr/LocalVarOperator.java similarity index 92% rename from jode/jode/expr/LocalVarOperator.java rename to jode/src/net/sf/jode/expr/LocalVarOperator.java index 1f8b3e5..a728925 100644 --- a/jode/jode/expr/LocalVarOperator.java +++ b/jode/src/net/sf/jode/expr/LocalVarOperator.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.expr; -import jode.GlobalOptions; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/expr/MatchableOperator.java b/jode/src/net/sf/jode/expr/MatchableOperator.java similarity index 97% rename from jode/jode/expr/MatchableOperator.java rename to jode/src/net/sf/jode/expr/MatchableOperator.java index aa701b7..3d0fec8 100644 --- a/jode/jode/expr/MatchableOperator.java +++ b/jode/src/net/sf/jode/expr/MatchableOperator.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.expr; +package net.sf.jode.expr; public interface MatchableOperator { /** diff --git a/jode/jode/expr/MonitorEnterOperator.java b/jode/src/net/sf/jode/expr/MonitorEnterOperator.java similarity index 92% rename from jode/jode/expr/MonitorEnterOperator.java rename to jode/src/net/sf/jode/expr/MonitorEnterOperator.java index 3c4ab05..3dee7ee 100644 --- a/jode/jode/expr/MonitorEnterOperator.java +++ b/jode/src/net/sf/jode/expr/MonitorEnterOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class MonitorEnterOperator extends Operator { public MonitorEnterOperator() { diff --git a/jode/jode/expr/MonitorExitOperator.java b/jode/src/net/sf/jode/expr/MonitorExitOperator.java similarity index 92% rename from jode/jode/expr/MonitorExitOperator.java rename to jode/src/net/sf/jode/expr/MonitorExitOperator.java index 7ec64f4..0e1d222 100644 --- a/jode/jode/expr/MonitorExitOperator.java +++ b/jode/src/net/sf/jode/expr/MonitorExitOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class MonitorExitOperator extends Operator { public MonitorExitOperator() { diff --git a/jode/jode/expr/NewArrayOperator.java b/jode/src/net/sf/jode/expr/NewArrayOperator.java similarity index 92% rename from jode/jode/expr/NewArrayOperator.java rename to jode/src/net/sf/jode/expr/NewArrayOperator.java index 2ed5895..3cc27fb 100644 --- a/jode/jode/expr/NewArrayOperator.java +++ b/jode/src/net/sf/jode/expr/NewArrayOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.type.ArrayType; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.type.ArrayType; +import net.sf.jode.decompiler.TabbedPrintWriter; public class NewArrayOperator extends Operator { String baseTypeString; diff --git a/jode/jode/expr/NewOperator.java b/jode/src/net/sf/jode/expr/NewOperator.java similarity index 91% rename from jode/jode/expr/NewOperator.java rename to jode/src/net/sf/jode/expr/NewOperator.java index 2d0f298..fbdbfd6 100644 --- a/jode/jode/expr/NewOperator.java +++ b/jode/src/net/sf/jode/expr/NewOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class NewOperator extends NoArgOperator { public NewOperator(Type type) { diff --git a/jode/jode/expr/NoArgOperator.java b/jode/src/net/sf/jode/expr/NoArgOperator.java similarity index 91% rename from jode/jode/expr/NoArgOperator.java rename to jode/src/net/sf/jode/expr/NoArgOperator.java index 0d493fe..173e48f 100644 --- a/jode/jode/expr/NoArgOperator.java +++ b/jode/src/net/sf/jode/expr/NoArgOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public abstract class NoArgOperator extends Operator { diff --git a/jode/jode/expr/NopOperator.java b/jode/src/net/sf/jode/expr/NopOperator.java similarity index 94% rename from jode/jode/expr/NopOperator.java rename to jode/src/net/sf/jode/expr/NopOperator.java index 25a6e3f..73a6801 100644 --- a/jode/jode/expr/NopOperator.java +++ b/jode/src/net/sf/jode/expr/NopOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * A NopOperator takes one arguments and returns it again. It is used diff --git a/jode/jode/expr/Operator.java b/jode/src/net/sf/jode/expr/Operator.java similarity index 98% rename from jode/jode/expr/Operator.java rename to jode/src/net/sf/jode/expr/Operator.java index ac41b99..150217c 100644 --- a/jode/jode/expr/Operator.java +++ b/jode/src/net/sf/jode/expr/Operator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/expr/OuterLocalOperator.java b/jode/src/net/sf/jode/expr/OuterLocalOperator.java similarity index 87% rename from jode/jode/expr/OuterLocalOperator.java rename to jode/src/net/sf/jode/expr/OuterLocalOperator.java index 6562913..f83a53d 100644 --- a/jode/jode/expr/OuterLocalOperator.java +++ b/jode/src/net/sf/jode/expr/OuterLocalOperator.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.expr; -import jode.GlobalOptions; -import jode.type.Type; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; public class OuterLocalOperator extends Operator { LocalInfo local; diff --git a/jode/jode/expr/PopOperator.java b/jode/src/net/sf/jode/expr/PopOperator.java similarity index 93% rename from jode/jode/expr/PopOperator.java rename to jode/src/net/sf/jode/expr/PopOperator.java index 89b59c7..eaeccd6 100644 --- a/jode/jode/expr/PopOperator.java +++ b/jode/src/net/sf/jode/expr/PopOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class PopOperator extends Operator { diff --git a/jode/jode/expr/PrePostFixOperator.java b/jode/src/net/sf/jode/expr/PrePostFixOperator.java similarity index 94% rename from jode/jode/expr/PrePostFixOperator.java rename to jode/src/net/sf/jode/expr/PrePostFixOperator.java index 1b0857c..81fbaab 100644 --- a/jode/jode/expr/PrePostFixOperator.java +++ b/jode/src/net/sf/jode/expr/PrePostFixOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * A PrePostFixOperator has one subexpression, namely the StoreInstruction. diff --git a/jode/jode/expr/PutFieldOperator.java b/jode/src/net/sf/jode/expr/PutFieldOperator.java similarity index 89% rename from jode/jode/expr/PutFieldOperator.java rename to jode/src/net/sf/jode/expr/PutFieldOperator.java index 5b0e0d8..d859f55 100644 --- a/jode/jode/expr/PutFieldOperator.java +++ b/jode/src/net/sf/jode/expr/PutFieldOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.bytecode.Reference; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.FieldAnalyzer; +package net.sf.jode.expr; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.FieldAnalyzer; public class PutFieldOperator extends FieldOperator implements LValueExpression { diff --git a/jode/jode/expr/ShiftOperator.java b/jode/src/net/sf/jode/expr/ShiftOperator.java similarity index 95% rename from jode/jode/expr/ShiftOperator.java rename to jode/src/net/sf/jode/expr/ShiftOperator.java index b24d978..9cf089a 100644 --- a/jode/jode/expr/ShiftOperator.java +++ b/jode/src/net/sf/jode/expr/ShiftOperator.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; +package net.sf.jode.expr; +import net.sf.jode.type.Type; /** * ShiftOpcodes are special, because their second operand is an UIndex diff --git a/jode/jode/expr/SimpleOperator.java b/jode/src/net/sf/jode/expr/SimpleOperator.java similarity index 94% rename from jode/jode/expr/SimpleOperator.java rename to jode/src/net/sf/jode/expr/SimpleOperator.java index f7a494c..4873258 100644 --- a/jode/jode/expr/SimpleOperator.java +++ b/jode/src/net/sf/jode/expr/SimpleOperator.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; +package net.sf.jode.expr; +import net.sf.jode.type.Type; public abstract class SimpleOperator extends Operator { diff --git a/jode/jode/expr/StoreInstruction.java b/jode/src/net/sf/jode/expr/StoreInstruction.java similarity index 96% rename from jode/jode/expr/StoreInstruction.java rename to jode/src/net/sf/jode/expr/StoreInstruction.java index feccc88..cb11e3d 100644 --- a/jode/jode/expr/StoreInstruction.java +++ b/jode/src/net/sf/jode/expr/StoreInstruction.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; public class StoreInstruction extends Operator implements CombineableOperator { diff --git a/jode/jode/expr/StringAddOperator.java b/jode/src/net/sf/jode/expr/StringAddOperator.java similarity index 94% rename from jode/jode/expr/StringAddOperator.java rename to jode/src/net/sf/jode/expr/StringAddOperator.java index f4d695a..40bad39 100644 --- a/jode/jode/expr/StringAddOperator.java +++ b/jode/src/net/sf/jode/expr/StringAddOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class StringAddOperator extends Operator { protected Type operandType; diff --git a/jode/jode/expr/ThisOperator.java b/jode/src/net/sf/jode/expr/ThisOperator.java similarity index 90% rename from jode/jode/expr/ThisOperator.java rename to jode/src/net/sf/jode/expr/ThisOperator.java index d7a43b7..df4342a 100644 --- a/jode/jode/expr/ThisOperator.java +++ b/jode/src/net/sf/jode/expr/ThisOperator.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.bytecode.ClassInfo; -import jode.decompiler.Scope; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.decompiler.Scope; +import net.sf.jode.decompiler.TabbedPrintWriter; public class ThisOperator extends NoArgOperator { boolean isInnerMost; diff --git a/jode/jode/expr/UnaryOperator.java b/jode/src/net/sf/jode/expr/UnaryOperator.java similarity index 94% rename from jode/jode/expr/UnaryOperator.java rename to jode/src/net/sf/jode/expr/UnaryOperator.java index 2fce590..16793fc 100644 --- a/jode/jode/expr/UnaryOperator.java +++ b/jode/src/net/sf/jode/expr/UnaryOperator.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.expr; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.expr; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; public class UnaryOperator extends Operator { public UnaryOperator(Type type, int op) { diff --git a/jode/jode/flow/BreakBlock.java b/jode/src/net/sf/jode/flow/BreakBlock.java similarity index 97% rename from jode/jode/flow/BreakBlock.java rename to jode/src/net/sf/jode/flow/BreakBlock.java index 6e379dc..c5e8f83 100644 --- a/jode/jode/flow/BreakBlock.java +++ b/jode/src/net/sf/jode/flow/BreakBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * diff --git a/jode/jode/flow/BreakableBlock.java b/jode/src/net/sf/jode/flow/BreakableBlock.java similarity index 94% rename from jode/jode/flow/BreakableBlock.java rename to jode/src/net/sf/jode/flow/BreakableBlock.java index c9f377c..922c76c 100644 --- a/jode/jode/flow/BreakableBlock.java +++ b/jode/src/net/sf/jode/flow/BreakableBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * This is a structured block, that supports break. diff --git a/jode/jode/flow/CaseBlock.java b/jode/src/net/sf/jode/flow/CaseBlock.java similarity index 96% rename from jode/jode/flow/CaseBlock.java rename to jode/src/net/sf/jode/flow/CaseBlock.java index c9d43f2..4f17fc3 100644 --- a/jode/jode/flow/CaseBlock.java +++ b/jode/src/net/sf/jode/flow/CaseBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.expr.ConstOperator; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.expr.ConstOperator; +import net.sf.jode.type.Type; /** * This block represents a case instruction. A case instruction is a @@ -136,7 +136,7 @@ public class CaseBlock extends StructuredBlock { return new StructuredBlock[] { subBlock }; } - public void dumpInstruction(jode.decompiler.TabbedPrintWriter writer) + public void dumpInstruction(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { if (isDefault) { diff --git a/jode/jode/flow/CatchBlock.java b/jode/src/net/sf/jode/flow/CatchBlock.java similarity index 94% rename from jode/jode/flow/CatchBlock.java rename to jode/src/net/sf/jode/flow/CatchBlock.java index 0a960e2..5198bd2 100644 --- a/jode/jode/flow/CatchBlock.java +++ b/jode/src/net/sf/jode/flow/CatchBlock.java @@ -17,15 +17,15 @@ * $Id$ */ -package jode.flow; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.decompiler.Declarable; -import jode.expr.Expression; -import jode.expr.LocalLoadOperator; -import jode.expr.LocalStoreOperator; -import jode.expr.StoreInstruction; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.Declarable; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.LocalLoadOperator; +import net.sf.jode.expr.LocalStoreOperator; +import net.sf.jode.expr.StoreInstruction; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Collections; @@ -178,7 +178,7 @@ public class CatchBlock extends StructuredBlock { } } - public void dumpInstruction(jode.decompiler.TabbedPrintWriter writer) + public void dumpInstruction(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { writer.closeBraceContinue(); writer.print("catch ("); diff --git a/jode/jode/flow/CombineIfGotoExpressions.java b/jode/src/net/sf/jode/flow/CombineIfGotoExpressions.java similarity index 97% rename from jode/jode/flow/CombineIfGotoExpressions.java rename to jode/src/net/sf/jode/flow/CombineIfGotoExpressions.java index e3090ca..5a8ed64 100644 --- a/jode/jode/flow/CombineIfGotoExpressions.java +++ b/jode/src/net/sf/jode/flow/CombineIfGotoExpressions.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.flow; +package net.sf.jode.flow; import java.util.Vector; -import jode.expr.*; -import jode.type.Type; +import net.sf.jode.expr.*; +import net.sf.jode.type.Type; public class CombineIfGotoExpressions { diff --git a/jode/jode/flow/CompleteSynchronized.java b/jode/src/net/sf/jode/flow/CompleteSynchronized.java similarity index 97% rename from jode/jode/flow/CompleteSynchronized.java rename to jode/src/net/sf/jode/flow/CompleteSynchronized.java index 9bf42ee..22d26f0 100644 --- a/jode/jode/flow/CompleteSynchronized.java +++ b/jode/src/net/sf/jode/flow/CompleteSynchronized.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.expr.*; public class CompleteSynchronized { diff --git a/jode/jode/flow/ConditionalBlock.java b/jode/src/net/sf/jode/flow/ConditionalBlock.java similarity index 96% rename from jode/jode/flow/ConditionalBlock.java rename to jode/src/net/sf/jode/flow/ConditionalBlock.java index de1c0ac..a45dd7c 100644 --- a/jode/jode/flow/ConditionalBlock.java +++ b/jode/src/net/sf/jode/flow/ConditionalBlock.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; -import jode.expr.LocalVarOperator; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.LocalVarOperator; /** * An ConditionalBlock is the structured block representing an if diff --git a/jode/jode/flow/ContinueBlock.java b/jode/src/net/sf/jode/flow/ContinueBlock.java similarity index 97% rename from jode/jode/flow/ContinueBlock.java rename to jode/src/net/sf/jode/flow/ContinueBlock.java index dc61013..428a879 100644 --- a/jode/jode/flow/ContinueBlock.java +++ b/jode/src/net/sf/jode/flow/ContinueBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * diff --git a/jode/jode/flow/CreateAssignExpression.java b/jode/src/net/sf/jode/flow/CreateAssignExpression.java similarity index 98% rename from jode/jode/flow/CreateAssignExpression.java rename to jode/src/net/sf/jode/flow/CreateAssignExpression.java index a38975f..83c7048 100644 --- a/jode/jode/flow/CreateAssignExpression.java +++ b/jode/src/net/sf/jode/flow/CreateAssignExpression.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.expr.*; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.expr.*; +import net.sf.jode.type.Type; public class CreateAssignExpression { diff --git a/jode/jode/flow/CreateCheckNull.java b/jode/src/net/sf/jode/flow/CreateCheckNull.java similarity index 96% rename from jode/jode/flow/CreateCheckNull.java rename to jode/src/net/sf/jode/flow/CreateCheckNull.java index e93aaf1..e83148d 100644 --- a/jode/jode/flow/CreateCheckNull.java +++ b/jode/src/net/sf/jode/flow/CreateCheckNull.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.flow; -import jode.expr.*; -import jode.type.Type; -import jode.decompiler.LocalInfo; +package net.sf.jode.flow; +import net.sf.jode.expr.*; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; public class CreateCheckNull { diff --git a/jode/jode/flow/CreateClassField.java b/jode/src/net/sf/jode/flow/CreateClassField.java similarity index 94% rename from jode/jode/flow/CreateClassField.java rename to jode/src/net/sf/jode/flow/CreateClassField.java index e707e12..f6babe7 100644 --- a/jode/jode/flow/CreateClassField.java +++ b/jode/src/net/sf/jode/flow/CreateClassField.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.flow; -import jode.expr.*; -import jode.bytecode.ClassPath; -import jode.type.Type; -import jode.decompiler.LocalInfo; +package net.sf.jode.flow; +import net.sf.jode.expr.*; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; public class CreateClassField { diff --git a/jode/jode/flow/CreateConstantArray.java b/jode/src/net/sf/jode/flow/CreateConstantArray.java similarity index 97% rename from jode/jode/flow/CreateConstantArray.java rename to jode/src/net/sf/jode/flow/CreateConstantArray.java index 2cb0bb3..52b80a4 100644 --- a/jode/jode/flow/CreateConstantArray.java +++ b/jode/src/net/sf/jode/flow/CreateConstantArray.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.expr.*; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.expr.*; +import net.sf.jode.type.Type; public class CreateConstantArray { diff --git a/jode/jode/flow/CreateExpression.java b/jode/src/net/sf/jode/flow/CreateExpression.java similarity index 97% rename from jode/jode/flow/CreateExpression.java rename to jode/src/net/sf/jode/flow/CreateExpression.java index f59bf70..00ae12a 100644 --- a/jode/jode/flow/CreateExpression.java +++ b/jode/src/net/sf/jode/flow/CreateExpression.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.expr.*; /** * This transformation creates expressions. It transforms diff --git a/jode/jode/flow/CreateForInitializer.java b/jode/src/net/sf/jode/flow/CreateForInitializer.java similarity index 95% rename from jode/jode/flow/CreateForInitializer.java rename to jode/src/net/sf/jode/flow/CreateForInitializer.java index cd60b05..34d0fe5 100644 --- a/jode/jode/flow/CreateForInitializer.java +++ b/jode/src/net/sf/jode/flow/CreateForInitializer.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.expr.*; public class CreateForInitializer { diff --git a/jode/jode/flow/CreateIfThenElseOperator.java b/jode/src/net/sf/jode/flow/CreateIfThenElseOperator.java similarity index 98% rename from jode/jode/flow/CreateIfThenElseOperator.java rename to jode/src/net/sf/jode/flow/CreateIfThenElseOperator.java index fe8bf1a..214a7e9 100644 --- a/jode/jode/flow/CreateIfThenElseOperator.java +++ b/jode/src/net/sf/jode/flow/CreateIfThenElseOperator.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.type.Type; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.expr.*; import java.util.Enumeration; import java.util.Vector; diff --git a/jode/jode/flow/CreateNewConstructor.java b/jode/src/net/sf/jode/flow/CreateNewConstructor.java similarity index 97% rename from jode/jode/flow/CreateNewConstructor.java rename to jode/src/net/sf/jode/flow/CreateNewConstructor.java index 4387887..df39e2e 100644 --- a/jode/jode/flow/CreateNewConstructor.java +++ b/jode/src/net/sf/jode/flow/CreateNewConstructor.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.flow; -import jode.expr.*; -import jode.bytecode.Reference; -import jode.decompiler.MethodAnalyzer; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.expr.*; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.type.Type; public class CreateNewConstructor { diff --git a/jode/jode/flow/CreatePrePostIncExpression.java b/jode/src/net/sf/jode/flow/CreatePrePostIncExpression.java similarity index 98% rename from jode/jode/flow/CreatePrePostIncExpression.java rename to jode/src/net/sf/jode/flow/CreatePrePostIncExpression.java index 664ef87..06fdc98 100644 --- a/jode/jode/flow/CreatePrePostIncExpression.java +++ b/jode/src/net/sf/jode/flow/CreatePrePostIncExpression.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.expr.*; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.expr.*; +import net.sf.jode.type.Type; public class CreatePrePostIncExpression { diff --git a/jode/jode/flow/DescriptionBlock.java b/jode/src/net/sf/jode/flow/DescriptionBlock.java similarity index 95% rename from jode/jode/flow/DescriptionBlock.java rename to jode/src/net/sf/jode/flow/DescriptionBlock.java index 9007a94..ed292f4 100644 --- a/jode/jode/flow/DescriptionBlock.java +++ b/jode/src/net/sf/jode/flow/DescriptionBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * This is a block which contains a comment/description of what went diff --git a/jode/jode/flow/EmptyBlock.java b/jode/src/net/sf/jode/flow/EmptyBlock.java similarity index 96% rename from jode/jode/flow/EmptyBlock.java rename to jode/src/net/sf/jode/flow/EmptyBlock.java index 1099934..052a6dc 100644 --- a/jode/jode/flow/EmptyBlock.java +++ b/jode/src/net/sf/jode/flow/EmptyBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; /** * This is the structured block for an empty block. diff --git a/jode/jode/flow/FinallyBlock.java b/jode/src/net/sf/jode/flow/FinallyBlock.java similarity index 96% rename from jode/jode/flow/FinallyBlock.java rename to jode/src/net/sf/jode/flow/FinallyBlock.java index 2938984..8f2726c 100644 --- a/jode/jode/flow/FinallyBlock.java +++ b/jode/src/net/sf/jode/flow/FinallyBlock.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.flow; +package net.sf.jode.flow; /** * @@ -96,7 +96,7 @@ public class FinallyBlock extends StructuredBlock { return null; } - public void dumpInstruction(jode.decompiler.TabbedPrintWriter writer) + public void dumpInstruction(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { writer.closeBraceContinue(); writer.print("finally"); diff --git a/jode/jode/flow/FlowBlock.java b/jode/src/net/sf/jode/flow/FlowBlock.java similarity index 99% rename from jode/jode/flow/FlowBlock.java rename to jode/src/net/sf/jode/flow/FlowBlock.java index 17b031a..f874678 100644 --- a/jode/jode/flow/FlowBlock.java +++ b/jode/src/net/sf/jode/flow/FlowBlock.java @@ -17,15 +17,15 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.LocalInfo; -import jode.expr.Expression; -import jode.expr.CombineableOperator; -import jode.util.SimpleMap; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.CombineableOperator; +import net.sf.jode.util.SimpleMap; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Map; diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/src/net/sf/jode/flow/IfThenElseBlock.java similarity index 96% rename from jode/jode/flow/IfThenElseBlock.java rename to jode/src/net/sf/jode/flow/IfThenElseBlock.java index eac9427..ec03cd1 100644 --- a/jode/jode/flow/IfThenElseBlock.java +++ b/jode/src/net/sf/jode/flow/IfThenElseBlock.java @@ -17,12 +17,12 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; -import jode.type.Type; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; +import net.sf.jode.type.Type; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; diff --git a/jode/jode/flow/InstructionBlock.java b/jode/src/net/sf/jode/flow/InstructionBlock.java similarity index 94% rename from jode/jode/flow/InstructionBlock.java rename to jode/src/net/sf/jode/flow/InstructionBlock.java index 76e01d2..12fd4b5 100644 --- a/jode/jode/flow/InstructionBlock.java +++ b/jode/src/net/sf/jode/flow/InstructionBlock.java @@ -17,14 +17,14 @@ * $Id$ */ -package jode.flow; -import jode.type.Type; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.LocalInfo; -import jode.expr.Expression; -import jode.expr.StoreInstruction; -import jode.expr.LocalStoreOperator; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.StoreInstruction; +import net.sf.jode.expr.LocalStoreOperator; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; diff --git a/jode/jode/flow/InstructionContainer.java b/jode/src/net/sf/jode/flow/InstructionContainer.java similarity index 94% rename from jode/jode/flow/InstructionContainer.java rename to jode/src/net/sf/jode/flow/InstructionContainer.java index 9525aef..632a657 100644 --- a/jode/jode/flow/InstructionContainer.java +++ b/jode/src/net/sf/jode/flow/InstructionContainer.java @@ -17,12 +17,12 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.expr.Expression; -import jode.expr.InvokeOperator; -import jode.expr.LocalVarOperator; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.InvokeOperator; +import net.sf.jode.expr.LocalVarOperator; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; diff --git a/jode/jode/flow/JsrBlock.java b/jode/src/net/sf/jode/flow/JsrBlock.java similarity index 95% rename from jode/jode/flow/JsrBlock.java rename to jode/src/net/sf/jode/flow/JsrBlock.java index 6f2848e..f3f6724 100644 --- a/jode/jode/flow/JsrBlock.java +++ b/jode/src/net/sf/jode/flow/JsrBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.type.Type; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.type.Type; /** * This block represents a jsr instruction. A jsr instruction is @@ -113,7 +113,7 @@ public class JsrBlock extends StructuredBlock { return new StructuredBlock[] { innerBlock }; } - public void dumpInstruction(jode.decompiler.TabbedPrintWriter writer) + public void dumpInstruction(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { writer.println("JSR"); diff --git a/jode/jode/flow/Jump.java b/jode/src/net/sf/jode/flow/Jump.java similarity index 93% rename from jode/jode/flow/Jump.java rename to jode/src/net/sf/jode/flow/Jump.java index 6f11419..3207451 100644 --- a/jode/jode/flow/Jump.java +++ b/jode/src/net/sf/jode/flow/Jump.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; /** * This class represents an unconditional jump. @@ -62,7 +62,7 @@ public class Jump { * dumpInstruction afterwards. * @param writer The tabbed print writer, where we print to. */ - public void dumpSource(jode.decompiler.TabbedPrintWriter writer) + public void dumpSource(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { if (destination == null) diff --git a/jode/jode/flow/LoopBlock.java b/jode/src/net/sf/jode/flow/LoopBlock.java similarity index 97% rename from jode/jode/flow/LoopBlock.java rename to jode/src/net/sf/jode/flow/LoopBlock.java index 66ed810..43bff53 100644 --- a/jode/jode/flow/LoopBlock.java +++ b/jode/src/net/sf/jode/flow/LoopBlock.java @@ -17,16 +17,16 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.expr.Expression; -import jode.expr.ConstOperator; -import jode.expr.StoreInstruction; -import jode.expr.LocalStoreOperator; -import jode.expr.CombineableOperator; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.ConstOperator; +import net.sf.jode.expr.StoreInstruction; +import net.sf.jode.expr.LocalStoreOperator; +import net.sf.jode.expr.CombineableOperator; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; diff --git a/jode/jode/flow/RetBlock.java b/jode/src/net/sf/jode/flow/RetBlock.java similarity index 93% rename from jode/jode/flow/RetBlock.java rename to jode/src/net/sf/jode/flow/RetBlock.java index f27bb7d..ea73d65 100644 --- a/jode/jode/flow/RetBlock.java +++ b/jode/src/net/sf/jode/flow/RetBlock.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; ///#def COLLECTIONS java.util import java.util.Collections; @@ -67,7 +67,7 @@ public class RetBlock extends StructuredBlock { return Collections.singleton(local); } - public void dumpInstruction(jode.decompiler.TabbedPrintWriter writer) + public void dumpInstruction(net.sf.jode.decompiler.TabbedPrintWriter writer) throws java.io.IOException { writer.println("RET "+local); diff --git a/jode/jode/flow/ReturnBlock.java b/jode/src/net/sf/jode/flow/ReturnBlock.java similarity index 95% rename from jode/jode/flow/ReturnBlock.java rename to jode/src/net/sf/jode/flow/ReturnBlock.java index 06152c9..a53e0af 100644 --- a/jode/jode/flow/ReturnBlock.java +++ b/jode/src/net/sf/jode/flow/ReturnBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; /** * This is the structured block for a Return block. diff --git a/jode/jode/flow/SequentialBlock.java b/jode/src/net/sf/jode/flow/SequentialBlock.java similarity index 95% rename from jode/jode/flow/SequentialBlock.java rename to jode/src/net/sf/jode/flow/SequentialBlock.java index 2722924..4e04632 100644 --- a/jode/jode/flow/SequentialBlock.java +++ b/jode/src/net/sf/jode/flow/SequentialBlock.java @@ -17,12 +17,12 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.LocalInfo; -import jode.expr.LocalStoreOperator; -import jode.expr.StoreInstruction; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.LocalStoreOperator; +import net.sf.jode.expr.StoreInstruction; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; @@ -68,12 +68,12 @@ public class SequentialBlock extends StructuredBlock { */ public VariableStack mapStackToLocal(VariableStack stack) { if (stack == null) - jode.GlobalOptions.err.println("map stack to local called with null: " + this+ " in "+this.flowBlock); + net.sf.jode.GlobalOptions.err.println("map stack to local called with null: " + this+ " in "+this.flowBlock); VariableStack middle = subBlocks[0].mapStackToLocal(stack); if (middle != null) // Otherwise the second block is at least "logical" dead code return subBlocks[1].mapStackToLocal(middle); - jode.GlobalOptions.err.println("Dead code after Block " + subBlocks[0]); + net.sf.jode.GlobalOptions.err.println("Dead code after Block " + subBlocks[0]); return null; } diff --git a/jode/jode/flow/SlotSet.java b/jode/src/net/sf/jode/flow/SlotSet.java similarity index 98% rename from jode/jode/flow/SlotSet.java rename to jode/src/net/sf/jode/flow/SlotSet.java index d617ad0..b529d38 100644 --- a/jode/jode/flow/SlotSet.java +++ b/jode/src/net/sf/jode/flow/SlotSet.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.util.ArrayEnum; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.util.ArrayEnum; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/flow/SpecialBlock.java b/jode/src/net/sf/jode/flow/SpecialBlock.java similarity index 98% rename from jode/jode/flow/SpecialBlock.java rename to jode/src/net/sf/jode/flow/SpecialBlock.java index 0d52e36..e9873d5 100644 --- a/jode/jode/flow/SpecialBlock.java +++ b/jode/src/net/sf/jode/flow/SpecialBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.*; /** * This is the structured block for atomic instructions. diff --git a/jode/jode/flow/StructuredBlock.java b/jode/src/net/sf/jode/flow/StructuredBlock.java similarity index 98% rename from jode/jode/flow/StructuredBlock.java rename to jode/src/net/sf/jode/flow/StructuredBlock.java index 47fde5d..820662f 100644 --- a/jode/jode/flow/StructuredBlock.java +++ b/jode/src/net/sf/jode/flow/StructuredBlock.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.decompiler.TabbedPrintWriter; -import jode.decompiler.LocalInfo; -import jode.decompiler.Declarable; -import jode.decompiler.ClassAnalyzer; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.Declarable; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Collections; @@ -633,8 +633,8 @@ public abstract class StructuredBlock { public String toString() { try { java.io.StringWriter strw = new java.io.StringWriter(); - jode.decompiler.TabbedPrintWriter writer = - new jode.decompiler.TabbedPrintWriter(strw); + net.sf.jode.decompiler.TabbedPrintWriter writer = + new net.sf.jode.decompiler.TabbedPrintWriter(strw); writer.println(super.toString()); writer.tab(); dumpSource(writer); diff --git a/jode/jode/flow/SwitchBlock.java b/jode/src/net/sf/jode/flow/SwitchBlock.java similarity index 98% rename from jode/jode/flow/SwitchBlock.java rename to jode/src/net/sf/jode/flow/SwitchBlock.java index d3f4c10..93490e5 100644 --- a/jode/jode/flow/SwitchBlock.java +++ b/jode/src/net/sf/jode/flow/SwitchBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; ///#def COLLECTIONS java.util import java.util.Arrays; diff --git a/jode/jode/flow/SynchronizedBlock.java b/jode/src/net/sf/jode/flow/SynchronizedBlock.java similarity index 94% rename from jode/jode/flow/SynchronizedBlock.java rename to jode/src/net/sf/jode/flow/SynchronizedBlock.java index f2dc11f..7141bec 100644 --- a/jode/jode/flow/SynchronizedBlock.java +++ b/jode/src/net/sf/jode/flow/SynchronizedBlock.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; -import jode.util.SimpleSet; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; +import net.sf.jode.util.SimpleSet; ///#def COLLECTIONS java.util import java.util.Set; diff --git a/jode/jode/flow/ThrowBlock.java b/jode/src/net/sf/jode/flow/ThrowBlock.java similarity index 91% rename from jode/jode/flow/ThrowBlock.java rename to jode/src/net/sf/jode/flow/ThrowBlock.java index bf6937d..380ab27 100644 --- a/jode/jode/flow/ThrowBlock.java +++ b/jode/src/net/sf/jode/flow/ThrowBlock.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.expr.Expression; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.expr.Expression; /** * This is the structured block for an Throw block. diff --git a/jode/jode/flow/TransformConstructors.java b/jode/src/net/sf/jode/flow/TransformConstructors.java similarity index 97% rename from jode/jode/flow/TransformConstructors.java rename to jode/src/net/sf/jode/flow/TransformConstructors.java index 8d1e652..9848384 100644 --- a/jode/jode/flow/TransformConstructors.java +++ b/jode/src/net/sf/jode/flow/TransformConstructors.java @@ -17,23 +17,23 @@ * $Id$ */ -package jode.flow; +package net.sf.jode.flow; import java.lang.reflect.Modifier; -import jode.GlobalOptions; -import jode.decompiler.Analyzer; -import jode.decompiler.ClassAnalyzer; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.FieldAnalyzer; -import jode.decompiler.MethodAnalyzer; -import jode.decompiler.Options; -import jode.decompiler.OuterValues; -import jode.decompiler.OuterValueListener; -import jode.expr.*; -import jode.type.MethodType; -import jode.type.Type; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; -import jode.bytecode.MethodInfo; +import net.sf.jode.GlobalOptions; +import net.sf.jode.decompiler.Analyzer; +import net.sf.jode.decompiler.ClassAnalyzer; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.FieldAnalyzer; +import net.sf.jode.decompiler.MethodAnalyzer; +import net.sf.jode.decompiler.Options; +import net.sf.jode.decompiler.OuterValues; +import net.sf.jode.decompiler.OuterValueListener; +import net.sf.jode.expr.*; +import net.sf.jode.type.MethodType; +import net.sf.jode.type.Type; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.MethodInfo; import java.io.IOException; import java.util.Vector; @@ -80,8 +80,8 @@ import java.util.Enumeration; * switch. * * @author Jochen Hoenicke - * @see jode.decompiler.FieldAnalyzer#setInitializer - * @see jode.decompiler.ClassAnalyzer#getOuterValues */ + * @see net.sf.jode.decompiler.FieldAnalyzer#setInitializer + * @see net.sf.jode.decompiler.ClassAnalyzer#getOuterValues */ public class TransformConstructors { /* What is sometimes confusing is the distinction between slot and * parameter. Most times parameter nr = slot nr, but double and diff --git a/jode/jode/flow/TransformExceptionHandlers.java b/jode/src/net/sf/jode/flow/TransformExceptionHandlers.java similarity index 99% rename from jode/jode/flow/TransformExceptionHandlers.java rename to jode/src/net/sf/jode/flow/TransformExceptionHandlers.java index f89ecb6..a8e7716 100644 --- a/jode/jode/flow/TransformExceptionHandlers.java +++ b/jode/src/net/sf/jode/flow/TransformExceptionHandlers.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.flow; -import jode.GlobalOptions; -import jode.type.Type; -import jode.decompiler.LocalInfo; -import jode.expr.*; +package net.sf.jode.flow; +import net.sf.jode.GlobalOptions; +import net.sf.jode.type.Type; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.*; ///#def COLLECTIONS java.util import java.util.TreeSet; diff --git a/jode/jode/flow/TryBlock.java b/jode/src/net/sf/jode/flow/TryBlock.java similarity index 97% rename from jode/jode/flow/TryBlock.java rename to jode/src/net/sf/jode/flow/TryBlock.java index b9bf712..7529279 100644 --- a/jode/jode/flow/TryBlock.java +++ b/jode/src/net/sf/jode/flow/TryBlock.java @@ -17,12 +17,12 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.TabbedPrintWriter; -import jode.type.*; -import jode.expr.Expression; -import jode.expr.InvokeOperator; -import jode.expr.LocalLoadOperator; +package net.sf.jode.flow; +import net.sf.jode.decompiler.TabbedPrintWriter; +import net.sf.jode.type.*; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.InvokeOperator; +import net.sf.jode.expr.LocalLoadOperator; /** * A TryBlock is created for each exception in the diff --git a/jode/jode/flow/VariableSet.java b/jode/src/net/sf/jode/flow/VariableSet.java similarity index 98% rename from jode/jode/flow/VariableSet.java rename to jode/src/net/sf/jode/flow/VariableSet.java index 14bb715..d3db990 100644 --- a/jode/jode/flow/VariableSet.java +++ b/jode/src/net/sf/jode/flow/VariableSet.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.util.ArrayEnum; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.util.ArrayEnum; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/flow/VariableStack.java b/jode/src/net/sf/jode/flow/VariableStack.java similarity index 96% rename from jode/jode/flow/VariableStack.java rename to jode/src/net/sf/jode/flow/VariableStack.java index 1b6c4b7..b37173f 100644 --- a/jode/jode/flow/VariableStack.java +++ b/jode/src/net/sf/jode/flow/VariableStack.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.flow; -import jode.decompiler.LocalInfo; -import jode.expr.Expression; -import jode.expr.LocalLoadOperator; -import jode.expr.Operator; +package net.sf.jode.flow; +import net.sf.jode.decompiler.LocalInfo; +import net.sf.jode.expr.Expression; +import net.sf.jode.expr.LocalLoadOperator; +import net.sf.jode.expr.Operator; /** * This class represents the state of the stack at various points in diff --git a/jode/jode/jvm/CodeVerifier.java b/jode/src/net/sf/jode/jvm/CodeVerifier.java similarity index 99% rename from jode/jode/jvm/CodeVerifier.java rename to jode/src/net/sf/jode/jvm/CodeVerifier.java index 0138240..9ea169d 100644 --- a/jode/jode/jvm/CodeVerifier.java +++ b/jode/src/net/sf/jode/jvm/CodeVerifier.java @@ -17,18 +17,18 @@ * $Id$ */ -package jode.jvm; -import jode.GlobalOptions; -import jode.bytecode.BasicBlocks; -import jode.bytecode.Block; -import jode.bytecode.ClassPath; -import jode.bytecode.ClassInfo; -import jode.bytecode.Handler; -import jode.bytecode.Instruction; -import jode.bytecode.MethodInfo; -import jode.bytecode.Opcodes; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; +package net.sf.jode.jvm; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.Block; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.Handler; +import net.sf.jode.bytecode.Instruction; +import net.sf.jode.bytecode.MethodInfo; +import net.sf.jode.bytecode.Opcodes; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; import java.io.IOException; import java.util.BitSet; diff --git a/jode/jode/jvm/Interpreter.java b/jode/src/net/sf/jode/jvm/Interpreter.java similarity index 98% rename from jode/jode/jvm/Interpreter.java rename to jode/src/net/sf/jode/jvm/Interpreter.java index a4934a6..dcbdf58 100644 --- a/jode/jode/jvm/Interpreter.java +++ b/jode/src/net/sf/jode/jvm/Interpreter.java @@ -17,15 +17,15 @@ * $Id$ */ -package jode.jvm; -import jode.GlobalOptions; -import jode.bytecode.BasicBlocks; -import jode.bytecode.Block; -import jode.bytecode.Handler; -import jode.bytecode.Instruction; -import jode.bytecode.Opcodes; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; +package net.sf.jode.jvm; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.Block; +import net.sf.jode.bytecode.Handler; +import net.sf.jode.bytecode.Instruction; +import net.sf.jode.bytecode.Opcodes; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; diff --git a/jode/jode/jvm/InterpreterException.java b/jode/src/net/sf/jode/jvm/InterpreterException.java similarity index 97% rename from jode/jode/jvm/InterpreterException.java rename to jode/src/net/sf/jode/jvm/InterpreterException.java index bdbf5e9..18ae67e 100644 --- a/jode/jode/jvm/InterpreterException.java +++ b/jode/src/net/sf/jode/jvm/InterpreterException.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.jvm; +package net.sf.jode.jvm; /** * This exception is thrown by the interpreter on various conditions. diff --git a/jode/jode/jvm/NewObject.java b/jode/src/net/sf/jode/jvm/NewObject.java similarity index 98% rename from jode/jode/jvm/NewObject.java rename to jode/src/net/sf/jode/jvm/NewObject.java index 3020f3d..dddedab 100644 --- a/jode/jode/jvm/NewObject.java +++ b/jode/src/net/sf/jode/jvm/NewObject.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.jvm; +package net.sf.jode.jvm; /** * This class represents a new object, that may not be initialized yet. diff --git a/jode/jode/jvm/RuntimeEnvironment.java b/jode/src/net/sf/jode/jvm/RuntimeEnvironment.java similarity index 98% rename from jode/jode/jvm/RuntimeEnvironment.java rename to jode/src/net/sf/jode/jvm/RuntimeEnvironment.java index 2f36c66..7c8414f 100644 --- a/jode/jode/jvm/RuntimeEnvironment.java +++ b/jode/src/net/sf/jode/jvm/RuntimeEnvironment.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.jvm; -import jode.bytecode.Reference; +package net.sf.jode.jvm; +import net.sf.jode.bytecode.Reference; import java.lang.reflect.InvocationTargetException; /** diff --git a/jode/jode/jvm/SimpleRuntimeEnvironment.java b/jode/src/net/sf/jode/jvm/SimpleRuntimeEnvironment.java similarity index 98% rename from jode/jode/jvm/SimpleRuntimeEnvironment.java rename to jode/src/net/sf/jode/jvm/SimpleRuntimeEnvironment.java index a379a47..8ca526f 100644 --- a/jode/jode/jvm/SimpleRuntimeEnvironment.java +++ b/jode/src/net/sf/jode/jvm/SimpleRuntimeEnvironment.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.jvm; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; +package net.sf.jode.jvm; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/jode/jode/jvm/SyntheticAnalyzer.java b/jode/src/net/sf/jode/jvm/SyntheticAnalyzer.java similarity index 95% rename from jode/jode/jvm/SyntheticAnalyzer.java rename to jode/src/net/sf/jode/jvm/SyntheticAnalyzer.java index f2aa125..b1f2349 100644 --- a/jode/jode/jvm/SyntheticAnalyzer.java +++ b/jode/src/net/sf/jode/jvm/SyntheticAnalyzer.java @@ -17,20 +17,20 @@ * $Id$ */ -package jode.jvm; -import jode.GlobalOptions; -import jode.bytecode.BasicBlocks; -import jode.bytecode.Block; -import jode.bytecode.ClassInfo; -import jode.bytecode.FieldInfo; -import jode.bytecode.Handler; -import jode.bytecode.Instruction; -import jode.bytecode.MethodInfo; -import jode.bytecode.Opcodes; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; -import jode.type.Type; -import jode.type.MethodType; +package net.sf.jode.jvm; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.Block; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.FieldInfo; +import net.sf.jode.bytecode.Handler; +import net.sf.jode.bytecode.Instruction; +import net.sf.jode.bytecode.MethodInfo; +import net.sf.jode.bytecode.Opcodes; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; +import net.sf.jode.type.Type; +import net.sf.jode.type.MethodType; import java.lang.reflect.Modifier; import java.io.IOException; diff --git a/jode/jode/jvm/Value.java b/jode/src/net/sf/jode/jvm/Value.java similarity index 97% rename from jode/jode/jvm/Value.java rename to jode/src/net/sf/jode/jvm/Value.java index 518e917..75f4d43 100644 --- a/jode/jode/jvm/Value.java +++ b/jode/src/net/sf/jode/jvm/Value.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.jvm; -import jode.bytecode.*; +package net.sf.jode.jvm; +import net.sf.jode.bytecode.*; /** * This class represents a stack value. diff --git a/jode/jode/jvm/VerifyException.java b/jode/src/net/sf/jode/jvm/VerifyException.java similarity index 94% rename from jode/jode/jvm/VerifyException.java rename to jode/src/net/sf/jode/jvm/VerifyException.java index e769ea7..7fd1cb2 100644 --- a/jode/jode/jvm/VerifyException.java +++ b/jode/src/net/sf/jode/jvm/VerifyException.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.jvm; -import jode.bytecode.*; +package net.sf.jode.jvm; +import net.sf.jode.bytecode.*; /** * This exception is thrown by the CodeVerifier on various conditions. diff --git a/jode/jode/obfuscator/ClassBundle.java b/jode/src/net/sf/jode/obfuscator/ClassBundle.java similarity index 97% rename from jode/jode/obfuscator/ClassBundle.java rename to jode/src/net/sf/jode/obfuscator/ClassBundle.java index 654baaf..761a0fa 100644 --- a/jode/jode/obfuscator/ClassBundle.java +++ b/jode/src/net/sf/jode/obfuscator/ClassBundle.java @@ -17,15 +17,15 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; -import jode.bytecode.ClassPath; -import jode.bytecode.ClassInfo; -import jode.bytecode.Reference; -import jode.obfuscator.modules.WildCard; -import jode.obfuscator.modules.MultiIdentifierMatcher; -import jode.obfuscator.modules.SimpleAnalyzer; -import jode.obfuscator.modules.IdentityRenamer; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.obfuscator.modules.WildCard; +import net.sf.jode.obfuscator.modules.MultiIdentifierMatcher; +import net.sf.jode.obfuscator.modules.SimpleAnalyzer; +import net.sf.jode.obfuscator.modules.IdentityRenamer; import java.io.*; import java.util.zip.ZipOutputStream; diff --git a/jode/jode/obfuscator/ClassIdentifier.java b/jode/src/net/sf/jode/obfuscator/ClassIdentifier.java similarity index 99% rename from jode/jode/obfuscator/ClassIdentifier.java rename to jode/src/net/sf/jode/obfuscator/ClassIdentifier.java index 6cca3e1..ad4c54a 100644 --- a/jode/jode/obfuscator/ClassIdentifier.java +++ b/jode/src/net/sf/jode/obfuscator/ClassIdentifier.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; -import jode.bytecode.*; -import jode.obfuscator.modules.ModifierMatcher; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.*; +import net.sf.jode.obfuscator.modules.ModifierMatcher; ///#def COLLECTIONS java.util import java.util.Comparator; import java.util.Collection; diff --git a/jode/jode/obfuscator/CodeAnalyzer.java b/jode/src/net/sf/jode/obfuscator/CodeAnalyzer.java similarity index 92% rename from jode/jode/obfuscator/CodeAnalyzer.java rename to jode/src/net/sf/jode/obfuscator/CodeAnalyzer.java index b0b2a8f..d3f9569 100644 --- a/jode/jode/obfuscator/CodeAnalyzer.java +++ b/jode/src/net/sf/jode/obfuscator/CodeAnalyzer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator; -import jode.bytecode.BasicBlocks; +package net.sf.jode.obfuscator; +import net.sf.jode.bytecode.BasicBlocks; public interface CodeAnalyzer extends CodeTransformer { public void analyzeCode(MethodIdentifier parent, BasicBlocks bb); diff --git a/jode/jode/obfuscator/CodeTransformer.java b/jode/src/net/sf/jode/obfuscator/CodeTransformer.java similarity index 92% rename from jode/jode/obfuscator/CodeTransformer.java rename to jode/src/net/sf/jode/obfuscator/CodeTransformer.java index d625c18..30c1233 100644 --- a/jode/jode/obfuscator/CodeTransformer.java +++ b/jode/src/net/sf/jode/obfuscator/CodeTransformer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator; -import jode.bytecode.BasicBlocks; +package net.sf.jode.obfuscator; +import net.sf.jode.bytecode.BasicBlocks; public interface CodeTransformer { public void transformCode(BasicBlocks bb); diff --git a/jode/jode/obfuscator/ConstantRuntimeEnvironment.java b/jode/src/net/sf/jode/obfuscator/ConstantRuntimeEnvironment.java similarity index 97% rename from jode/jode/obfuscator/ConstantRuntimeEnvironment.java rename to jode/src/net/sf/jode/obfuscator/ConstantRuntimeEnvironment.java index 6e8dedd..b95beb2 100644 --- a/jode/jode/obfuscator/ConstantRuntimeEnvironment.java +++ b/jode/src/net/sf/jode/obfuscator/ConstantRuntimeEnvironment.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.obfuscator; -import jode.jvm.Interpreter; -import jode.jvm.SimpleRuntimeEnvironment; -import jode.jvm.InterpreterException; -import jode.bytecode.Reference; -import jode.bytecode.BasicBlocks; -import jode.bytecode.TypeSignature; +package net.sf.jode.obfuscator; +import net.sf.jode.jvm.Interpreter; +import net.sf.jode.jvm.SimpleRuntimeEnvironment; +import net.sf.jode.jvm.InterpreterException; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.TypeSignature; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; diff --git a/jode/jode/obfuscator/FieldIdentifier.java b/jode/src/net/sf/jode/obfuscator/FieldIdentifier.java similarity index 98% rename from jode/jode/obfuscator/FieldIdentifier.java rename to jode/src/net/sf/jode/obfuscator/FieldIdentifier.java index 97bcbaf..a8d71e2 100644 --- a/jode/jode/obfuscator/FieldIdentifier.java +++ b/jode/src/net/sf/jode/obfuscator/FieldIdentifier.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; import java.lang.reflect.Modifier; -import jode.bytecode.*; +import net.sf.jode.bytecode.*; ///#def COLLECTIONS java.util import java.util.Collection; import java.util.Collections; diff --git a/jode/jode/obfuscator/Identifier.java b/jode/src/net/sf/jode/obfuscator/Identifier.java similarity index 99% rename from jode/jode/obfuscator/Identifier.java rename to jode/src/net/sf/jode/obfuscator/Identifier.java index a66996d..4de59c3 100644 --- a/jode/jode/obfuscator/Identifier.java +++ b/jode/src/net/sf/jode/obfuscator/Identifier.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; import java.io.*; ///#def COLLECTIONS java.util import java.util.Map; diff --git a/jode/jode/obfuscator/IdentifierMatcher.java b/jode/src/net/sf/jode/obfuscator/IdentifierMatcher.java similarity index 97% rename from jode/jode/obfuscator/IdentifierMatcher.java rename to jode/src/net/sf/jode/obfuscator/IdentifierMatcher.java index ff3bdb9..b84b478 100644 --- a/jode/jode/obfuscator/IdentifierMatcher.java +++ b/jode/src/net/sf/jode/obfuscator/IdentifierMatcher.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; public interface IdentifierMatcher { /** diff --git a/jode/jode/obfuscator/LocalIdentifier.java b/jode/src/net/sf/jode/obfuscator/LocalIdentifier.java similarity index 97% rename from jode/jode/obfuscator/LocalIdentifier.java rename to jode/src/net/sf/jode/obfuscator/LocalIdentifier.java index 38356a4..7e2939b 100644 --- a/jode/jode/obfuscator/LocalIdentifier.java +++ b/jode/src/net/sf/jode/obfuscator/LocalIdentifier.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; ///#def COLLECTIONS java.util import java.util.Collections; diff --git a/jode/jode/obfuscator/Main.java b/jode/src/net/sf/jode/obfuscator/Main.java similarity index 95% rename from jode/jode/obfuscator/Main.java rename to jode/src/net/sf/jode/obfuscator/Main.java index 90f408d..a75eabf 100644 --- a/jode/jode/obfuscator/Main.java +++ b/jode/src/net/sf/jode/obfuscator/Main.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; import gnu.getopt.LongOpt; import gnu.getopt.Getopt; @@ -63,7 +63,7 @@ public class Main { public static void usage() { PrintWriter err = GlobalOptions.err; - err.println("usage: jode.obfuscator.Main flags* script"); + err.println("usage: net.sf.jode.obfuscator.Main flags* script"); err.println(" -h, --help "+ "show this information."); err.println(" -V, --version "+ @@ -95,7 +95,7 @@ public class Main { GlobalOptions.err.println(GlobalOptions.copyright); bundle = new ClassBundle(); boolean errorInParams = false; - Getopt g = new Getopt("jode.obfuscator.Main", params, "hVvc:d:D:", + Getopt g = new Getopt("net.sf.jode.obfuscator.Main", params, "hVvc:d:D:", longOptions, true); for (int opt = g.getopt(); opt != -1; opt = g.getopt()) { switch(opt) { @@ -123,7 +123,7 @@ public class Main { GlobalOptions.verboseLevel = Integer.parseInt(arg); } catch (NumberFormatException ex) { GlobalOptions.err.println - ("jode.obfuscator.Main: Argument `" + ("net.sf.jode.obfuscator.Main: Argument `" +arg+"' to --verbose must be numeric:"); errorInParams = true; } diff --git a/jode/jode/obfuscator/MethodIdentifier.java b/jode/src/net/sf/jode/obfuscator/MethodIdentifier.java similarity index 98% rename from jode/jode/obfuscator/MethodIdentifier.java rename to jode/src/net/sf/jode/obfuscator/MethodIdentifier.java index 0262a5c..78a8cee 100644 --- a/jode/jode/obfuscator/MethodIdentifier.java +++ b/jode/src/net/sf/jode/obfuscator/MethodIdentifier.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; -import jode.bytecode.*; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.*; ///#def COLLECTIONS java.util import java.util.Collections; diff --git a/jode/jode/obfuscator/OptionHandler.java b/jode/src/net/sf/jode/obfuscator/OptionHandler.java similarity index 96% rename from jode/jode/obfuscator/OptionHandler.java rename to jode/src/net/sf/jode/obfuscator/OptionHandler.java index 1a15a7f..4f6be2b 100644 --- a/jode/jode/obfuscator/OptionHandler.java +++ b/jode/src/net/sf/jode/obfuscator/OptionHandler.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/obfuscator/PackageIdentifier.java b/jode/src/net/sf/jode/obfuscator/PackageIdentifier.java similarity index 98% rename from jode/jode/obfuscator/PackageIdentifier.java rename to jode/src/net/sf/jode/obfuscator/PackageIdentifier.java index 98ad3b1..a947d4d 100644 --- a/jode/jode/obfuscator/PackageIdentifier.java +++ b/jode/src/net/sf/jode/obfuscator/PackageIdentifier.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.obfuscator; -import jode.GlobalOptions; -import jode.bytecode.ClassInfo; -import jode.bytecode.FieldInfo; -import jode.bytecode.MethodInfo; +package net.sf.jode.obfuscator; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.FieldInfo; +import net.sf.jode.bytecode.MethodInfo; import java.lang.reflect.Modifier; import java.io.*; import java.util.Vector; diff --git a/jode/jode/obfuscator/ParseException.java b/jode/src/net/sf/jode/obfuscator/ParseException.java similarity index 96% rename from jode/jode/obfuscator/ParseException.java rename to jode/src/net/sf/jode/obfuscator/ParseException.java index f04fecc..649a035 100644 --- a/jode/jode/obfuscator/ParseException.java +++ b/jode/src/net/sf/jode/obfuscator/ParseException.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; public class ParseException extends Exception { public ParseException(int linenr, String message) { diff --git a/jode/jode/obfuscator/Renamer.java b/jode/src/net/sf/jode/obfuscator/Renamer.java similarity index 97% rename from jode/jode/obfuscator/Renamer.java rename to jode/src/net/sf/jode/obfuscator/Renamer.java index 407e00a..ce74d61 100644 --- a/jode/jode/obfuscator/Renamer.java +++ b/jode/src/net/sf/jode/obfuscator/Renamer.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; ///#def COLLECTIONS java.util import java.util.Iterator; ///#enddef diff --git a/jode/jode/obfuscator/ScriptParser.java b/jode/src/net/sf/jode/obfuscator/ScriptParser.java similarity index 98% rename from jode/jode/obfuscator/ScriptParser.java rename to jode/src/net/sf/jode/obfuscator/ScriptParser.java index d60ba45..5ee7a7a 100644 --- a/jode/jode/obfuscator/ScriptParser.java +++ b/jode/src/net/sf/jode/obfuscator/ScriptParser.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; import java.io.BufferedReader; import java.io.IOException; @@ -206,7 +206,7 @@ public class ScriptParser { throw new ParseException(linenr, "Class name expected"); Object instance; try { - Class clazz = Class.forName("jode.obfuscator.modules." + Class clazz = Class.forName("net.sf.jode.obfuscator.modules." +scanner.getValue()); instance = clazz.newInstance(); } catch (ClassNotFoundException ex) { diff --git a/jode/jode/obfuscator/TranslationTable.java b/jode/src/net/sf/jode/obfuscator/TranslationTable.java similarity index 98% rename from jode/jode/obfuscator/TranslationTable.java rename to jode/src/net/sf/jode/obfuscator/TranslationTable.java index 660d7e3..5f255c1 100644 --- a/jode/jode/obfuscator/TranslationTable.java +++ b/jode/src/net/sf/jode/obfuscator/TranslationTable.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.obfuscator; +package net.sf.jode.obfuscator; ///#def COLLECTIONS java.util import java.util.Map; diff --git a/jode/jode/obfuscator/modules/ConstantAnalyzer.java b/jode/src/net/sf/jode/obfuscator/modules/ConstantAnalyzer.java similarity index 99% rename from jode/jode/obfuscator/modules/ConstantAnalyzer.java rename to jode/src/net/sf/jode/obfuscator/modules/ConstantAnalyzer.java index 517e7ea..5ec0d1b 100644 --- a/jode/jode/obfuscator/modules/ConstantAnalyzer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/ConstantAnalyzer.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.obfuscator.modules; +package net.sf.jode.obfuscator.modules; -import jode.GlobalOptions; -import jode.bytecode.*; -import jode.jvm.InterpreterException; -import jode.obfuscator.*; -import jode.util.StringQuoter; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.*; +import net.sf.jode.jvm.InterpreterException; +import net.sf.jode.obfuscator.*; +import net.sf.jode.util.StringQuoter; import java.lang.reflect.Array; import java.lang.reflect.Modifier; @@ -1541,13 +1541,13 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer { (ref, opcode != opc_invokespecial, cls, args); } catch (InterpreterException ex) { constant = false; - if (jode.GlobalOptions.verboseLevel > 3) + if (net.sf.jode.GlobalOptions.verboseLevel > 3) GlobalOptions.err.println("Can't interpret "+ref+": " + ex.getMessage()); /* result is not constant */ } catch (InvocationTargetException ex) { constant = false; - if (jode.GlobalOptions.verboseLevel > 3) + if (net.sf.jode.GlobalOptions.verboseLevel > 3) GlobalOptions.err.println("Method "+ref +" throwed exception: " + ex.getTargetException()); diff --git a/jode/jode/obfuscator/modules/IdentityRenamer.java b/jode/src/net/sf/jode/obfuscator/modules/IdentityRenamer.java similarity index 91% rename from jode/jode/obfuscator/modules/IdentityRenamer.java rename to jode/src/net/sf/jode/obfuscator/modules/IdentityRenamer.java index dd1b4ac..d0de03c 100644 --- a/jode/jode/obfuscator/modules/IdentityRenamer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/IdentityRenamer.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.Renamer; -import jode.obfuscator.Identifier; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.Renamer; +import net.sf.jode.obfuscator.Identifier; ///#def COLLECTIONS java.util import java.util.Iterator; ///#enddef diff --git a/jode/jode/obfuscator/modules/KeywordRenamer.java b/jode/src/net/sf/jode/obfuscator/modules/KeywordRenamer.java similarity index 97% rename from jode/jode/obfuscator/modules/KeywordRenamer.java rename to jode/src/net/sf/jode/obfuscator/modules/KeywordRenamer.java index 4fe00f5..b37416a 100644 --- a/jode/jode/obfuscator/modules/KeywordRenamer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/KeywordRenamer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Collection; import java.util.Iterator; diff --git a/jode/jode/obfuscator/modules/LocalOptimizer.java b/jode/src/net/sf/jode/obfuscator/modules/LocalOptimizer.java similarity index 99% rename from jode/jode/obfuscator/modules/LocalOptimizer.java rename to jode/src/net/sf/jode/obfuscator/modules/LocalOptimizer.java index 972245a..3b20719 100644 --- a/jode/jode/obfuscator/modules/LocalOptimizer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/LocalOptimizer.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.obfuscator.modules; +package net.sf.jode.obfuscator.modules; import java.util.*; -import jode.bytecode.*; -import jode.obfuscator.*; -import jode.GlobalOptions; +import net.sf.jode.bytecode.*; +import net.sf.jode.obfuscator.*; +import net.sf.jode.GlobalOptions; ///#def COLLECTIONS java.util import java.util.ArrayList; diff --git a/jode/jode/obfuscator/modules/LocalizeFieldTransformer.java b/jode/src/net/sf/jode/obfuscator/modules/LocalizeFieldTransformer.java similarity index 93% rename from jode/jode/obfuscator/modules/LocalizeFieldTransformer.java rename to jode/src/net/sf/jode/obfuscator/modules/LocalizeFieldTransformer.java index 6fac6a2..a3223e6 100644 --- a/jode/jode/obfuscator/modules/LocalizeFieldTransformer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/LocalizeFieldTransformer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; /** * This class replaces accesses to local fields and . diff --git a/jode/jode/obfuscator/modules/ModifierMatcher.java b/jode/src/net/sf/jode/obfuscator/modules/ModifierMatcher.java similarity index 96% rename from jode/jode/obfuscator/modules/ModifierMatcher.java rename to jode/src/net/sf/jode/obfuscator/modules/ModifierMatcher.java index e536d4c..81cc9a0 100644 --- a/jode/jode/obfuscator/modules/ModifierMatcher.java +++ b/jode/src/net/sf/jode/obfuscator/modules/ModifierMatcher.java @@ -17,13 +17,13 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.IdentifierMatcher; -import jode.obfuscator.Identifier; -import jode.obfuscator.ClassIdentifier; -import jode.obfuscator.FieldIdentifier; -import jode.obfuscator.MethodIdentifier; -import jode.obfuscator.OptionHandler; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.IdentifierMatcher; +import net.sf.jode.obfuscator.Identifier; +import net.sf.jode.obfuscator.ClassIdentifier; +import net.sf.jode.obfuscator.FieldIdentifier; +import net.sf.jode.obfuscator.MethodIdentifier; +import net.sf.jode.obfuscator.OptionHandler; import java.lang.reflect.Modifier; ///#def COLLECTIONS java.util diff --git a/jode/jode/obfuscator/modules/MultiIdentifierMatcher.java b/jode/src/net/sf/jode/obfuscator/modules/MultiIdentifierMatcher.java similarity index 97% rename from jode/jode/obfuscator/modules/MultiIdentifierMatcher.java rename to jode/src/net/sf/jode/obfuscator/modules/MultiIdentifierMatcher.java index 77b5752..2f3fe86 100644 --- a/jode/jode/obfuscator/modules/MultiIdentifierMatcher.java +++ b/jode/src/net/sf/jode/obfuscator/modules/MultiIdentifierMatcher.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Collection; ///#enddef diff --git a/jode/jode/obfuscator/modules/NameSwapper.java b/jode/src/net/sf/jode/obfuscator/modules/NameSwapper.java similarity index 97% rename from jode/jode/obfuscator/modules/NameSwapper.java rename to jode/src/net/sf/jode/obfuscator/modules/NameSwapper.java index 172a645..9663ff3 100644 --- a/jode/jode/obfuscator/modules/NameSwapper.java +++ b/jode/src/net/sf/jode/obfuscator/modules/NameSwapper.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Collection; diff --git a/jode/jode/obfuscator/modules/RemovePopAnalyzer.java b/jode/src/net/sf/jode/obfuscator/modules/RemovePopAnalyzer.java similarity index 99% rename from jode/jode/obfuscator/modules/RemovePopAnalyzer.java rename to jode/src/net/sf/jode/obfuscator/modules/RemovePopAnalyzer.java index 08a0724..82915e2 100644 --- a/jode/jode/obfuscator/modules/RemovePopAnalyzer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/RemovePopAnalyzer.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.bytecode.*; -import jode.obfuscator.*; -import jode.GlobalOptions; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.bytecode.*; +import net.sf.jode.obfuscator.*; +import net.sf.jode.GlobalOptions; import java.util.BitSet; ///#def COLLECTIONS java.util diff --git a/jode/jode/obfuscator/modules/SerializePreserver.java b/jode/src/net/sf/jode/obfuscator/modules/SerializePreserver.java similarity index 97% rename from jode/jode/obfuscator/modules/SerializePreserver.java rename to jode/src/net/sf/jode/obfuscator/modules/SerializePreserver.java index a8f1940..ed3fb93 100644 --- a/jode/jode/obfuscator/modules/SerializePreserver.java +++ b/jode/src/net/sf/jode/obfuscator/modules/SerializePreserver.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; import java.lang.reflect.Modifier; ///#def COLLECTIONS java.util diff --git a/jode/jode/obfuscator/modules/SimpleAnalyzer.java b/jode/src/net/sf/jode/obfuscator/modules/SimpleAnalyzer.java similarity index 92% rename from jode/jode/obfuscator/modules/SimpleAnalyzer.java rename to jode/src/net/sf/jode/obfuscator/modules/SimpleAnalyzer.java index 9d5c190..c3b6fbb 100644 --- a/jode/jode/obfuscator/modules/SimpleAnalyzer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/SimpleAnalyzer.java @@ -17,18 +17,18 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.bytecode.Opcodes; -import jode.bytecode.ClassInfo; -import jode.bytecode.BasicBlocks; -import jode.bytecode.Block; -import jode.bytecode.Handler; -import jode.bytecode.Instruction; -import jode.bytecode.Reference; -import jode.bytecode.TypeSignature; -import jode.obfuscator.Identifier; -import jode.obfuscator.*; -import jode.GlobalOptions; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.bytecode.Opcodes; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.BasicBlocks; +import net.sf.jode.bytecode.Block; +import net.sf.jode.bytecode.Handler; +import net.sf.jode.bytecode.Instruction; +import net.sf.jode.bytecode.Reference; +import net.sf.jode.bytecode.TypeSignature; +import net.sf.jode.obfuscator.Identifier; +import net.sf.jode.obfuscator.*; +import net.sf.jode.GlobalOptions; ///#def COLLECTIONS java.util import java.util.ArrayList; diff --git a/jode/jode/obfuscator/modules/StrongRenamer.java b/jode/src/net/sf/jode/obfuscator/modules/StrongRenamer.java similarity index 98% rename from jode/jode/obfuscator/modules/StrongRenamer.java rename to jode/src/net/sf/jode/obfuscator/modules/StrongRenamer.java index 3c15e60..00d115c 100644 --- a/jode/jode/obfuscator/modules/StrongRenamer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/StrongRenamer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Collection; import java.util.Iterator; diff --git a/jode/jode/obfuscator/modules/UniqueRenamer.java b/jode/src/net/sf/jode/obfuscator/modules/UniqueRenamer.java similarity index 94% rename from jode/jode/obfuscator/modules/UniqueRenamer.java rename to jode/src/net/sf/jode/obfuscator/modules/UniqueRenamer.java index d43effa..8b3f847 100644 --- a/jode/jode/obfuscator/modules/UniqueRenamer.java +++ b/jode/src/net/sf/jode/obfuscator/modules/UniqueRenamer.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Iterator; diff --git a/jode/jode/obfuscator/modules/WildCard.java b/jode/src/net/sf/jode/obfuscator/modules/WildCard.java similarity index 97% rename from jode/jode/obfuscator/modules/WildCard.java rename to jode/src/net/sf/jode/obfuscator/modules/WildCard.java index 18b3644..d86f003 100644 --- a/jode/jode/obfuscator/modules/WildCard.java +++ b/jode/src/net/sf/jode/obfuscator/modules/WildCard.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.obfuscator.modules; -import jode.obfuscator.*; +package net.sf.jode.obfuscator.modules; +import net.sf.jode.obfuscator.*; ///#def COLLECTIONS java.util import java.util.Collection; ///#enddef diff --git a/jode/jode/swingui/ClassPathDialog.java b/jode/src/net/sf/jode/swingui/ClassPathDialog.java similarity index 97% rename from jode/jode/swingui/ClassPathDialog.java rename to jode/src/net/sf/jode/swingui/ClassPathDialog.java index 24e6d24..519e66e 100644 --- a/jode/jode/swingui/ClassPathDialog.java +++ b/jode/src/net/sf/jode/swingui/ClassPathDialog.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.swingui; -import jode.GlobalOptions; -import jode.bytecode.ClassPath; -import jode.decompiler.Decompiler; -import jode.decompiler.ProgressListener; +package net.sf.jode.swingui; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.decompiler.Decompiler; +import net.sf.jode.decompiler.ProgressListener; ///#def JAVAX_SWING javax.swing import javax.swing.*; diff --git a/jode/jode/swingui/HierarchyTreeModel.java b/jode/src/net/sf/jode/swingui/HierarchyTreeModel.java similarity index 98% rename from jode/jode/swingui/HierarchyTreeModel.java rename to jode/src/net/sf/jode/swingui/HierarchyTreeModel.java index 0dac65c..add813d 100644 --- a/jode/jode/swingui/HierarchyTreeModel.java +++ b/jode/src/net/sf/jode/swingui/HierarchyTreeModel.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.swingui; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; +package net.sf.jode.swingui; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; ///#def JAVAX_SWING javax.swing import javax.swing.JProgressBar; diff --git a/jode/jode/swingui/Main.java b/jode/src/net/sf/jode/swingui/Main.java similarity index 97% rename from jode/jode/swingui/Main.java rename to jode/src/net/sf/jode/swingui/Main.java index 08742b6..cc085e3 100644 --- a/jode/jode/swingui/Main.java +++ b/jode/src/net/sf/jode/swingui/Main.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.swingui; -import jode.GlobalOptions; -import jode.bytecode.ClassPath; -import jode.decompiler.Decompiler; -import jode.decompiler.ProgressListener; +package net.sf.jode.swingui; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.decompiler.Decompiler; +import net.sf.jode.decompiler.ProgressListener; ///#def JAVAX_SWING javax.swing import javax.swing.*; @@ -358,7 +358,7 @@ public class Main } public static void main(String[] params) { - bundle = ResourceBundle.getBundle("jode.swingui.Resources"); + bundle = ResourceBundle.getBundle("net.sf.jode.swingui.Resources"); String cp = System.getProperty("java.class.path", ""); cp = cp.replace(File.pathSeparatorChar, Decompiler.altPathSeparatorChar); diff --git a/jode/jode/swingui/PackagesTreeModel.java b/jode/src/net/sf/jode/swingui/PackagesTreeModel.java similarity index 97% rename from jode/jode/swingui/PackagesTreeModel.java rename to jode/src/net/sf/jode/swingui/PackagesTreeModel.java index 81db5b8..8c3dc70 100644 --- a/jode/jode/swingui/PackagesTreeModel.java +++ b/jode/src/net/sf/jode/swingui/PackagesTreeModel.java @@ -17,10 +17,10 @@ * $Id$ */ -package jode.swingui; -import jode.decompiler.Options; -import jode.bytecode.ClassInfo; -import jode.bytecode.ClassPath; +package net.sf.jode.swingui; +import net.sf.jode.decompiler.Options; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.bytecode.ClassPath; ///#def JAVAX_SWING javax.swing import javax.swing.tree.TreeModel; diff --git a/jode/jode/type/ArrayType.java b/jode/src/net/sf/jode/type/ArrayType.java similarity index 98% rename from jode/jode/type/ArrayType.java rename to jode/src/net/sf/jode/type/ArrayType.java index dd5b6df..203ef8b 100644 --- a/jode/jode/type/ArrayType.java +++ b/jode/src/net/sf/jode/type/ArrayType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.bytecode.ClassInfo; +package net.sf.jode.type; +import net.sf.jode.bytecode.ClassInfo; import java.util.Vector; import java.io.IOException; diff --git a/jode/jode/type/ClassInfoType.java b/jode/src/net/sf/jode/type/ClassInfoType.java similarity index 96% rename from jode/jode/type/ClassInfoType.java rename to jode/src/net/sf/jode/type/ClassInfoType.java index 672ed53..939a994 100644 --- a/jode/jode/type/ClassInfoType.java +++ b/jode/src/net/sf/jode/type/ClassInfoType.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.type; -import jode.bytecode.ClassInfo; -import jode.GlobalOptions; +package net.sf.jode.type; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.GlobalOptions; import java.lang.reflect.Modifier; import java.io.IOException; diff --git a/jode/jode/type/ClassType.java b/jode/src/net/sf/jode/type/ClassType.java similarity index 99% rename from jode/jode/type/ClassType.java rename to jode/src/net/sf/jode/type/ClassType.java index 27565ba..39eceac 100644 --- a/jode/jode/type/ClassType.java +++ b/jode/src/net/sf/jode/type/ClassType.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.type; +package net.sf.jode.type; import java.util.Stack; import java.util.Hashtable; import java.util.Enumeration; diff --git a/jode/jode/type/IntegerType.java b/jode/src/net/sf/jode/type/IntegerType.java similarity index 99% rename from jode/jode/type/IntegerType.java rename to jode/src/net/sf/jode/type/IntegerType.java index 3240837..289b904 100644 --- a/jode/jode/type/IntegerType.java +++ b/jode/src/net/sf/jode/type/IntegerType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.GlobalOptions; +package net.sf.jode.type; +import net.sf.jode.GlobalOptions; /** * This is a type class for 16 bit integral types. There are seven diff --git a/jode/jode/type/MethodType.java b/jode/src/net/sf/jode/type/MethodType.java similarity index 97% rename from jode/jode/type/MethodType.java rename to jode/src/net/sf/jode/type/MethodType.java index 4fa8e55..ae83f85 100644 --- a/jode/jode/type/MethodType.java +++ b/jode/src/net/sf/jode/type/MethodType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.bytecode.ClassPath; +package net.sf.jode.type; +import net.sf.jode.bytecode.ClassPath; /** * This type represents an method type. diff --git a/jode/jode/type/MultiClassType.java b/jode/src/net/sf/jode/type/MultiClassType.java similarity index 99% rename from jode/jode/type/MultiClassType.java rename to jode/src/net/sf/jode/type/MultiClassType.java index 3ae54e7..bd02643 100644 --- a/jode/jode/type/MultiClassType.java +++ b/jode/src/net/sf/jode/type/MultiClassType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.bytecode.ClassInfo; +package net.sf.jode.type; +import net.sf.jode.bytecode.ClassInfo; import java.util.Stack; import java.util.Vector; import java.io.IOException; diff --git a/jode/jode/type/NullType.java b/jode/src/net/sf/jode/type/NullType.java similarity index 99% rename from jode/jode/type/NullType.java rename to jode/src/net/sf/jode/type/NullType.java index c2d309d..937e86e 100644 --- a/jode/jode/type/NullType.java +++ b/jode/src/net/sf/jode/type/NullType.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.type; +package net.sf.jode.type; import java.util.Stack; ///#def COLLECTIONEXTRA java.lang import java.lang.UnsupportedOperationException; diff --git a/jode/jode/type/RangeType.java b/jode/src/net/sf/jode/type/RangeType.java similarity index 99% rename from jode/jode/type/RangeType.java rename to jode/src/net/sf/jode/type/RangeType.java index 57c7c42..1d9481b 100644 --- a/jode/jode/type/RangeType.java +++ b/jode/src/net/sf/jode/type/RangeType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.GlobalOptions; +package net.sf.jode.type; +import net.sf.jode.GlobalOptions; import java.util.Hashtable; /** diff --git a/jode/jode/type/ReferenceType.java b/jode/src/net/sf/jode/type/ReferenceType.java similarity index 98% rename from jode/jode/type/ReferenceType.java rename to jode/src/net/sf/jode/type/ReferenceType.java index cbcc796..a72b3a2 100644 --- a/jode/jode/type/ReferenceType.java +++ b/jode/src/net/sf/jode/type/ReferenceType.java @@ -17,9 +17,9 @@ * $Id$ */ -package jode.type; -import jode.GlobalOptions; -import jode.bytecode.ClassInfo; +package net.sf.jode.type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassInfo; import java.io.IOException; import java.util.Stack; import java.util.Vector; diff --git a/jode/jode/type/SystemClassType.java b/jode/src/net/sf/jode/type/SystemClassType.java similarity index 96% rename from jode/jode/type/SystemClassType.java rename to jode/src/net/sf/jode/type/SystemClassType.java index f0a8f74..4514e93 100644 --- a/jode/jode/type/SystemClassType.java +++ b/jode/src/net/sf/jode/type/SystemClassType.java @@ -17,8 +17,8 @@ * $Id$ */ -package jode.type; -import jode.bytecode.ClassInfo; +package net.sf.jode.type; +import net.sf.jode.bytecode.ClassInfo; import java.util.Vector; import java.util.Stack; import java.util.Hashtable; diff --git a/jode/jode/type/Type.java b/jode/src/net/sf/jode/type/Type.java similarity index 98% rename from jode/jode/type/Type.java rename to jode/src/net/sf/jode/type/Type.java index 9993028..884652a 100644 --- a/jode/jode/type/Type.java +++ b/jode/src/net/sf/jode/type/Type.java @@ -17,11 +17,11 @@ * $Id$ */ -package jode.type; -import jode.GlobalOptions; -import jode.bytecode.ClassPath; -import jode.bytecode.ClassInfo; -import jode.util.UnifyHash; +package net.sf.jode.type; +import net.sf.jode.GlobalOptions; +import net.sf.jode.bytecode.ClassPath; +import net.sf.jode.bytecode.ClassInfo; +import net.sf.jode.util.UnifyHash; ///#def COLLECTIONS java.util import java.util.Iterator; @@ -275,7 +275,7 @@ public class Type { /** * Generate the singleton set of the type represented by the given * class info. - * @param clazzinfo the jode.bytecode.ClassInfo. + * @param clazzinfo the net.sf.jode.bytecode.ClassInfo. * @return a singleton set containing the given type. */ public static final ClassType tClass(ClassInfo clazzinfo) { diff --git a/jode/jode/util/ArrayEnum.java b/jode/src/net/sf/jode/util/ArrayEnum.java similarity index 97% rename from jode/jode/util/ArrayEnum.java rename to jode/src/net/sf/jode/util/ArrayEnum.java index 8d7b629..56d9309 100644 --- a/jode/jode/util/ArrayEnum.java +++ b/jode/src/net/sf/jode/util/ArrayEnum.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.util; +package net.sf.jode.util; public class ArrayEnum implements java.util.Enumeration { int index = 0; diff --git a/jode/jode/util/SimpleMap.java b/jode/src/net/sf/jode/util/SimpleMap.java similarity index 98% rename from jode/jode/util/SimpleMap.java rename to jode/src/net/sf/jode/util/SimpleMap.java index f469095..4ca2eef 100644 --- a/jode/jode/util/SimpleMap.java +++ b/jode/src/net/sf/jode/util/SimpleMap.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.util; +package net.sf.jode.util; ///#def COLLECTIONS java.util import java.util.AbstractMap; import java.util.Map; diff --git a/jode/jode/util/SimpleSet.java b/jode/src/net/sf/jode/util/SimpleSet.java similarity index 98% rename from jode/jode/util/SimpleSet.java rename to jode/src/net/sf/jode/util/SimpleSet.java index ddd5fbd..619b77c 100644 --- a/jode/jode/util/SimpleSet.java +++ b/jode/src/net/sf/jode/util/SimpleSet.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.util; +package net.sf.jode.util; ///#def COLLECTIONS java.util import java.util.AbstractSet; import java.util.Iterator; diff --git a/jode/jode/util/StringQuoter.java b/jode/src/net/sf/jode/util/StringQuoter.java similarity index 98% rename from jode/jode/util/StringQuoter.java rename to jode/src/net/sf/jode/util/StringQuoter.java index 68b7197..63730fa 100644 --- a/jode/jode/util/StringQuoter.java +++ b/jode/src/net/sf/jode/util/StringQuoter.java @@ -1,4 +1,4 @@ -package jode.util; +package net.sf.jode.util; /** * This is a simple class to quote a string or a char. It puts it in * quotes (" resp. ') and prints special chars with the same syntax as diff --git a/jode/jode/util/UnifyHash.java b/jode/src/net/sf/jode/util/UnifyHash.java similarity index 99% rename from jode/jode/util/UnifyHash.java rename to jode/src/net/sf/jode/util/UnifyHash.java index 4ff3737..2798456 100644 --- a/jode/jode/util/UnifyHash.java +++ b/jode/src/net/sf/jode/util/UnifyHash.java @@ -17,7 +17,7 @@ * $Id$ */ -package jode.util; +package net.sf.jode.util; ///#ifdef JDK12 import java.lang.ref.WeakReference; import java.lang.ref.ReferenceQueue;