From 56ad6fe4373797dad0f323494afa6df061d740a8 Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Fri, 2 Jul 1999 18:54:23 +0000
Subject: [PATCH] get bundle from Main

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@989 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/obfuscator/SimpleAnalyzer.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/jode/jode/obfuscator/SimpleAnalyzer.java b/jode/jode/obfuscator/SimpleAnalyzer.java
index 3ecd687..c969966 100644
--- a/jode/jode/obfuscator/SimpleAnalyzer.java
+++ b/jode/jode/obfuscator/SimpleAnalyzer.java
@@ -48,7 +48,7 @@ public class SimpleAnalyzer implements CodeAnalyzer, Opcodes {
 		    i++;
 		if (i < clName.length() && clName.charAt(i) == 'L') {
 		    clName = clName.substring(i+1, clName.length()-1);
-		    m.clazz.bundle.reachableIdentifier(clName, false);
+		    Main.getClassBundle().reachableIdentifier(clName, false);
 		}
 		break;
 	    }
@@ -62,8 +62,9 @@ public class SimpleAnalyzer implements CodeAnalyzer, Opcodes {
 		String clName = ref.getClazz();
 		/* Don't have to reach array methods */
 		if (clName.charAt(0) != '[') {
-		    clName = clName.substring(1, clName.length()-1).replace('/', '.');
-		    m.clazz.bundle.reachableIdentifier
+		    clName = clName.substring(1, clName.length()-1)
+			.replace('/', '.');
+		    Main.getClassBundle().reachableIdentifier
 			(clName+"."+ref.getName()+"."+ref.getType(), 
 		     instr.opcode == opc_invokevirtual 
 		     || instr.opcode == opc_invokeinterface);
@@ -76,7 +77,8 @@ public class SimpleAnalyzer implements CodeAnalyzer, Opcodes {
 	Handler[] handlers = bytecode.getExceptionHandlers();
 	for (int i=0; i< handlers.length; i++) {
 	    if (handlers[i].type != null)
-		m.clazz.bundle.reachableIdentifier(handlers[i].type, false);
+		Main.getClassBundle()
+		    .reachableIdentifier(handlers[i].type, false);
 	}
     }
 
@@ -87,9 +89,10 @@ public class SimpleAnalyzer implements CodeAnalyzer, Opcodes {
 		|| instr.opcode == opc_putfield) {
 		Reference ref = (Reference) instr.objData;
 		FieldIdentifier fi = (FieldIdentifier)
-		    m.clazz.bundle.getIdentifier(ref);
+		    Main.getClassBundle().getIdentifier(ref);
 		if (fi != null
-		    && jode.Obfuscator.shouldStrip && !fi.isReachable()) {
+		    && (Main.stripping & Main.STRIP_UNREACH) != 0
+		    && !fi.isReachable()) {
 		    /* Replace instruction with pop opcodes. */
 		    int stacksize = 
 			(instr.opcode