Kaynağa Gözat

editor modules的namespace去掉modules前缀

tanghai 12 yıl önce
ebeveyn
işleme
637c814562

+ 4 - 4
CSharp/App/Editor/Bootstrapper.cs

@@ -3,10 +3,10 @@ using System.Windows;
 using Infrastructure;
 using Microsoft.Practices.Prism.MefExtensions;
 using Microsoft.Practices.Prism.Regions;
-using Modules.Tree;
-using Modules.Robot;
-using Modules.Login;
-using Modules.WCFClient;
+using Tree;
+using Robot;
+using Login;
+using WCFClient;
 
 namespace Editor
 {

+ 1 - 1
CSharp/App/Modules/Login/LoginModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Practices.Prism.MefExtensions.Modularity;
 using Microsoft.Practices.Prism.Modularity;
 
-namespace Modules.Login
+namespace Login
 {
 	[ModuleExport(moduleType: typeof (LoginModule))]
 	public class LoginModule: IModule

+ 2 - 2
CSharp/App/Modules/Login/LoginView.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="Modules.Login.LoginView"
+<UserControl x:Class="Login.LoginView"
 		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
 		xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" 
-		xmlns:Login="clr-namespace:Modules.Login"
+		xmlns:Login="clr-namespace:Login"
 		mc:Ignorable="d" 
 		d:DesignHeight="300" d:DesignWidth="300" 
 		d:DataContext="{d:DesignInstance Login:LoginViewModel}">

+ 1 - 1
CSharp/App/Modules/Login/LoginView.xaml.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using Infrastructure;
 
-namespace Modules.Login
+namespace Login
 {
 	/// <summary>
 	/// LoginView.xaml 的交互逻辑

+ 1 - 1
CSharp/App/Modules/Login/LoginViewModel.cs

@@ -9,7 +9,7 @@ using Log;
 using Microsoft.Practices.Prism.Events;
 using Microsoft.Practices.Prism.ViewModel;
 
-namespace Modules.Login
+namespace Login
 {
 	[Export(contractType: typeof (LoginViewModel)),
 		PartCreationPolicy(creationPolicy: CreationPolicy.NonShared)]

+ 1 - 1
CSharp/App/Modules/Robot/ComboBoxForbiddenType.cs

@@ -1,5 +1,5 @@
 
-namespace Modules.Robot
+namespace Robot
 {
 	public class ComboBoxForbiddenType
 	{

+ 1 - 1
CSharp/App/Modules/Robot/NumValidation.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace Modules.Robot
+namespace Robot
 {
 	public class NumValidation : ValidationRule
 	{

+ 1 - 1
CSharp/App/Modules/Robot/Robot.cs

@@ -1,4 +1,4 @@
-namespace Modules.Robot
+namespace Robot
 {
 	public class Robot
 	{

+ 1 - 1
CSharp/App/Modules/Robot/RobotModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Practices.Prism.MefExtensions.Modularity;
 using Microsoft.Practices.Prism.Modularity;
 
-namespace Modules.Robot
+namespace Robot
 {
 	[ModuleExport(moduleType: typeof (RobotModule))]
 	public class RobotModule: IModule

+ 2 - 2
CSharp/App/Modules/Robot/RobotView.xaml

@@ -3,8 +3,8 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-		xmlns:Robot="clr-namespace:Modules.Robot"
-		x:Class="Modules.Robot.RobotView"
+		xmlns:Robot="clr-namespace:Robot"
+		x:Class="Robot.RobotView"
 		mc:Ignorable="d" 
 		d:DesignHeight="750" d:DesignWidth="1280" d:DataContext="{d:DesignInstance {x:Type Robot:RobotViewModel}}">
 	<UserControl.Resources>

+ 1 - 1
CSharp/App/Modules/Robot/RobotView.xaml.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.Composition;
 using System.Windows;
 using Infrastructure;
 
-namespace Modules.Robot
+namespace Robot
 {
 	/// <summary>
 	/// RobotView.xaml 的交互逻辑

+ 1 - 1
CSharp/App/Modules/Robot/RobotViewModel.cs

@@ -12,7 +12,7 @@ using Log;
 using Microsoft.Practices.Prism.Events;
 using Microsoft.Practices.Prism.ViewModel;
 
-namespace Modules.Robot
+namespace Robot
 {
 	[Export(contractType: typeof (RobotViewModel)),
 		PartCreationPolicy(creationPolicy: CreationPolicy.Shared)]

+ 1 - 1
CSharp/App/Modules/Robot/ServerViewModel.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Practices.Prism.ViewModel;
 
-namespace Modules.Robot
+namespace Robot
 {
 	[DataContract]
 	public class ServerViewModel : NotificationObject

+ 1 - 1
CSharp/App/Modules/Tree/BehaviorTreeLayout.cs

@@ -1,6 +1,6 @@
 using Log;
 
-namespace Modules.Tree
+namespace Tree
 {
 	public static class BehaviorTreeLayout
 	{

+ 1 - 1
CSharp/App/Modules/Tree/BehaviorTreeModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Practices.Prism.MefExtensions.Modularity;
 using Microsoft.Practices.Prism.Modularity;
 
-namespace Modules.Tree
+namespace Tree
 {
 	[ModuleExport(moduleType: typeof (BehaviorTreeModule))]
 	public class BehaviorTreeModule: IModule

+ 2 - 2
CSharp/App/Modules/Tree/BehaviorTreeView.xaml

@@ -2,8 +2,8 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-		xmlns:BehaviorTree="clr-namespace:Modules.Tree" 
-		x:Class="Modules.Tree.BehaviorTreeView"
+		xmlns:BehaviorTree="clr-namespace:Tree" 
+		x:Class="Tree.BehaviorTreeView"
 		mc:Ignorable="d" 
 		d:DesignHeight="600" 
 		d:DesignWidth="800" 

+ 1 - 1
CSharp/App/Modules/Tree/BehaviorTreeView.xaml.cs

@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Input;
 using Infrastructure;
 
-namespace Modules.Tree
+namespace Tree
 {
 	/// <summary>
 	/// BehaviorTreeView.xaml 的交互逻辑

+ 1 - 1
CSharp/App/Modules/Tree/BehaviorTreeViewModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 
-namespace Modules.Tree
+namespace Tree
 {
 	[Export(contractType: typeof (BehaviorTreeViewModel)),
 		PartCreationPolicy(creationPolicy: CreationPolicy.NonShared)]

+ 1 - 1
CSharp/App/Modules/Tree/TreeNode.cs

@@ -1,4 +1,4 @@
-namespace Modules.Tree
+namespace Tree
 {
 	public class TreeNode
 	{

+ 1 - 1
CSharp/App/Modules/Tree/TreeNodeViewModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using Microsoft.Practices.Prism.ViewModel;
 
-namespace Modules.Tree
+namespace Tree
 {
 	public class TreeNodeViewModel: NotificationObject
 	{

+ 1 - 1
CSharp/App/Modules/WCFClient/WCFClientModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Practices.Prism.MefExtensions.Modularity;
 using Microsoft.Practices.Prism.Modularity;
 
-namespace Modules.WCFClient
+namespace WCFClient
 {
 	[ModuleExport(moduleType: typeof(WCFClientModule))]
 	public class WCFClientModule : IModule

+ 1 - 1
CSharp/App/Modules/WCFClient/WCFClientView.xaml

@@ -3,7 +3,7 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-		x:Class="Modules.WCFClient.WCFClientView" 
+		x:Class="WCFClient.WCFClientView" 
 		mc:Ignorable="d" 
 		d:DesignHeight="300" d:DesignWidth="300">
 	<Grid>

+ 1 - 1
CSharp/App/Modules/WCFClient/WCFClientView.xaml.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.Composition;
 using Infrastructure;
 
-namespace Modules.WCFClient
+namespace WCFClient
 {
 	/// <summary>
 	/// WCFClientView.xaml 的交互逻辑

+ 1 - 1
CSharp/App/Modules/WCFClient/WCFClientViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.Composition;
 
-namespace Modules.WCFClient
+namespace WCFClient
 {
 	[Export(contractType: typeof(WCFClientViewModel)),
 		PartCreationPolicy(creationPolicy: CreationPolicy.NonShared)]