Merge remote-tracking branch 'origin/master' into retina

slluis · slluis · commit cdab0bdf64ae · 2014-04-04T18:38:30.000+02:00
Conflicts:
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
	profiles/mac
	version-checks
diff --git a/.gitmodules b/.gitmodules
@@ -35,6 +35,10 @@
 [submodule "main/external/guiunit"]
 	path = main/external/guiunit
 	url = git://github.com/mono/guiunit.git
+[submodule "main/external/fsharpbinding"]
+	path = main/external/fsharpbinding
+	url = git://github.com/fsharp/fsharpbinding.git
+	branch = vnext
 [submodule "main/external/raygun4net"]
 	path = main/external/raygun4net
 	url = git://github.com/mono/raygun4net.git
diff --git a/configure b/configure
@@ -154,6 +154,15 @@ configure_packages ()
 		else
 			enable_tests=" "
 		fi
+
+		builddir=`pwd`/$path/build
+		for p in $ops ; do
+			arg=`echo $p | cut -d '=' -f 1`
+			if [ $arg == "--addins-dir" ] ; then
+				builddir=`pwd`/$path/`echo $p | cut -d '=' -f 2`
+			fi
+		done
+
 		title="Configuring package: $path"
 		nc=`echo $title | wc -m`
 		echo $title
@@ -164,14 +173,16 @@ configure_packages ()
 			sct="./autogen.sh $enable_tests"
 		elif test -a $path/configure; then
 			sct=./configure
+		elif test -a $path/configure.sh; then
+			sct=./configure.sh
 		else
 			echo Configuration script not found in directory: $p
 			exit 1
 		fi
 		pushd $path > /dev/null
 		PKG_CONFIG_PATH=$localconf:$PKG_CONFIG_PATH $sct --prefix=$prefix $ops || handle_config_error
 		popd > /dev/null
-		create_local_config $path
+		create_local_config $path $builddir
 		packages="$packages $path"
 	done
 	rm -f local-config/main.addins
@@ -189,14 +200,14 @@ create_local_config ()
 
 	# Copy the .pc file to local-config, and set the base lib directory
 	mkdir -p local-config
-	builddir=`pwd`/$path/build
+	builddir=$2
 	for f in `ls $1/*.pc.in 2>/dev/null`; do
 		pcfile=`echo $f | sed s,.*/,, | sed s/\.in$//`
 		sed -e s,libdir=.*,libdir=$builddir, -e s/@VERSION@/$ver/g $f> local-config/$pcfile
 	done
 	
 	# Generate the .addins file for the package
-	addins=local-config/`echo $path | sed s,/,_,`.addins
+	addins=local-config/`echo $path | sed s,/,_,g`.addins
 	echo "<Addins>" > $addins
 	echo "  <Directory include-subdirs=\"true\">$builddir</Directory>" >> $addins
 	echo "</Addins>" >> $addins
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am
@@ -51,6 +51,7 @@ app: monostub
 	@echo "Copying MonoDevelop into app bundle"
 	@echo ""
 	cp -pR ../AddIns $(MAC_APP_LIB_DIR)
+	cp -pR ../../external/fsharpbinding/monodevelop/bin/mac-linux/Debug $(MAC_APP_LIB_DIR)/AddIns/fsharpbinding
 	cp -pR ../data $(MAC_APP_LIB_DIR)
 	cp -pR ../bin $(MAC_APP_LIB_DIR)
 	cp -pR ../locale $(MAC_APP_DIR)/Contents/MacOS/share
diff --git a/main/external/fsharpbinding b/main/external/fsharpbinding
@@ -0,0 +1 @@
+Subproject commit b19b55a7d7146baa55f57f0a175f1eb3ae13e94d
diff --git a/main/external/xwt b/main/external/xwt
@@ -1 +1 @@
-Subproject commit 75eedee6ab41417820f7f01db95ba3b52f8a0fc7
+Subproject commit 6f9bfacdf76f992c1d998a2b1efe1065dc156e0a
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
@@ -8,7 +8,7 @@
 		<_Name>Empty Web Application</_Name>
 		<_Category>ASP.NET</_Category>
 		<Icon>md-project-web</Icon>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates an empty ASP.NET Web Application project.</_Description>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
@@ -8,7 +8,7 @@
 		<_Name>Web Application</_Name>
 		<_Category>ASP.NET</_Category>
 		<Icon>md-project-web</Icon>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates a new ASP.NET Web Application project.</_Description>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
@@ -338,7 +338,7 @@ void OnBreakpoint (object sender, CorBreakpointEventArgs e)
 				binfo.IncrementHitCount();
 				if (!binfo.HitCountReached)
 					return;
-				
+
 				if (!string.IsNullOrEmpty (bp.ConditionExpression)) {
 					string res = EvaluateExpression (e.Thread, bp.ConditionExpression);
 					if (bp.BreakIfConditionChanges) {
@@ -404,6 +404,7 @@ void OnProcessExit (object sender, CorProcessEventArgs e)
 			// If the main thread stopped, terminate the debugger session
 			if (e.Process.Id == process.Id) {
 				lock (terminateLock) {
+					process.Dispose ();
 					process = null;
 					ThreadPool.QueueUserWorkItem (delegate
 					{
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MtaThread.cs
@@ -62,6 +62,9 @@ static void MtaRunner ()
 					catch (Exception ex) {
 						workError = ex;
 					}
+					finally {
+						workDelegate = null;
+					}
 					wordDoneEvent.Set ();
 				}
 				while (Monitor.Wait (threadLock, 60000));
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -272,7 +272,7 @@ public static bool IsFeatureSupported (DebuggerFeatures feature)
 		public static DebuggerFeatures GetSupportedFeatures (IBuildTarget target)
 		{
 			var fc = new FeatureCheckerHandlerFactory ();
-			var ctx = new ExecutionContext (fc, null);
+			var ctx = new ExecutionContext (fc, null, IdeApp.Workspace.ActiveExecutionTarget);
 
 			target.CanExecute (ctx, IdeApp.Workspace.ActiveConfiguration);
 
@@ -378,6 +378,7 @@ static void Cleanup ()
 				busyStatusIcon = null;
 				session = null;
 				console = null;
+				pinnedWatches.InvalidateAll ();
 			}
 
 			if (oldLayout != null) {
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
@@ -38,7 +38,7 @@ public static class Extensions
 	{
 		public static bool CanDebug (this ProjectOperations opers, IBuildTarget entry)
 		{
-			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecute (entry, context);
 		}
 
@@ -56,13 +56,13 @@ public static IAsyncOperation Debug (this ProjectOperations opers, IBuildTarget
 
 		public static bool CanDebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecuteFile (file, context);
 		}
 
 		public static IAsyncOperation DebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.ExecuteFile (file, context);
 		}
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -239,6 +239,10 @@ protected override void OnDestroyed ()
 			crtValue.Edited -= OnValueEdited;
 			crtValue.EditingCanceled -= OnEditingCancelled;
 
+			typeCol.RemoveNotification ("width", OnColumnWidthChanged);
+			valueCol.RemoveNotification ("width", OnColumnWidthChanged);
+			expCol.RemoveNotification ("width", OnColumnWidthChanged);
+
 			disposed = true;
 			cancellationTokenSource.Cancel ();
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
@@ -66,8 +66,10 @@ void CurrentFrameChanged (object sender, EventArgs e)
 
 		void TargetProcessExited (object sender, EventArgs e)
 		{
-			if (tooltip != null)
-				tooltip.Hide ();
+			if (tooltip != null) {
+				tooltip.Destroy ();
+				tooltip = null;
+			}
 		}
 
 		#region ITooltipProvider implementation
diff --git a/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs b/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
@@ -121,7 +121,7 @@ NunitTestInfo BuildTestInfo (Test test)
 			string tname = test.TestName.Name;
 			// Find the last index of the dot character that is not a part of the test parameters
 			int j = tname.IndexOf ('(');
-			int i = tname.LastIndexOf ('.', (j == -1) ? (tname.Length - 1) : j);
+			int i = tname.LastIndexOf ('.', (j == -1) ? 0 : j);
 			if (i != -1)
 				tname = tname.Substring (i + 1);
 			if (test.FixtureType != null) {
diff --git a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
@@ -7,7 +7,7 @@
 		<_Category>NUnit</_Category>
 		<Icon>md-project|res:project-nunit-overlay-light-32.png</Icon>
 		<_Description>Creates an NUnit library</_Description>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<DefaultFilename>NUnitProject</DefaultFilename>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml b/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml
@@ -5,7 +5,7 @@
 		<_Name>Test Fixture</_Name>
 		<Icon>md-file-unit-test</Icon>
 		<_Category>NUnit</_Category>
-		<LanguageName>*</LanguageName>
+		<LanguageName>C#,VBNet</LanguageName>
 		<_Description>Creates a Test Fixture.</_Description>
 		<DefaultFilename>NUnitTestClass</DefaultFilename>
 	</TemplateConfiguration>
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
@@ -2800,6 +2800,7 @@ public void HideTooltip (bool checkMouseOver = true)
 				}
 				tipWindow.Destroy ();
 				tipWindow = null;
+				tipItem = null;
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
@@ -1651,6 +1651,11 @@ IEnumerable<MSBuildExtension> GetMSBuildExtensions ()
 			}
 		}
 
+		IEnumerable<MSBuildExtension> GetMSBuildExtensions ()
+		{
+			return AddinManager.GetExtensionObjects<MSBuildExtension> ("/MonoDevelop/ProjectModel/MSBuildExtensions");
+		}
+
 		void ReadBuildItemMetadata (DataSerializer ser, MSBuildItem buildItem, object dataItem, Type extendedType)
 		{
 			DataItem ditem = new DataItem ();
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs
@@ -79,7 +79,7 @@ protected override void Execute (IProgressMonitor monitor, SolutionEntityItem en
 		{
 			SolutionItemConfiguration conf = entry.GetConfiguration (configuration) as SolutionItemConfiguration;
 			if (conf != null) {
-				ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory);
+				ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget);
 				
 				if (conf.CustomCommands.CanExecute (entry, CustomCommandType.BeforeExecute, localContext, configuration))
 					conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.BeforeExecute, localContext, configuration);
@@ -91,7 +91,7 @@ protected override void Execute (IProgressMonitor monitor, SolutionEntityItem en
 			base.Execute (monitor, entry, context, configuration);
 			
 			if (conf != null && !monitor.IsCancelRequested) {
-				ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory);
+				ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget);
 				
 				if (conf.CustomCommands.CanExecute (entry, CustomCommandType.AfterExecute, localContext, configuration))
 					conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.AfterExecute, localContext, configuration);
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs
@@ -38,14 +38,14 @@ public sealed class ExecutionContext
 		IConsoleFactory consoleFactory;
 		ExecutionTarget executionTarget;
 		
-		public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target = null)
+		public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target)
 		{
 			this.executionHandler = executionMode.ExecutionHandler;
 			this.consoleFactory = consoleFactory;
 			this.executionTarget = target;
 		}
 		
-		public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target = null)
+		public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target)
 		{
 			this.executionHandler = executionHandler;
 			this.consoleFactory = consoleFactory;
diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_2_0.xml
@@ -74,5 +74,6 @@
   <Assembly name="Mono.Tasklets" version="2.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="Mono.Web" version="2.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="RabbitMQ.Client" version="2.0.0.0" publicKeyToken="b03f5f7f11d50a3a" />
+  <Assembly name="FSharp.Core" />
 </Assemblies>
 </TargetFramework>
diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_3_5_client.xml
@@ -54,5 +54,6 @@
   <Assembly name="System.ServiceModel.Web" version="3.5.0.0" publicKeyToken="31bf3856ad364e35" />
   <Assembly name="System.Windows.Presentation" version="3.5.0.0" publicKeyToken="b77a5c561934e089" />
   <Assembly name="System.Xml.Linq" version="3.5.0.0" publicKeyToken="b77a5c561934e089" />
+  <Assembly name="FSharp.Core" />
 </Assemblies>
 </TargetFramework>
diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0.xml
@@ -142,6 +142,7 @@
   <Assembly name="Mono.Tasklets" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="Mono.Web" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="RabbitMQ.Client" version="4.0.0.0" publicKeyToken="b03f5f7f11d50a3a" />
+  <Assembly name="FSharp.Core" />
 
   <!-- the following assemblies were added by Mono, but don't seem to exist any more -->
   <Assembly name="Mono.WebServer" />
diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_0_client.xml
@@ -80,5 +80,6 @@
   <Assembly name="System.Device" version="4.0.0.0" publicKeyToken="b77a5c561934e089" />
   <Assembly name="System.Speech" version="4.0.0.0" publicKeyToken="31bf3856ad364e35" />
   <Assembly name="System.Windows.Input.Manipulations" version="4.0.0.0" publicKeyToken="b77a5c561934e089" />
+  <Assembly name="FSharp.Core" />
 </Assemblies>
 </TargetFramework>
diff --git a/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml b/main/src/core/MonoDevelop.Core/frameworks/framework_NET_4_5.xml
@@ -158,6 +158,7 @@
   <Assembly name="Mono.Tasklets" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="Mono.Web" version="4.0.0.0" publicKeyToken="0738eb9f132ed756" />
   <Assembly name="RabbitMQ.Client" version="4.0.0.0" publicKeyToken="b03f5f7f11d50a3a" />
+  <Assembly name="FSharp.Core" />
 
   <!-- the following assemblies were added by Mono, but don't seem to exist any more -->
   <Assembly name="Mono.WebServer" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/StartupOptionsPanel.cs
@@ -55,7 +55,7 @@ public StartupOptionsPanelWidget (Solution sol)
 					bool matched = false;
 					foreach (IExecutionMode mode in mset.ExecutionModes) {
 						foreach (SolutionConfiguration sc in sol.Configurations) {
-							if (it.CanExecute (new ExecutionContext (mode, null), sc.Selector)) {
+							if (it.CanExecute (new ExecutionContext (mode, null, IdeApp.Workspace.ActiveExecutionTarget), sc.Selector)) {
 								startupItems.Add (it);
 								matched = true;
 								break;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -1026,7 +1026,7 @@ public bool CanExecuteFile (string file)
 		
 		public bool CanExecuteFile (string file, IExecutionHandler handler)
 		{
-			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return CanExecuteFile (file, context);
 		}
 		
@@ -1048,7 +1048,7 @@ public bool CanExecuteFile (string file, ExecutionContext context)
 		
 		public IAsyncOperation ExecuteFile (string file, IExecutionHandler handler)
 		{
-			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors);
+			ExecutionContext context = new ExecutionContext (handler, IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
 			return ExecuteFile (file, context);
 		}
 		
diff --git a/profiles/mac b/profiles/mac
@@ -1 +1,2 @@
 main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests
+main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ static void MtaRunner ()`
`62`	`62`	`catch (Exception ex) {`
`63`	`63`	`workError = ex;`
`64`	`64`	`}`
	`65`	`+ finally {`
	`66`	`+ workDelegate = null;`
	`67`	`+ }`
`65`	`68`	`wordDoneEvent.Set ();`
`66`	`69`	`}`
`67`	`70`	`while (Monitor.Wait (threadLock, 60000));`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public static bool IsFeatureSupported (DebuggerFeatures feature)`
`272`	`272`	`public static DebuggerFeatures GetSupportedFeatures (IBuildTarget target)`
`273`	`273`	`{`
`274`	`274`	`var fc = new FeatureCheckerHandlerFactory ();`
`275`		`- var ctx = new ExecutionContext (fc, null);`
	`275`	`+ var ctx = new ExecutionContext (fc, null, IdeApp.Workspace.ActiveExecutionTarget);`
`276`	`276`
`277`	`277`	`target.CanExecute (ctx, IdeApp.Workspace.ActiveConfiguration);`
`278`	`278`
`@@ -378,6 +378,7 @@ static void Cleanup ()`
`378`	`378`	`busyStatusIcon = null;`
`379`	`379`	`session = null;`
`380`	`380`	`console = null;`
	`381`	`+ pinnedWatches.InvalidateAll ();`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`if (oldLayout != null) {`