flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject [4/4] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34062: FDB waits up to 20s per SWF before we can start debugging
Date Mon, 27 Jan 2014 10:35:23 GMT
FLEX-34062: FDB waits up to 20s per SWF before we can start debugging


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/dcc40468
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/dcc40468
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/dcc40468

Branch: refs/heads/develop
Commit: dcc404689eb20d5a037bbf67f4cbb85adec92237
Parents: ab14cf9
Author: Frédéric Thomas <fthomas@cpaglobal.com>
Authored: Mon Jan 27 10:31:45 2014 +0000
Committer: Frédéric Thomas <fthomas@cpaglobal.com>
Committed: Mon Jan 27 10:34:50 2014 +0000

----------------------------------------------------------------------
 .../java/flash/tools/SwfActionContainer.java    |   32 +-
 .../AlreadyActiveApplicationException.java      |    2 +-
 .../java/flash/tools/debugger/Bootstrap.java    |    4 +-
 .../tools/debugger/CommandLineException.java    |    6 +-
 .../flash/tools/debugger/DebuggerLocalizer.java |    6 +-
 .../debugger/DefaultDebuggerCallbacks.java      |    7 +-
 .../tools/debugger/IDebuggerCallbacks.java      |    4 +-
 .../tools/debugger/NoResponseException.java     |    2 +-
 .../tools/debugger/PlayerDebugException.java    |    2 +-
 .../flash/tools/debugger/VariableAttribute.java |    2 +-
 .../tools/debugger/concrete/AIRPlayer.java      |    2 +-
 .../tools/debugger/concrete/AbstractPlayer.java |    4 +-
 .../flash/tools/debugger/concrete/BinaryOp.java |    4 +-
 .../flash/tools/debugger/concrete/DBrowser.java |    4 +-
 .../tools/debugger/concrete/DLocation.java      |   12 +-
 .../flash/tools/debugger/concrete/DManager.java |  201 ++-
 .../flash/tools/debugger/concrete/DMessage.java |   56 +-
 .../tools/debugger/concrete/DMessageCache.java  |    8 +-
 .../debugger/concrete/DMessageCounter.java      |    6 +-
 .../flash/tools/debugger/concrete/DModule.java  |   24 +-
 .../tools/debugger/concrete/DProtocol.java      |   21 +-
 .../tools/debugger/concrete/DStackContext.java  |   18 +-
 .../tools/debugger/concrete/DSuspendInfo.java   |   10 +-
 .../flash/tools/debugger/concrete/DSwfInfo.java |   19 +-
 .../flash/tools/debugger/concrete/DValue.java   |   53 +-
 .../tools/debugger/concrete/DVariable.java      |   62 +-
 .../flash/tools/debugger/concrete/DWatch.java   |    8 +-
 .../debugger/concrete/GetVariableFlag.java      |    2 +-
 .../concrete/LineFunctionContainer.java         |    2 +-
 .../tools/debugger/concrete/PlayerSession.java  |  233 ++--
 .../debugger/concrete/PlayerSessionManager.java |   77 +-
 .../debugger/concrete/ProcessListener.java      |   20 +-
 .../tools/debugger/concrete/ScriptText.java     |    5 +-
 .../tools/debugger/concrete/StreamListener.java |    6 +-
 .../flash/tools/debugger/events/BreakEvent.java |    4 +-
 .../debugger/events/ConsoleErrorFault.java      |    2 +-
 .../flash/tools/debugger/events/DebugEvent.java |    6 +-
 .../flash/tools/debugger/events/FaultEvent.java |    4 +-
 .../tools/debugger/events/SwfLoadedEvent.java   |   14 +-
 .../tools/debugger/events/SwfUnloadedEvent.java |    6 +-
 .../tools/debugger/expression/ASTBuilder.java   |    4 +-
 .../debugger/expression/DebuggerEvaluator.java  |  117 +-
 .../flash/tools/debugger/expression/ECMA.java   |   43 +-
 .../expression/PlayerFaultException.java        |    2 +-
 .../threadsafe/ThreadSafeASTBuilder.java        |    2 +-
 .../threadsafe/ThreadSafeBootstrap.java         |    2 +-
 .../threadsafe/ThreadSafeDebuggerObject.java    |    6 +-
 .../debugger/threadsafe/ThreadSafeFrame.java    |   11 +-
 .../debugger/threadsafe/ThreadSafeLocation.java |    2 +-
 .../debugger/threadsafe/ThreadSafePlayer.java   |    2 +-
 .../debugger/threadsafe/ThreadSafeSession.java  |    2 +-
 .../threadsafe/ThreadSafeSessionManager.java    |    9 +-
 .../threadsafe/ThreadSafeSourceFile.java        |    2 +-
 .../threadsafe/ThreadSafeSourceLocator.java     |    4 +-
 .../debugger/threadsafe/ThreadSafeSwfInfo.java  |    4 +-
 .../debugger/threadsafe/ThreadSafeValue.java    |    7 +-
 .../debugger/threadsafe/ThreadSafeValueExp.java |    2 +-
 .../debugger/threadsafe/ThreadSafeVariable.java |    2 +-
 .../debugger/threadsafe/ThreadSafeWatch.java    |    2 +-
 .../src/java/flash/util/URLEncoder.java         |   12 +-
 .../debugger/src/java/flash/util/URLHelper.java |   26 +-
 .../flex/tools/debugger/cli/BreakAction.java    |    2 +-
 .../tools/debugger/cli/BreakIdentifier.java     |    2 +-
 .../flex/tools/debugger/cli/CatchAction.java    |    2 +-
 .../java/flex/tools/debugger/cli/DebugCLI.java  | 1193 +++++++-----------
 .../flex/tools/debugger/cli/DisplayAction.java  |   10 +-
 .../tools/debugger/cli/ExpressionCache.java     |   20 +-
 .../tools/debugger/cli/ExpressionContext.java   |   31 +-
 .../flex/tools/debugger/cli/Extensions.java     |   32 +-
 .../tools/debugger/cli/ExtensionsDisabled.java  |    2 +-
 .../flex/tools/debugger/cli/FaultActions.java   |   29 +-
 .../flex/tools/debugger/cli/FileInfoCache.java  |   16 +-
 .../src/java/flex/tools/debugger/cli/Help.java  |    2 +-
 .../flex/tools/debugger/cli/IntProperties.java  |    6 +-
 .../tools/debugger/cli/InternalProperty.java    |    6 +-
 .../tools/debugger/cli/LocationCollection.java  |    2 +-
 .../flex/tools/debugger/cli/StringIntArray.java |   14 +-
 .../flex/tools/debugger/cli/VariableFacade.java |    8 +-
 .../flex/tools/debugger/cli/WatchAction.java    |    8 +-
 79 files changed, 1093 insertions(+), 1515 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/SwfActionContainer.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/SwfActionContainer.java b/modules/debugger/src/java/flash/tools/SwfActionContainer.java
index 75de910..695d549 100644
--- a/modules/debugger/src/java/flash/tools/SwfActionContainer.java
+++ b/modules/debugger/src/java/flash/tools/SwfActionContainer.java
@@ -50,17 +50,17 @@ import java.util.Iterator;
  */
 public class SwfActionContainer extends TagHandler
 {
-	boolean		errorProcessing = true;
-	ActionList	m_master;
+	private boolean		errorProcessing = true;
+	private ActionList	m_master;
 
 	// temporaries used while decoding
-	Dictionary  m_dictionary; 
-	Header		m_header;
+    private Dictionary  m_dictionary;
+	private Header		m_header;
 
-    public SwfActionContainer(byte[] swf, byte[] swd)	{ this(new ByteArrayInputStream(swf), new ByteArrayInputStream(swd));	}
+    protected SwfActionContainer(byte[] swf, byte[] swd)	{ this(new ByteArrayInputStream(swf), new ByteArrayInputStream(swd));	}
     public SwfActionContainer(InputStream swfIn)		{ this(swfIn, null); }
 
-    public SwfActionContainer(InputStream swfIn, InputStream swdIn)
+    private SwfActionContainer(InputStream swfIn, InputStream swdIn)
 	{
 		TagDecoder p = new TagDecoder(swfIn, swdIn);
 		try
@@ -76,8 +76,8 @@ public class SwfActionContainer extends TagHandler
 	}
 
 	// getters 
-	public ActionList	getMasterList() { return m_master; }
-	public Header		getHeader()		{ return m_header; }
+    protected ActionList	getMasterList() { return m_master; }
+	protected Header		getHeader()		{ return m_header; }
 	public Dictionary	getDictionary() { return m_dictionary; }
 
 	// Did we hit an error in processing the swf? 
@@ -106,7 +106,7 @@ public class SwfActionContainer extends TagHandler
 		return l;
 	}
 
-    public static ActionLocation locationLessOrEqualTo(ActionLocation location, ActionList list, int offset)
+    private static ActionLocation locationLessOrEqualTo(ActionLocation location, ActionList list, int offset)
 	{
 		int at = findLessOrEqualTo(list, offset);
 		if (at > -1)
@@ -138,7 +138,7 @@ public class SwfActionContainer extends TagHandler
 
 	// find the index of the largest offset in the list that does not
 	// exceed the offset value provided. 
-	public static int findLessOrEqualTo(ActionList list, int offset)
+	private static int findLessOrEqualTo(ActionList list, int offset)
 	{
 		int i = find(list, offset);
 		if (i < 0)
@@ -154,7 +154,7 @@ public class SwfActionContainer extends TagHandler
 	// list of offsets within the action list.
 	// if no match then (-i - 1) provides the index of where an insertion
 	// would occur for this offset in the list.
-	public static int find(ActionList list, int offset)
+	private static int find(ActionList list, int offset)
 	{
         int lo = 0;
         int hi = list.size()-1;
@@ -190,7 +190,7 @@ public class SwfActionContainer extends TagHandler
 		public String			getClassName()					{ return m_className; }
 		public void				setClassName(String name)		{ m_className = name; }
 
-		private ActionList		m_actionList;
+		private final ActionList		m_actionList;
 		private String			m_className;
 	}
 
@@ -245,11 +245,9 @@ public class SwfActionContainer extends TagHandler
 	{
 		if (tag.hasClipAction())
 		{
-            Iterator it = tag.clipActions.clipActionRecords.iterator();
-            while (it.hasNext())
-            {
-    		    ClipActionRecord record = (ClipActionRecord) it.next();
-   			    recordActions(record.actionList);
+            for (Object clipActionRecord : tag.clipActions.clipActionRecords) {
+                ClipActionRecord record = (ClipActionRecord) clipActionRecord;
+                recordActions(record.actionList);
             }
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/AlreadyActiveApplicationException.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/AlreadyActiveApplicationException.java b/modules/debugger/src/java/flash/tools/debugger/AlreadyActiveApplicationException.java
index d0687f6..efc348d 100644
--- a/modules/debugger/src/java/flash/tools/debugger/AlreadyActiveApplicationException.java
+++ b/modules/debugger/src/java/flash/tools/debugger/AlreadyActiveApplicationException.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 public class AlreadyActiveApplicationException extends IOException {
 	private static final long serialVersionUID = 0L;
 	
-	private boolean m_isDebugging;
+	private final boolean m_isDebugging;
 	
 	public AlreadyActiveApplicationException (String detailedMessage,boolean isDebugging)
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/Bootstrap.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/Bootstrap.java b/modules/debugger/src/java/flash/tools/debugger/Bootstrap.java
index d352324..c9728c9 100644
--- a/modules/debugger/src/java/flash/tools/debugger/Bootstrap.java
+++ b/modules/debugger/src/java/flash/tools/debugger/Bootstrap.java
@@ -29,8 +29,8 @@ import flash.tools.debugger.concrete.PlayerSessionManager;
  */
 public class Bootstrap
 {
-	static SessionManager m_mgr = null;
-	private static LocalizationManager m_localizationManager;
+	private static SessionManager m_mgr = null;
+	private static final LocalizationManager m_localizationManager;
 
 	static
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/CommandLineException.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/CommandLineException.java b/modules/debugger/src/java/flash/tools/debugger/CommandLineException.java
index c93e856..ebcf83e 100644
--- a/modules/debugger/src/java/flash/tools/debugger/CommandLineException.java
+++ b/modules/debugger/src/java/flash/tools/debugger/CommandLineException.java
@@ -32,9 +32,9 @@ public class CommandLineException extends IOException
 {
 	private static final long serialVersionUID = -5696392627123516956L;
     
-    private String[] m_commandLine;
-	private String m_commandOutput;
-	private int m_exitValue;
+    private final String[] m_commandLine;
+	private final String m_commandOutput;
+	private final int m_exitValue;
 
 	/**
 	 * @param detailMessage

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java b/modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java
index d0a6eef..2820c51 100644
--- a/modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java
+++ b/modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java
@@ -39,9 +39,9 @@ import flash.localization.ResourceBundleLocalizer;
  */
 public class DebuggerLocalizer implements ILocalizer
 {
-	private ResourceBundleLocalizer m_resourceBundleLocalizer = new ResourceBundleLocalizer();
-	private String m_prefix;
-	public final static String m_newline = System.getProperty("line.separator"); //$NON-NLS-1$
+	private final ResourceBundleLocalizer m_resourceBundleLocalizer = new ResourceBundleLocalizer();
+	private final String m_prefix;
+	private final static String m_newline = System.getProperty("line.separator"); //$NON-NLS-1$
 
 	public DebuggerLocalizer(String prefix)
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/DefaultDebuggerCallbacks.java b/modules/debugger/src/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
index 87f3136..7dcaa91 100644
--- a/modules/debugger/src/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
+++ b/modules/debugger/src/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
@@ -264,7 +264,7 @@ public class DefaultDebuggerCallbacks implements IDebuggerCallbacks
 	 * 
 	 * return the path_to_exe.  Note that path_to_exe may contain spaces.
 	 */
-	protected String extractExenameFromCommandString(String cmd)
+    String extractExenameFromCommandString(String cmd)
 	{
 		// now strip trailing junk if any
 		if (cmd.startsWith("\"")) { //$NON-NLS-1$
@@ -320,8 +320,7 @@ public class DefaultDebuggerCallbacks implements IDebuggerCallbacks
 	/*
 	 * @see flash.tools.debugger.IDebuggerCallbacks#terminateDebugTarget(java.lang.Process)
 	 */
-	public void terminateDebugTarget(Process process) throws IOException
-	{
+	public void terminateDebugTarget(Process process) {
 		process.destroy();
 	}
 
@@ -395,7 +394,7 @@ public class DefaultDebuggerCallbacks implements IDebuggerCallbacks
 	 * Default implementation does not know how to get the version
 	 * of an application.
 	 */
-	public int[] getAppVersion(File application) throws IOException {
+	public int[] getAppVersion(File application) {
 		return null;
 	}
 	

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/IDebuggerCallbacks.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/IDebuggerCallbacks.java b/modules/debugger/src/java/flash/tools/debugger/IDebuggerCallbacks.java
index e704814..20e3d80 100644
--- a/modules/debugger/src/java/flash/tools/debugger/IDebuggerCallbacks.java
+++ b/modules/debugger/src/java/flash/tools/debugger/IDebuggerCallbacks.java
@@ -81,7 +81,7 @@ public interface IDebuggerCallbacks
 	/**
 	 * Terminates a debug target process.
 	 */
-	public void terminateDebugTarget(Process process) throws IOException;
+	public void terminateDebugTarget(Process process);
 
 	/**
 	 * Query the Windows registry.
@@ -130,5 +130,5 @@ public interface IDebuggerCallbacks
 	 * @throws IOException
 	 *             e.g. for file not found, etc.
 	 */
-	public int[] getAppVersion(File application) throws IOException;
+	public int[] getAppVersion(File application);
 }

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/NoResponseException.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/NoResponseException.java b/modules/debugger/src/java/flash/tools/debugger/NoResponseException.java
index 40804b7..ff1dab1 100644
--- a/modules/debugger/src/java/flash/tools/debugger/NoResponseException.java
+++ b/modules/debugger/src/java/flash/tools/debugger/NoResponseException.java
@@ -37,7 +37,7 @@ public class NoResponseException extends PlayerDebugException
 	 * Number of milliseconds that elapsed causing the timeout
 	 * -1 means unknown.
 	 */
-	public int m_waitedFor;
+	private final int m_waitedFor;
 
 	public NoResponseException(int t) 
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/PlayerDebugException.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/PlayerDebugException.java b/modules/debugger/src/java/flash/tools/debugger/PlayerDebugException.java
index a3a459f..d23e8cb 100644
--- a/modules/debugger/src/java/flash/tools/debugger/PlayerDebugException.java
+++ b/modules/debugger/src/java/flash/tools/debugger/PlayerDebugException.java
@@ -27,6 +27,6 @@ public class PlayerDebugException extends Exception
 {
 	private static final long serialVersionUID = 757986761482127248L;
 
-    public PlayerDebugException()				{ super(); }
+    PlayerDebugException()				{ super(); }
 	public PlayerDebugException(String s)		{ super(s); }
 }

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/VariableAttribute.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/VariableAttribute.java b/modules/debugger/src/java/flash/tools/debugger/VariableAttribute.java
index 665f593..85d8d3b 100644
--- a/modules/debugger/src/java/flash/tools/debugger/VariableAttribute.java
+++ b/modules/debugger/src/java/flash/tools/debugger/VariableAttribute.java
@@ -163,7 +163,7 @@ public interface VariableAttribute
 	 * 		if (myVar.getScope() == VariableAttribute.PRIVATE_SCOPE) ...
 	 * </pre>
 	 */
-	public static final int SCOPE_MASK				= PUBLIC_SCOPE|PRIVATE_SCOPE|PROTECTED_SCOPE|INTERNAL_SCOPE|NAMESPACE_SCOPE;
+	public static final int SCOPE_MASK				= PRIVATE_SCOPE | PROTECTED_SCOPE | INTERNAL_SCOPE | NAMESPACE_SCOPE;
 
 	// 0x04000000 is reserved for IS_CLASS, which is now part of
 	// ValueAttribute rather than VariableAttribute.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/AIRPlayer.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/AIRPlayer.java b/modules/debugger/src/java/flash/tools/debugger/concrete/AIRPlayer.java
index 20225ce..4016dac 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/AIRPlayer.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/AIRPlayer.java
@@ -29,7 +29,7 @@ import flash.tools.debugger.Player;
  */
 public class AIRPlayer implements Player
 {
-	File m_adl;
+	private final File m_adl;
 
 	/**
 	 * @param adl

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/AbstractPlayer.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/AbstractPlayer.java b/modules/debugger/src/java/flash/tools/debugger/concrete/AbstractPlayer.java
index d1269f9..5f19b87 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/AbstractPlayer.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/AbstractPlayer.java
@@ -30,9 +30,9 @@ import flash.tools.debugger.Player;
 public abstract class AbstractPlayer implements Player
 {
 	private Browser m_browser;
-	private File m_flashPlayer;
+	private final File m_flashPlayer;
 
-	public AbstractPlayer(File webBrowser, File flashPlayer)
+	AbstractPlayer(File webBrowser, File flashPlayer)
 	{
 		if (webBrowser != null)
 			m_browser = new DBrowser(webBrowser);

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/BinaryOp.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/BinaryOp.java b/modules/debugger/src/java/flash/tools/debugger/concrete/BinaryOp.java
index b3574ce..356628d 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/BinaryOp.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/BinaryOp.java
@@ -31,8 +31,8 @@ public enum BinaryOp {
 	In(2, "in"), //$NON-NLS-1$
 	As(3, "as"); //$NON-NLS-1$
 
-	private int m_value;
-	private String m_name;
+	private final int m_value;
+	private final String m_name;
 
 	private BinaryOp(int value, String name) {
 		m_value = value;

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DBrowser.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DBrowser.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DBrowser.java
index 3abf91c..a60bc49 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DBrowser.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DBrowser.java
@@ -28,8 +28,8 @@ import flash.tools.debugger.Browser;
  */
 public class DBrowser implements Browser
 {
-	private File m_path;
-	private int m_type;
+	private final File m_path;
+	private final int m_type;
 
 	public DBrowser(File exepath)
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DLocation.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DLocation.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DLocation.java
index 39181eb..53ce9e0 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DLocation.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DLocation.java
@@ -24,9 +24,9 @@ import flash.tools.debugger.SourceFile;
 
 public class DLocation implements Location
 {
-	SourceFile	m_source;
-	int			m_line;
-	boolean     m_removed;
+	private final SourceFile	m_source;
+	private final int			m_line;
+	private boolean     m_removed;
 
 	DLocation(SourceFile src, int line)
 	{
@@ -44,17 +44,17 @@ public class DLocation implements Location
 	public int			getId() { return encodeId(getFile().getId(), getLine()); }
 
 	/* encode /decode */
-	public static final int encodeId(int fileId, int line)
+	public static int encodeId(int fileId, int line)
 	{
 		return ( (line << 16) | fileId );
 	}
 	
-	public static final int decodeFile(long id)
+	public static int decodeFile(long id)
 	{
 		return (int)(id & 0xffff);
 	}
 
-	public static final int decodeLine(long id)
+	public static int decodeLine(long id)
 	{
 		return (int)(id >> 16 & 0xffff);
 	}

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
index a290b14..1ea5a92 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
@@ -22,7 +22,6 @@ package flash.tools.debugger.concrete;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -86,7 +85,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 	 */
 	private Map<Long,DValue>				m_previousValues;
 
-	private LinkedList<DebugEvent> m_event;	/* our event queue; WARNING: accessed from multiple threads */
+	private final LinkedList<DebugEvent> m_event;	/* our event queue; WARNING: accessed from multiple threads */
 	private DSuspendInfo	m_suspendInfo;	/* info for when we are stopped */
 	private SourceLocator	m_sourceLocator;
 
@@ -113,10 +112,10 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 	private boolean		m_executingPlayerCode;
 	private FaultEvent	m_faultEventDuringPlayerCodeExecution;
 
-	private Map<String, String>	m_options = new HashMap<String, String>();	// Player options that have been queried by OutGetOption, and come back via InOption
+	private final Map<String, String>	m_options = new HashMap<String, String>();	// Player options that have been queried by OutGetOption, and come back via InOption
 
-	public static final String ARGUMENTS_MARKER = "$arguments"; //$NON-NLS-1$
-	public static final String SCOPE_CHAIN_MARKER = "$scopechain"; //$NON-NLS-1$
+	private static final String ARGUMENTS_MARKER = "$arguments"; //$NON-NLS-1$
+	private static final String SCOPE_CHAIN_MARKER = "$scopechain"; //$NON-NLS-1$
 
 	public DManager()
 	{
@@ -409,8 +408,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 
 	public DValue getValue(long id)
 	{
-		DValue v = m_values.get(id);
-		return v;
+		return m_values.get(id);
 	}
 
 	/**
@@ -661,12 +659,10 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 
 	/**
 	 * Frame stack management related stuff
-	 * @return true if we added this frame; false if we ignored it
 	 */
-	boolean addFrame(DStackContext ds)
+	void addFrame(DStackContext ds)
 	{
 		m_frames.add(ds);
-		return true;
 	}
 
 	void clearFrames()
@@ -701,7 +697,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 		// discard all old frames (we will restore some of them below)
 		DValue[] oldFrames = new DValue[oldSize];
 		for (int depth = 0; depth < oldSize; depth++) {
-			oldFrames[depth] = (DValue) m_previousValues.remove(Value.BASE_ID - depth);
+			oldFrames[depth] = m_previousValues.remove(Value.BASE_ID - depth);
 		}
 
 		// Start at the end of the stack (the stack frame farthest from the
@@ -879,7 +875,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 					{
 						if (msg.getByte() != 0)
 						{
-							willExceptionBeCaught = (msg.getByte() != 0 ? true : false);
+							willExceptionBeCaught = (msg.getByte() != 0);
 							msg.getPtr();
 							DVariable thrownVar = extractVariable(msg);
 							thrown = thrownVar.getValue();
@@ -931,7 +927,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 			case DMessage.InSquelch:
 			{
 				long state = msg.getDWord();
-				m_squelchEnabled = (state != 0) ? true : false;
+				m_squelchEnabled = (state != 0);
 				break;
 			}
 
@@ -1167,12 +1163,8 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 					int  line = DLocation.decodeLine (bpi);
 					DModule m = getSource(module);
 					DStackContext c = new DStackContext( module, line, m, id, stack, depth);
-					// If addFrame() returns false, that means it chose to ignore this
-					// frame, so we do NOT want to increment our depth for the next
-					// time through the loop.  If it returns true, then we do want to.
-					if (addFrame(c))
-						++depth;
-//					System.out.println("   this="+id+",@"+(bpi&0xffff)+":"+(bpi>>16)+",stack="+stack);
+                    addFrame(c);
+					++depth;
 				}
 				mapOldFramesToNew();
 				break;
@@ -1474,7 +1466,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 
 					if (id != 0)
 					{
-						boolean  debugComing = (msg.getByte() == 0) ? false : true;
+						boolean  debugComing = (msg.getByte() != 0);
 						byte vmVersion = (byte)msg.getByte();  // AS vm version number (1 = avm+, 0 == avm-)
 						int rsvd1 = msg.getWord();
 
@@ -1589,7 +1581,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
             {
 				// For InCallFunction the first element is the original function we requested
 				DValue parent = null;
-				DVariable child = null;
+				DVariable child;
 				String definingClass = null;
 				int level = 0;
 				int highestLevelWithMembers = -1;
@@ -1683,10 +1675,8 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 	 */
 	private boolean showMember(DVariable child)
 	{
-		if (isTraits(child))
-			return false;
-		return true;
-	}
+        return !isTraits(child);
+    }
 
 	/**
 	 * Returns whether this is not a variable at all, but is instead a representation
@@ -1695,11 +1685,8 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 	 */
 	private boolean isTraits(DVariable variable) {
 		Value value = variable.getValue();
-		if (value.getType() == VariableType.UNKNOWN && Value.TRAITS_TYPE_NAME.equals(value.getTypeName())) {
-			return true;
-		}
-		return false;
-	}
+        return value.getType() == VariableType.UNKNOWN && Value.TRAITS_TYPE_NAME.equals(value.getTypeName());
+    }
 
 	/**
 	 * Here's where some ugly stuff happens. Since our context contains
@@ -1756,79 +1743,66 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 			context.removeAllVariables();
 
 		// use the ordered child list
-		Iterator<DVariable> e = frameVars.iterator();
-		while(e.hasNext())
-		{
-			DVariable v = e.next();
-			String name = v.getName();
-
-			// let's clear a couple of attributes that may get in our way
-			v.clearAttribute(VariableAttribute.IS_LOCAL);
-			v.clearAttribute(VariableAttribute.IS_ARGUMENT);
-			if (name.equals("this")) //$NON-NLS-1$
-			{
-				if (context != null)
-					context.setThis(v);
-
-				// from our current frame, put a pseudo this entry into the cache and hang it off base, mark it as an implied arg
-				v.setAttribute(VariableAttribute.IS_ARGUMENT);
-				addVariableMember(root, v);
+        for (DVariable v : frameVars) {
+            String name = v.getName();
 
-				// also add this variable under THIS_ID
-				if (depth == 0)
-					putValue(Value.THIS_ID, (DValue) v.getValue());
-			}
-			else if (name.equals("super")) //$NON-NLS-1$
-			{
-				// we are at the end of the arg list and let's make super part of global
-				inArgs = false;
-			}
-			else if (name.equals(ARGUMENTS_MARKER))
-			{
-				inArgs = true;
-
-				// see if we can extract an arg count from this variable
-				try { nArgs = ((Number)(v.getValue().getValueAsObject())).intValue(); } catch(NumberFormatException nfe){}
-			}
-			else if (name.equals(SCOPE_CHAIN_MARKER))
-			{
-				inArgs = false;
-				inScopeChain = true;
-			}
-			else
-			{
-				// add it to our root, marking it as an arg if we know, otherwise local
-				if (inArgs)
-				{
-					v.setAttribute(VariableAttribute.IS_ARGUMENT);
+            // let's clear a couple of attributes that may get in our way
+            v.clearAttribute(VariableAttribute.IS_LOCAL);
+            v.clearAttribute(VariableAttribute.IS_ARGUMENT);
+            if (name.equals("this")) //$NON-NLS-1$
+            {
+                if (context != null)
+                    context.setThis(v);
 
-					if (context != null)
-						context.addArgument(v);
+                // from our current frame, put a pseudo this entry into the cache and hang it off base, mark it as an implied arg
+                v.setAttribute(VariableAttribute.IS_ARGUMENT);
+                addVariableMember(root, v);
 
-					// decrement arg count if we have it
-					if (nArgs > -1)
-					{
-						if (--nArgs <= 0)
-							inArgs = false;
-					}
-				}
-				else if (inScopeChain)
-				{
-					if (context != null)
-						context.addScopeChainEntry(v);
-				}
-				else
-				{
-					v.setAttribute(VariableAttribute.IS_LOCAL);
-					if (context != null)
-						context.addLocal(v);
-				}
+                // also add this variable under THIS_ID
+                if (depth == 0)
+                    putValue(Value.THIS_ID, (DValue) v.getValue());
+            } else if (name.equals("super")) //$NON-NLS-1$
+            {
+                // we are at the end of the arg list and let's make super part of global
+                inArgs = false;
+            } else if (name.equals(ARGUMENTS_MARKER)) {
+                inArgs = true;
+
+                // see if we can extract an arg count from this variable
+                try {
+                    nArgs = ((Number) (v.getValue().getValueAsObject())).intValue();
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (name.equals(SCOPE_CHAIN_MARKER)) {
+                inArgs = false;
+                inScopeChain = true;
+            } else {
+                // add it to our root, marking it as an arg if we know, otherwise local
+                if (inArgs) {
+                    v.setAttribute(VariableAttribute.IS_ARGUMENT);
+
+                    if (context != null)
+                        context.addArgument(v);
+
+                    // decrement arg count if we have it
+                    if (nArgs > -1) {
+                        if (--nArgs <= 0)
+                            inArgs = false;
+                    }
+                } else if (inScopeChain) {
+                    if (context != null)
+                        context.addScopeChainEntry(v);
+                } else {
+                    v.setAttribute(VariableAttribute.IS_LOCAL);
+                    if (context != null)
+                        context.addLocal(v);
+                }
 
-				// add locals and arguments to root
-				if (!inScopeChain)
-					addVariableMember(root, v);
-			}
-		}
+                // add locals and arguments to root
+                if (!inScopeChain)
+                    addVariableMember(root, v);
+            }
+        }
 	}
 
 	/**
@@ -1836,14 +1810,12 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 	 */
 	int toAttributes(int pAttr)
 	{
-		int attr = pAttr;  /* 1-1 mapping */
-		return attr;
+		return pAttr;  /* 1-1 mapping */
 	}
 
 	DVariable extractVariable(DMessage msg)
 	{
-		DVariable v = extractVariable(msg, msg.getString());
-		return v;
+		return extractVariable(msg, msg.getString());
 	}
 
 	/**
@@ -1888,9 +1860,9 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 				{
 					dval = Double.parseDouble(s);
 				}
-				catch(NumberFormatException nfe) {}
+				catch(NumberFormatException ignored) {}
 
-				value = new Double(dval);
+				value = dval;
 				isPrimitive = true;
 				break;
 			}
@@ -1898,16 +1870,14 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 			case DMessage.kBooleanType:
 			{
 				int bval = msg.getByte();
-				value = new Boolean ( (bval == 0) ? false : true );
+				value = (bval != 0);
 				isPrimitive = true;
 				break;
 			}
 
             case DMessage.kStringType:
             {
-                String s = msg.getString();
-
-                value = s;
+                value = msg.getString();
                 isPrimitive = true;
                 break;
             }
@@ -1922,7 +1892,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 				typeName =   (oid == -1) ? "" : msg.getString(); //$NON-NLS-1$
 				className = DVariable.classNameFor(cType, false);
 
-				value = new Long(oid);
+				value = oid;
 				vType = (isFnc == 0) ? VariableType.OBJECT : VariableType.FUNCTION;
 				break;
 			}
@@ -1935,7 +1905,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 				typeName =   (oid == -1) ? "" : msg.getString(); //$NON-NLS-1$
 				className = DVariable.classNameFor(cType, true);
 
-				value = new Long(oid);
+				value = oid;
 				vType = VariableType.MOVIECLIP;
 				break;
 			}
@@ -1995,7 +1965,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 		// existing object with the new values.
 		if (value instanceof Long)
 		{
-			valueObject = getValue(((Long)value).longValue());
+			valueObject = getValue((Long) value);
 		}
 
 		if (valueObject == null)
@@ -2013,7 +1983,7 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 			}
 
 			if (value instanceof Long && (toAttributes(flags) & VariableAttribute.HAS_GETTER) == 0)
-				putValue(((Long)value).longValue(), valueObject);
+				putValue((Long) value, valueObject);
 		}
 		else
 		{
@@ -2036,14 +2006,13 @@ public class DManager implements DProtocolNotifierIF, SourceLocator
 			valueObject.setValue(value);
 		}
 
-		DVariable var = new DVariable(name, valueObject);
-		return var;
+		return new DVariable(name, valueObject);
 	}
 
 	/**
 	 * The player sends us a URI using '|' instead of ':'
 	 */
-	public static String convertToURI(String playerURL)
+	private static String convertToURI(String playerURL)
 	{
 		int index = playerURL.indexOf('|');
 		StringBuilder sb = new StringBuilder(playerURL);

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java
index e66edb4..840bb0e 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java
@@ -45,7 +45,7 @@ public class DMessage
 	 * through our debug socket
 	 */
 	public static final int InUnknown					= -1;
-	public static final int InSetMenuState				=  0;
+	private static final int InSetMenuState				=  0;
 	public static final int InSetProperty				=  1;
 	public static final int InExit						=  2;
 	public static final int InNewObject					=  3;
@@ -68,7 +68,7 @@ public class DMessage
 	public static final int InNumScript					= 20;
 	public static final int InRemoveScript				= 21;
 	public static final int InRemoveBreakpoint			= 22;
-	public static final int InNotSynced					= 23;
+	private static final int InNotSynced					= 23;
 	public static final int InErrorURLOpen				= 24;
 	public static final int InProcessTag				= 25;
 	public static final int InVersion					= 26;
@@ -105,26 +105,26 @@ public class DMessage
      * debug socket (WARNING: ID space overlaps with InXXX)
 	 */
 	public static final int OutUnknown					= -2;
-	public static final int OutZoomIn					=  0;
-	public static final int OutZoomOut					=  1;
-	public static final int OutZoom100					=  2;
-	public static final int OutHome						=  3;
-	public static final int OutSetQuality				=  4;
-	public static final int OutPlay						=  5;
-	public static final int OutLoop						=  6;
-	public static final int OutRewind					=  7;
-	public static final int OutForward					=  8;
-	public static final int OutBack						=  9;
-	public static final int OutPrint					= 10;
+	private static final int OutZoomIn					=  0;
+	private static final int OutZoomOut					=  1;
+	private static final int OutZoom100					=  2;
+	private static final int OutHome						=  3;
+	private static final int OutSetQuality				=  4;
+	private static final int OutPlay						=  5;
+	private static final int OutLoop						=  6;
+	private static final int OutRewind					=  7;
+	private static final int OutForward					=  8;
+	private static final int OutBack						=  9;
+	private static final int OutPrint					= 10;
 	public static final int OutSetVariable				= 11;
-	public static final int OutSetProperty				= 12;
+	private static final int OutSetProperty				= 12;
 	public static final int OutExit						= 13;
-	public static final int OutSetFocus					= 14;
+	private static final int OutSetFocus					= 14;
 	public static final int OutContinue					= 15;
 	public static final int OutStopDebug				= 16;
 	public static final int OutSetBreakpoints			= 17;
 	public static final int OutRemoveBreakpoints		= 18;
-	public static final int OutRemoveAllBreakpoints		= 19;
+	private static final int OutRemoveAllBreakpoints		= 19;
 	public static final int OutStepOver					= 20;
 	public static final int OutStepInto					= 21;
 	public static final int OutStepOut					= 22;
@@ -134,17 +134,17 @@ public class DMessage
 	public static final int OutGetFrame					= 26;
 	public static final int OutGetOption				= 27;
 	public static final int OutSetOption				= 28;
-	public static final int OutAddWatch					= 29; // 16-bit id; used for as2
-	public static final int OutRemoveWatch				= 30; // 16-bit id; used for as2
+	private static final int OutAddWatch					= 29; // 16-bit id; used for as2
+	private static final int OutRemoveWatch				= 30; // 16-bit id; used for as2
     public static final int OutStepContinue				= 31;
     public static final int OutGetSwf				    = 32;
     public static final int OutGetSwd				    = 33;
 	public static final int OutGetVariableWhichInvokesGetter = 34;
 	public static final int OutGetBreakReason			= 35;
 	public static final int OutGetActions				= 36;
-	public static final int OutSetActions				= 37;
+	private static final int OutSetActions				= 37;
 	public static final int OutSwfInfo					= 38;
-	public static final int OutConstantPool				= 39;
+	private static final int OutConstantPool				= 39;
     public static final int OutGetFncNames              = 40;
 	// 41 through 47 are for profiling
     public static final int OutCallFunction				= 48;
@@ -188,9 +188,9 @@ public class DMessage
 														// used by the AVM+ debugger.
 
 	/* byte array of our message and current index into it */
-	byte[] m_content;	/* the data bytes of the message */
-	int	   m_index;		/* current position within the content array */
-	int    m_type;		/* one of OutXXX or InXXX integer constants */
+    private final byte[] m_content;	/* the data bytes of the message */
+	private int	   m_index;		/* current position within the content array */
+	private int    m_type;		/* one of OutXXX or InXXX integer constants */
 
 	/**
 	 * Pointer size (in bytes) expected by the Flash player; either
@@ -199,7 +199,7 @@ public class DMessage
 	private static int m_sizeofPtr;
 
 	/* Debugging only: The contents of this message, formatted as a string for display */
-	private StringBuilder m_debugFormatted;
+	private final StringBuilder m_debugFormatted;
 	/* Debugging only: The number of bytes from the input that we have formatted into m_debugFormatted */
 	private int m_debugFormattedThroughIndex;
 
@@ -214,8 +214,8 @@ public class DMessage
 
 	/* getters/setters */
 	public int    getType()				{ return m_type; }
-	public String getInTypeName()		{ return inTypeName(getType()); }
-	public String getOutTypeName()		{ return outTypeName(getType()); }
+	String getInTypeName()		{ return inTypeName(getType()); }
+	String getOutTypeName()		{ return outTypeName(getType()); }
 	public byte[] getData()				{ return m_content; }
 	public int    getSize()				{ return (m_content == null) ? 0 : m_content.length; }
 	public int    getRemaining()		{ return getSize()-m_index; }
@@ -358,7 +358,7 @@ public class DMessage
 	 * @param val the number
 	 * @param bytes how many bytes should be written
 	 */
-	public void put(long val, int bytes) throws ArrayIndexOutOfBoundsException
+    void put(long val, int bytes) throws ArrayIndexOutOfBoundsException
 	{
 		if (m_index+bytes > m_content.length)
 			throw new ArrayIndexOutOfBoundsException(m_content.length-m_index+" < "+bytes); //$NON-NLS-1$
@@ -519,7 +519,7 @@ public class DMessage
 		return sb.toString();
 	}
 
-	public StringBuilder appendContent(StringBuilder sb, int max)
+	StringBuilder appendContent(StringBuilder sb, int max)
 	{
 		int size = getSize();
 		byte[] data = getData();

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCache.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCache.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCache.java
index 0bd4012..4da9bd1 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCache.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCache.java
@@ -40,12 +40,12 @@ package flash.tools.debugger.concrete;
  * 
  * This is class is a singleton.
  */
-public class DMessageCache
+class DMessageCache
 {
-	public static final int MAX_CACHED_DATA_SIZE		= 128;  /* should consume around 4n + n(n+1)/2 bytes */
+	private static final int MAX_CACHED_DATA_SIZE		= 128;  /* should consume around 4n + n(n+1)/2 bytes */
 
 	/* our cache */
-	static DMessage[] m_cache = new DMessage[MAX_CACHED_DATA_SIZE];
+	private static final DMessage[] m_cache = new DMessage[MAX_CACHED_DATA_SIZE];
 
 	/**
 	 * Obtain a DMessage from the cache if possible, otherwise make one for me.
@@ -107,6 +107,6 @@ public class DMessageCache
 			m_cache[index] = msg;
 	}
 
-	public static int size2Index(int size) { return ((size < MAX_CACHED_DATA_SIZE) ? size : -1); }
+	private static int size2Index(int size) { return ((size < MAX_CACHED_DATA_SIZE) ? size : -1); }
 //	public static int size2Index(int size) { return -1; }
 }

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCounter.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCounter.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCounter.java
index d9f3587..efc404f 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCounter.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DMessageCounter.java
@@ -26,8 +26,8 @@ package flash.tools.debugger.concrete;
  */
 public class DMessageCounter implements DProtocolNotifierIF
 {
-	long[] m_inCounts;
-	long[] m_outCounts;
+	private final long[] m_inCounts;
+	private final long[] m_outCounts;
 
 	public DMessageCounter()
 	{
@@ -61,7 +61,7 @@ public class DMessageCounter implements DProtocolNotifierIF
 	 * Returns the object on which external code can call "wait" in order
 	 * to block until a message is sent.
 	 */
-	public Object getOutLock() { return m_outCounts; }
+    Object getOutLock() { return m_outCounts; }
 
 	/**
 	 * Collect stats on outgoing messages 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java
index c83c134..463b03a 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java
@@ -65,7 +65,7 @@ public class DModule implements SourceFile
 	private String				m_packageName;
 	private boolean				m_gotAllFncNames;
 	private int					m_anonymousFunctionCounter = 0;
-	private SourceLocator		m_sourceLocator;
+	private final SourceLocator		m_sourceLocator;
 	private int					m_sourceLocatorChangeCount;
 	private final static String	m_newline = System.getProperty("line.separator"); //$NON-NLS-1$
 
@@ -100,7 +100,7 @@ public class DModule implements SourceFile
         m_gotAllFncNames = false;
 	}
 
-	public synchronized ScriptText getScript()
+	synchronized ScriptText getScript()
 	{
 		// If we have been using "dummy" source, and the user has changed the list of
 		// directories that are searched for source, then we want to search again
@@ -338,13 +338,11 @@ public class DModule implements SourceFile
             {
                 ps.requestFunctionNames(m_id, -1);
             }
-            catch (VersionException e)
+            catch (VersionException ignored)
             {
-                ;
             }
-            catch (NoResponseException e)
+            catch (NoResponseException ignored)
             {
-                ;
             }
         }
         m_gotAllFncNames = true;
@@ -402,7 +400,7 @@ public class DModule implements SourceFile
 			m_line2Offset.add(null);
 
 		// add the offset mapping
-		m_line2Offset.set(firstLine, new Integer(offset));
+		m_line2Offset.set(firstLine, offset);
 
 		// make sure m_line2Func is big enough for the lines we're about to se
 		m_line2Func.ensureCapacity(lastLine+1);
@@ -442,8 +440,8 @@ public class DModule implements SourceFile
 		// add to our function name list
 		if (m_func2FirstLine.get(funcName) == null)
 		{
-			m_func2FirstLine.put(funcName, new Integer(firstLine));
-			m_func2LastLine.put(funcName, new Integer(lastLine));
+			m_func2FirstLine.put(funcName, firstLine);
+			m_func2LastLine.put(funcName, lastLine);
 		}
 	}
 
@@ -540,7 +538,7 @@ public class DModule implements SourceFile
         		}
         		finally
         		{
-        			try { in.close(); } catch (IOException e) {}
+        			try { in.close(); } catch (IOException ignored) {}
         		}
         	}
         	
@@ -562,7 +560,7 @@ public class DModule implements SourceFile
 					}
 					finally
 					{
-						try { in.close(); } catch (IOException e) {}
+						try { in.close(); } catch (IOException ignored) {}
 					}
 	            }
         	}
@@ -684,7 +682,7 @@ public class DModule implements SourceFile
     		{
     			return Charset.forName(encoding);
     		}
-    		catch (IllegalArgumentException e)
+    		catch (IllegalArgumentException ignored)
     		{}
     	}
     	return null;
@@ -740,7 +738,7 @@ public class DModule implements SourceFile
 	 */
 	private static class NameParser
 	{
-		private String fOriginalName;
+		private final String fOriginalName;
 		private String fBasePath;
 		private String fPackage;
 		private String fFilename;

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DProtocol.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DProtocol.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DProtocol.java
index a922428..eb349a3 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DProtocol.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DProtocol.java
@@ -76,7 +76,7 @@ public class DProtocol implements Runnable
 		MessageCounter
 	}
 
-	public DProtocol(BufferedInputStream in, BufferedOutputStream out)
+	private DProtocol(BufferedInputStream in, BufferedOutputStream out)
 	{
 		m_in = in;
 		m_out = out;
@@ -91,8 +91,8 @@ public class DProtocol implements Runnable
 		addListener(ListenerIndex.MessageCounter, new DMessageCounter());
 	}
 	
-	public DProtocol(BufferedInputStream in, BufferedOutputStream out, 
-			Socket s, boolean detectBrokenSocket)
+	private DProtocol(BufferedInputStream in, BufferedOutputStream out,
+                      Socket s, boolean detectBrokenSocket)
 	{
 		this(in, out);
 		m_socket = s;
@@ -103,7 +103,7 @@ public class DProtocol implements Runnable
 	 * Set the base socket options
 	 * @throws SocketException
 	 */
-	static void applyBaseSocketSettings(Socket s) throws SocketException 
+	private static void applyBaseSocketSettings(Socket s) throws SocketException
 	{
 		// For performance reasons, it is very important that we setTcpNoDelay(true),
 		// thus disabling Nagle's algorithm.  Google for TCP_NODELAY or Nagle
@@ -115,13 +115,12 @@ public class DProtocol implements Runnable
 		s.setTcpNoDelay(true);		
 	}
 	
-	static DProtocol createDProtocolFromSocket(Socket s, boolean detectBrokenSocket) throws IOException
+	private static DProtocol createDProtocolFromSocket(Socket s, boolean detectBrokenSocket) throws IOException
 	{
 		BufferedInputStream in = new BufferedInputStream(s.getInputStream());
 		BufferedOutputStream out = new BufferedOutputStream(s.getOutputStream());
 
-		DProtocol dp = new DProtocol(in, out, s, detectBrokenSocket);
-		return dp;
+		return new DProtocol(in, out, s, detectBrokenSocket);
 	}
 
 	/**
@@ -160,13 +159,12 @@ public class DProtocol implements Runnable
 	 * @param n
 	 *            the listener
 	 */
-	public boolean addListener(ListenerIndex index, DProtocolNotifierIF n)
+	public void addListener(ListenerIndex index, DProtocolNotifierIF n)
 	{
 		synchronized (m_listeners)
 		{
 			m_listeners.put(index, n);
 		}
-		return true;
 	}
 
 	public long messagesReceived()		{ synchronized (this) { return m_msgRx; } }
@@ -471,9 +469,8 @@ public class DProtocol implements Runnable
 		int b1 = m_in.read();
 		int b2 = m_in.read();
 		int b3 = m_in.read();
-		
-		long value = ((b3 << 24) & 0xff000000) | ((b2 << 16) & 0xff0000) | ((b1 << 8) & 0xff00) | (b0 & 0xff);
-		return value;
+
+		return ((b3 << 24) & 0xff000000) | ((b2 << 16) & 0xff0000) | ((b1 << 8) & 0xff00) | (b0 & 0xff);
 	}
 
 	public DMessageCounter getMessageCounter()

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DStackContext.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DStackContext.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DStackContext.java
index a0b0519..dd2e5be 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DStackContext.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DStackContext.java
@@ -34,16 +34,16 @@ import flash.tools.debugger.Variable;
 
 public class DStackContext implements Frame
 {
-	private DModule		m_source;
-	private String		m_functionSignature;
+	private final DModule		m_source;
+	private final String		m_functionSignature;
 	private int			m_depth;
-	private int			m_module;
-	private int			m_line;
+	private final int			m_module;
+	private final int			m_line;
 	private DVariable	m_this;
-	private Map<String, DVariable> m_args;
-	private Map<String, DVariable> m_locals;
-	private List<DVariable>        m_scopeChain;
-	private DLocation	m_location;
+	private final Map<String, DVariable> m_args;
+	private final Map<String, DVariable> m_locals;
+	private final List<DVariable>        m_scopeChain;
+	private final DLocation	m_location;
 	private int			m_swfIndex; /* index of swf that we halted within (really part of location) */
 	private int			m_offset;   /* offset within swf where we halted. (really part of location) */
 	private boolean		m_populated;
@@ -114,7 +114,7 @@ public class DStackContext implements Frame
 	public String		getCallSignature()		{ return m_functionSignature; }
 	public int			getModule()				{ return m_module; }
 	public int			getLine()				{ return m_line; }
-	public DVariable	getThis()				{ return m_this; }
+	DVariable	getThis()				{ return m_this; }
 
 	/* setters */
 	void addArgument(DVariable v)				{ m_args.put(v.getName(), v); }

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DSuspendInfo.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DSuspendInfo.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DSuspendInfo.java
index bbe2502..3d967fb 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DSuspendInfo.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DSuspendInfo.java
@@ -27,11 +27,11 @@ import flash.tools.debugger.SuspendReason;
  */
 public class DSuspendInfo
 {
-	int m_reason;
-	int m_actionIndex;  // which script caused the halt
-	int m_offset;		// offset into the actions that the player has halted
-	int m_previousOffset;  // previous offset, if any, which lies on the same source line (-1 means unknown)
-	int m_nextOffset;  // next offset, if any, which lies on the same source line (-1 means unknown)
+	private final int m_reason;
+	private final int m_actionIndex;  // which script caused the halt
+	private final int m_offset;		// offset into the actions that the player has halted
+	private final int m_previousOffset;  // previous offset, if any, which lies on the same source line (-1 means unknown)
+	private final int m_nextOffset;  // next offset, if any, which lies on the same source line (-1 means unknown)
 
 	public DSuspendInfo()
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DSwfInfo.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DSwfInfo.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DSwfInfo.java
index 9f49c10..be8b931 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DSwfInfo.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DSwfInfo.java
@@ -34,9 +34,9 @@ import flash.util.IntMap;
 
 public class DSwfInfo implements SwfInfo
 {
-	private int			m_index;
+	private final int			m_index;
 	private long		m_id;
-	private IntMap		m_source;
+	private final IntMap		m_source;
 	private String		m_path;
 	private String		m_url;
 	private String		m_host;
@@ -95,12 +95,12 @@ public class DSwfInfo implements SwfInfo
 	public boolean		isPopulated()			{ return m_populated; }
 	public byte[]		getSwf()				{ return m_swf; }
 	public byte[]		getSwd()				{ return m_swd; }
-	public int			getSourceExpectedCount()	{ return m_scriptsExpected; }
+	int			getSourceExpectedCount()	{ return m_scriptsExpected; }
     public int          getVmVersion()          { return m_vmVersion;  }
 
 //	public int			getBreakpointCount() throws InProgressException	{ swdLoading(); return m_bpCount; }
 //	public int			getOffsetCount() 		{ swdLoading(); return m_offsetCount; }
-	public int			getSourceCount() 	{ return m_source.size(); }
+int			getSourceCount() 	{ return m_source.size(); }
 	public int			getFirstSourceId() 	{ return m_minId; }
 	public int			getLastSourceId() 	{ return m_maxId; }
 
@@ -150,7 +150,7 @@ public class DSwfInfo implements SwfInfo
 		if (isSwdLoading() && !isUnloaded())
 		{
 			// make the request 
-			try { ((PlayerSession)s).requestSwfInfo(m_index); } catch(NoResponseException nre) {}
+			try { ((PlayerSession)s).requestSwfInfo(m_index); } catch(NoResponseException ignored) {}
 
 			// I should now be complete
 			if (!m_swdLoading)
@@ -182,10 +182,7 @@ public class DSwfInfo implements SwfInfo
 		// our expectation has not been set and have not yet loaded our swd
 		if (expect == -1 && isSwdLoading())
 			yes = false;
-		else if (expect == have)
-			yes = true;
-		else
-			yes = false;
+		else yes = expect == have;
 
 		return yes;
 	}
@@ -231,7 +228,7 @@ public class DSwfInfo implements SwfInfo
 		return locateSourceLineEnd(l, -1);
 	}
 
-	public ActionLocation locateSourceLineEnd(ActionLocation l, int stopAt)
+	ActionLocation locateSourceLineEnd(ActionLocation l, int stopAt)
 	{
 		ActionLocation end = m_container.endOfSourceLine(l);
 		if (stopAt > -1 && end.at > stopAt)
@@ -261,7 +258,7 @@ public class DSwfInfo implements SwfInfo
 	 */
 
 	// temporary while we parse
-	DManager m_manager;
+    private DManager m_manager;
 
 	/**
 	 * Extracts information out of the SWF/SWD in order to populate

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java
index a022415..e9ca4ca 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java
@@ -60,7 +60,7 @@ public class DValue implements Value
 	/**
 	 * Either my own ID, or else my parent's ID if I am <code>__proto__</code>.
 	 */
-	long				m_nonProtoId;
+    private long				m_nonProtoId;
 
 	/**
 	 * <code>m_value</code> can have one of several possible meanings:
@@ -106,7 +106,7 @@ public class DValue implements Value
 	 */
 	public DValue(long id)
 	{
-		init(VariableType.UNKNOWN, null, null, 0, new Long(id));
+		init(VariableType.UNKNOWN, null, null, 0, id);
 	}
 
 	/**
@@ -264,12 +264,9 @@ public class DValue implements Value
 		if (count > 0)
 		{
 			count = 0;
-			Iterator<DVariable> itr = m_members.values().iterator();
-			while(itr.hasNext())
-			{
-				DVariable  sf = itr.next();
-				ar[count++] = sf;
-			}
+            for (DVariable sf : m_members.values()) {
+                ar[count++] = sf;
+            }
 
 			// sort the member list by name
 			Arrays.sort(ar);
@@ -302,15 +299,11 @@ public class DValue implements Value
 					((PlayerSession)s).obtainMembers(id);
 				if (m_members != null)
 				{
-					Iterator<DVariable> iter = m_members.values().iterator();
-					while (iter.hasNext())
-					{
-						Object next = iter.next();
-						if (next instanceof DVariable)
-						{
-							((DVariable)next).setSession(s);
-						}
-					}
+                    for (DVariable next : m_members.values()) {
+                        if (next instanceof DVariable) {
+                            ((DVariable) next).setSession(s);
+                        }
+                    }
 				}
 			}
 		}
@@ -465,13 +458,10 @@ public class DValue implements Value
 			sb.append(PlayerSessionManager.getLocalizationManager().getLocalizedTextString("empty")); //$NON-NLS-1$
 		else
 		{
-			Iterator<DVariable> itr = m_members.values().iterator();
-			while(itr.hasNext())
-			{
-				DVariable  sf = itr.next();
-				sb.append(sf);
-				sb.append(",\n"); //$NON-NLS-1$
-			}
+            for (DVariable sf : m_members.values()) {
+                sb.append(sf);
+                sb.append(",\n"); //$NON-NLS-1$
+            }
 		}
 		return sb.toString();
 	}
@@ -492,15 +482,12 @@ public class DValue implements Value
 			return new DVariable[0];
 		
 		ArrayList<DVariable> finalList = new ArrayList<DVariable>();
+
+        for (List<DVariable> varList : m_inheritedPrivates.values()) {
+            finalList.addAll(varList);
+        }
 		
-		Iterator<List<DVariable>> itr = m_inheritedPrivates.values().iterator();
-		while(itr.hasNext())
-		{
-			List<DVariable>  varList = itr.next();
-			finalList.addAll(varList);
-		}
-		
-		DVariable[] ar = finalList.toArray(new DVariable[0]);
+		DVariable[] ar = finalList.toArray(new DVariable[finalList.size()]);
 		// sort the member list by name
 		Arrays.sort(ar);
 
@@ -512,7 +499,7 @@ public class DValue implements Value
 			return new DVariable[0];
 		List<DVariable> list = m_inheritedPrivates.get(name);
 		if (list != null) {
-			return list.toArray(new Variable[0]);
+			return list.toArray(new Variable[list.size()]);
 		}
 		return new DVariable[0];
 	}

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DVariable.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DVariable.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DVariable.java
index e991e66..ef399e8 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DVariable.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DVariable.java
@@ -39,7 +39,7 @@ public class DVariable implements Variable, Comparable
 	 * might be <code>mynamespace@12345678::myvar</code>, which indicates that
 	 * the variable is in namespace "mynamespace", which has atom 12345678.
 	 */
-	private String		m_rawName;
+	private final String		m_rawName;
 
 	/** Just name, without namespace */
 	private String		m_name;
@@ -53,7 +53,7 @@ public class DVariable implements Variable, Comparable
 	/**
 	 * The variable's value.
 	 */
-	protected Value		m_value;
+    private Value		m_value;
 
 	/**
 	 * Whether we have fired the getter for this value.  Only applicable if
@@ -221,13 +221,13 @@ public class DVariable implements Variable, Comparable
 		if ((att & VariableAttribute.SCOPE_MASK) == att)
 			return (getScope() == att);
 		else
-			return ( ( (getAttributes() & att) == att) ? true : false );
+			return (((getAttributes() & att) == att));
 	}
 
 	public void clearAttribute(int att)
 	{
 		if ((att & VariableAttribute.SCOPE_MASK) == att)
-			m_attribs = (m_attribs & ~VariableAttribute.SCOPE_MASK) | VariableAttribute.PUBLIC_SCOPE;
+			m_attribs = (m_attribs & ~VariableAttribute.SCOPE_MASK);
 		else
 			m_attribs &= ~att;
 	}
@@ -385,33 +385,33 @@ public class DVariable implements Variable, Comparable
 	 * These values are obtained directly from the Player.
 	 * See ScriptObject in splay.h.
 	 */
-	public static final int kNormalObjectType			= 0;
-	public static final int kXMLSocketObjectType		= 1;
-	public static final int kTextFieldObjectType		= 2;
-	public static final int kButtonObjectType			= 3;
-	public static final int kNumberObjectType			= 4;
-	public static final int kBooleanObjectType			= 5;
-	public static final int kNativeStringObject			= 6;
-	public static final int kNativeArrayObject			= 7;
-	public static final int kDateObjectType				= 8;
-	public static final int kSoundObjectType			= 9;
-	public static final int kNativeXMLDoc				= 10;
-	public static final int kNativeXMLNode				= 11;
-	public static final int kNativeCameraObject			= 12;
-	public static final int kNativeMicrophoneObject		= 13;
-	public static final int kNativeCommunicationObject	= 14;
-	public static final int kNetConnectionObjectType  	= 15;
-	public static final int kNetStreamObjectType		= 16;
-	public static final int kVideoObjectType			= 17;
-	public static final int kTextFormatObjectType		= 18;
-	public static final int kSharedObjectType			= 19;
-	public static final int kSharedObjectDataType		= 20;
-	public static final int kPrintJobObjectType			= 21;
-	public static final int kMovieClipLoaderObjectType	= 22;
-	public static final int kStyleSheetObjectType		= 23;
-	public static final int kFapPacketDummyObject		= 24;
-	public static final int kLoadVarsObject				= 25;
-	public static final int kTextSnapshotType			= 26;
+	private static final int kNormalObjectType			= 0;
+	private static final int kXMLSocketObjectType		= 1;
+	private static final int kTextFieldObjectType		= 2;
+	private static final int kButtonObjectType			= 3;
+	private static final int kNumberObjectType			= 4;
+	private static final int kBooleanObjectType			= 5;
+	private static final int kNativeStringObject			= 6;
+	private static final int kNativeArrayObject			= 7;
+	private static final int kDateObjectType				= 8;
+	private static final int kSoundObjectType			= 9;
+	private static final int kNativeXMLDoc				= 10;
+	private static final int kNativeXMLNode				= 11;
+	private static final int kNativeCameraObject			= 12;
+	private static final int kNativeMicrophoneObject		= 13;
+	private static final int kNativeCommunicationObject	= 14;
+	private static final int kNetConnectionObjectType  	= 15;
+	private static final int kNetStreamObjectType		= 16;
+	private static final int kVideoObjectType			= 17;
+	private static final int kTextFormatObjectType		= 18;
+	private static final int kSharedObjectType			= 19;
+	private static final int kSharedObjectDataType		= 20;
+	private static final int kPrintJobObjectType			= 21;
+	private static final int kMovieClipLoaderObjectType	= 22;
+	private static final int kStyleSheetObjectType		= 23;
+	private static final int kFapPacketDummyObject		= 24;
+	private static final int kLoadVarsObject				= 25;
+	private static final int kTextSnapshotType			= 26;
 
 	public static String classNameFor(long clsType, boolean isMc)
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/DWatch.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/DWatch.java b/modules/debugger/src/java/flash/tools/debugger/concrete/DWatch.java
index 85679fb..a7704b2 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/DWatch.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/DWatch.java
@@ -26,10 +26,10 @@ import flash.tools.debugger.Watch;
  */
 public class DWatch implements Watch
 {
-	long		m_parentValueId;
-	String		m_rawMemberName; // corresponds to Variable.getRawName()
-	int			m_kind;
-	int			m_tag;
+	private final long		m_parentValueId;
+	private final String		m_rawMemberName; // corresponds to Variable.getRawName()
+	private final int			m_kind;
+	private final int			m_tag;
 
 	public DWatch(long id, String name, int kind, int tag)
 	{

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/GetVariableFlag.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/GetVariableFlag.java b/modules/debugger/src/java/flash/tools/debugger/concrete/GetVariableFlag.java
index e5b8402..0a06192 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/GetVariableFlag.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/GetVariableFlag.java
@@ -28,7 +28,7 @@ package flash.tools.debugger.concrete;
  *
  * @author mmorearty
  */
-public interface GetVariableFlag
+interface GetVariableFlag
 {
 	/**
 	 * Indicates that if the variable which is being retrieved is a

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dcc40468/modules/debugger/src/java/flash/tools/debugger/concrete/LineFunctionContainer.java
----------------------------------------------------------------------
diff --git a/modules/debugger/src/java/flash/tools/debugger/concrete/LineFunctionContainer.java b/modules/debugger/src/java/flash/tools/debugger/concrete/LineFunctionContainer.java
index 7d09166..e30eaea 100644
--- a/modules/debugger/src/java/flash/tools/debugger/concrete/LineFunctionContainer.java
+++ b/modules/debugger/src/java/flash/tools/debugger/concrete/LineFunctionContainer.java
@@ -35,7 +35,7 @@ import flash.util.Trace;
  * action list in order to extract line/function
  * mapping information.
  */
-public class LineFunctionContainer extends SwfActionContainer
+class LineFunctionContainer extends SwfActionContainer
 {
     public LineFunctionContainer(byte[] swf, byte[] swd)
 	{


Mime
View raw message