More fixes from FxCop

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1621 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs

@@ -9,16 +9,18 @@
 //------------------------------------------------------------------------------
 
 using System;
-
 using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Design;
+using System.Windows.Forms.Design;
 
+using SharpReport.Designer;
 using SharpReportCore;
+
 //using System.Windows.Forms;
-using System.Windows.Forms.Design;
 
-using SharpReport.Designer;
+
+
 	/// <summary>
 	/// 
 	/// </summary>

src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs

@@ -51,7 +51,7 @@ namespace SharpReport{
 		#region privates
 		
 		private ConnectionObject BuildConnectionObject (ReportSettings settings) {
-			if (settings.ReportType == GlobalEnums.enmReportType.DataReport) {
+			if (settings.ReportType == GlobalEnums.ReportTypeEnum.DataReport) {
 				try {
 					if (settings.ConnectionString.Length > 0) {
 						return new ConnectionObject(settings.ConnectionString);
@@ -75,20 +75,20 @@ namespace SharpReport{
 		private ColumnCollection ReadColumnCollection() {
 			ColumnCollection columnCollecion = new ColumnCollection();
 			switch (baseDesignerControl.ReportModel.DataModel) {
-				case GlobalEnums.enmPushPullModel.FormSheet:
+				case GlobalEnums.PushPullModelEnum.FormSheet:
 					//Plain FormSheet we do nothing for the moment
 					break;
-				case GlobalEnums.enmPushPullModel.PushData:
+				case GlobalEnums.PushPullModelEnum.PushData:
 					//PushData
 					columnCollecion = base.CollectFieldsFromModel(this.baseDesignerControl.ReportModel);
 					break;
-				case GlobalEnums.enmPushPullModel.PullData:
+				case GlobalEnums.PushPullModelEnum.PullData:
 					// PullData, query the Datasource and ask for the available Fields
 					if (base.ConnectionObject == null) {
 						base.ConnectionObject = this.BuildConnectionObject(baseDesignerControl.ReportModel.ReportSettings);
 					}
 
-					if (this.baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.enmPushPullModel.PullData)){
+					if (this.baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.PushPullModelEnum.PullData)){
 						try {
 							using (DataManager dataManager = new DataManager(base.ConnectionObject,
 							                                                 baseDesignerControl.ReportModel.ReportSettings)) {

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs

@@ -231,15 +231,15 @@ namespace SharpReportAddin{
 			base.OnSaving(EventArgs.Empty);
 			try {
 				switch (designerControl.ReportModel.DataModel) {
-						case GlobalEnums.enmPushPullModel.FormSheet : {
+						case GlobalEnums.PushPullModelEnum.FormSheet : {
 							PreviewStandartReport(standAlone);
 							break;
 						}
-						case GlobalEnums.enmPushPullModel.PullData:{
+						case GlobalEnums.PushPullModelEnum.PullData:{
 							PreviewStandartReport(standAlone);
 							break;
 						}
-						case GlobalEnums.enmPushPullModel.PushData:{
+						case GlobalEnums.PushPullModelEnum.PushData:{
 							PreviewPushReport (standAlone);
 							break;
 						}
@@ -560,7 +560,7 @@ namespace SharpReportAddin{
 		public System.Drawing.Printing.PrintDocument PrintDocument {
 			get {
 				AbstractRenderer renderer;
-				if (this.designerControl.ReportModel.DataModel == GlobalEnums.enmPushPullModel.PushData) {
+				if (this.designerControl.ReportModel.DataModel == GlobalEnums.PushPullModelEnum.PushData) {
 					renderer = reportManager.GetRendererForPushDataReports(this.designerControl.ReportModel,
 					                                                       SharpReportView.DataSetFromFile());
 					

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs

@@ -21,14 +21,18 @@ using System.Globalization;
 /// </remarks>
 
 namespace SharpReportCore {
+	
+	
 	public class BaseImageItem : SharpReportCore.BaseGraphicItem {
 		
 		/// <summary>
-		/// Default constructor - initializes all fields to default values
+		/// Default constructor 
 		/// </summary>
+		
 		string fileName;
 		Image image;
 		bool scaleImageToSize;
+		GlobalEnums.ImageSourceEnum imageSource;
 		
 		public BaseImageItem():base() {
 		}
@@ -97,18 +101,35 @@ namespace SharpReportCore {
 			set {
 				fileName = value;
 				this.image = null;
+				this.imageSource = GlobalEnums.ImageSourceEnum.File;
 				LoadImage (fileName);
 				base.NotifyPropertyChanged("FileName");
 			}
 		}
 		
 		/// <summary>
-		/// The Image loaded from a File
+		/// The Image 
 		/// </summary>
 		public  virtual Image Image {
 			get {
 				return image;
 			}
+			set {
+				this.fileName = String.Empty;
+				this.image = value;
+				this.imageSource = GlobalEnums.ImageSourceEnum.External;
+				base.NotifyPropertyChanged("Image");
+			}
+		}
+		
+		/// <summary>
+		/// Where did the image come from
+		/// </summary>
+		/// 
+		public GlobalEnums.ImageSourceEnum ImageSource {
+			get {
+				return imageSource;
+			}
 		}
 		
 		///<summary>

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs

@@ -124,7 +124,7 @@ namespace SharpReportCore {
 		
 		void CheckReportSettings(ReportSettings settings) {
 			try {
-				if (settings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
+				if (settings.DataModel != GlobalEnums.PushPullModelEnum.PushData) {
 					SqlQueryChecker.Check(settings.CommandText);
 				}
 				

src/AddIns/Misc/SharpReport/SharpReportCore/Factories/RendererFactory.cs

@@ -34,10 +34,10 @@ namespace SharpReportCore {
 		public  AbstractRenderer Create(ReportModel model,DataManager container) {
 			if (model != null) {
 				switch (model.ReportSettings.ReportType) {
-						case GlobalEnums.enmReportType.FormSheet :{
+						case GlobalEnums.ReportTypeEnum.FormSheet :{
 							return new RenderFormSheetReport(model);
 						}
-						case GlobalEnums.enmReportType.DataReport:{
+						case GlobalEnums.ReportTypeEnum.DataReport:{
 							return new RenderDataReport(model,container);
 						}
 				}

src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs

@@ -26,11 +26,12 @@ namespace SharpReportCore {
 	public class GlobalEnums : object {
 			
 		///<summary>Technics to get the data
-		/// Push : report get'S a ready filld dataset
+		/// Push : report get's a ready filld dataset or something tah implements IList
 		/// Pull : report has to fill data by themself
-		/// FormSheet : FormSheet report
+		/// FormSheet : FormSheet report, just labels and images are allowed
 		/// </summary>
-		public enum enmPushPullModel {
+		/// 
+		public enum PushPullModelEnum {
 			PushData,
 			PullData,
 			FormSheet
@@ -55,7 +56,7 @@ namespace SharpReportCore {
 		/// FormSheet means a blank form with Labels, Lines and Checkboxes
 		/// DataReport handles all Reports with Data
 		/// </summary>
-		public enum enmReportType {
+		public enum ReportTypeEnum {
 			FormSheet,
 			DataReport,
 		}
@@ -70,19 +71,7 @@ namespace SharpReportCore {
 			ReportPageFooter,
 			ReportFooter
 		}
-		/// <summary>
+
-		/// Output Format
-		/// </summary>
-		public enum enmRenderTo {
-			Text,
-			Pdf
-		}
-		
-		public enum ItemHorizontalAlign {
-			Left,
-			Center,
-			Right
-		}
 		
 		///<summary>
 		///Names of the different collections like Sorting,grouping etc
@@ -95,6 +84,13 @@ namespace SharpReportCore {
 			Groupings
 		}
 		
+		public enum ImageSourceEnum{
+			File,
+//			DataBase,
+			External
+		}
+		
+		
 		///
   		/// Convert any possible string-Value of a given enumeration
   		/// type to its internal representation.

src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs

@@ -106,7 +106,7 @@ namespace SharpReportCore {
 		// this Property is only a shortcut,,otherwise we have
 		// to use 'ReportModel.reportSettings.DataModel'
 		
-		public GlobalEnums.enmPushPullModel DataModel {
+		public GlobalEnums.PushPullModelEnum DataModel {
 			get {
 				return reportSettings.DataModel;
 			}

src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs

@@ -48,8 +48,8 @@ namespace SharpReportCore{
 		                                    GraphicsUnit.Point);
 		
 		
-		private GlobalEnums.enmReportType reportType;
+		private GlobalEnums.ReportTypeEnum reportType;
-		private GlobalEnums.enmPushPullModel dataModel;
+		private GlobalEnums.PushPullModelEnum dataModel;
 		
 		private AbstractParametersCollection reportParametersCollection;
 		private ColumnCollection availableFields;
@@ -81,8 +81,8 @@ namespace SharpReportCore{
 			sortingCollection = new ColumnCollection();
 			groupingsCollection = new ColumnCollection();
 			reportParametersCollection = new AbstractParametersCollection();
-			this.reportType = GlobalEnums.enmReportType.FormSheet;
+			this.reportType = GlobalEnums.ReportTypeEnum.FormSheet;
-			this.dataModel = GlobalEnums.enmPushPullModel.FormSheet;
+			this.dataModel = GlobalEnums.PushPullModelEnum.FormSheet;
 		}
 		
 
@@ -497,7 +497,7 @@ namespace SharpReportCore{
 		
 		
 		[Browsable(true), Category("Base Settings")]
-		public GlobalEnums.enmReportType ReportType {
+		public GlobalEnums.ReportTypeEnum ReportType {
 			get {
 				return reportType;
 			}
@@ -615,7 +615,7 @@ namespace SharpReportCore{
 		
 		
 		[Category("Data")]
-		public GlobalEnums.enmPushPullModel DataModel {
+		public GlobalEnums.PushPullModelEnum DataModel {
 			get {
 				return dataModel;
 			}
@@ -623,10 +623,10 @@ namespace SharpReportCore{
 				if (dataModel != value) {
 					dataModel = value;
 
-					if (this.dataModel != GlobalEnums.enmPushPullModel.FormSheet) {
+					if (this.dataModel != GlobalEnums.PushPullModelEnum.FormSheet) {
-						this.reportType = GlobalEnums.enmReportType.DataReport;
+						this.reportType = GlobalEnums.ReportTypeEnum.DataReport;
 					} else {
-						this.reportType = GlobalEnums.enmReportType.FormSheet;
+						this.reportType = GlobalEnums.ReportTypeEnum.FormSheet;
 					}
 					this.NotifyPropertyChanged("DataModel");
 				}

src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs

@@ -65,7 +65,7 @@ namespace SharpReportCore {
 		#region ParameterHandling
 
 		private bool CheckReportParameters (ReportModel model,ReportParameters reportParameters) {
-			if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.FormSheet) {
+			if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.FormSheet) {
 				if (this.connectionObject == null) {
 					
 					if (!String.IsNullOrEmpty(model.ReportSettings.ConnectionString)) {
@@ -136,14 +136,14 @@ namespace SharpReportCore {
 		private ReportModel ValidatePushModel (string fileName) {
 			
 			ReportModel model = ModelFromFile (fileName);
-			if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
+			if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) {
 				throw new SharpReportException ("PrintPushdataReport: No valid ReportModel");
 			}
 			return model;
 		}
 		
 		private void InitDataContainer (ReportSettings settings) {	
-			if (settings.ReportType == GlobalEnums.enmReportType.DataReport) {
+			if (settings.ReportType == GlobalEnums.ReportTypeEnum.DataReport) {
 				if (settings.CommandText != null) {
 					try {
 						GrapSqlParameters (settings);
@@ -191,11 +191,11 @@ namespace SharpReportCore {
 			try {
 				switch (model.ReportSettings.ReportType) {
 						//FormSheets reports
-					case GlobalEnums.enmReportType.FormSheet:
+					case GlobalEnums.ReportTypeEnum.FormSheet:
 						abstr = new RendererFactory().Create (model,null);
 						break;
 						//Databased reports
-					case GlobalEnums.enmReportType.DataReport :
+					case GlobalEnums.ReportTypeEnum.DataReport :
 						InitDataContainer (model.ReportSettings);
 						if (this.dataManager != null) {
 							if (this.dataManager.DataSource != null) {
@@ -252,10 +252,10 @@ namespace SharpReportCore {
 			if (model == null) {
 				throw new ArgumentNullException("model");
 			}
-			if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.DataReport) {
+			if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.DataReport) {
 				throw new ArgumentException("SetupPushDataRenderer <No valid ReportModel>");
 			}
-			if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
+			if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) {
 				throw new ArgumentException("SetupPushDataRenderer <No valid ReportType>");
 			}
 			
@@ -282,10 +282,10 @@ namespace SharpReportCore {
 			if (model == null) {
 				throw new ArgumentNullException("model");
 			}
-			if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.DataReport) {
+			if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.DataReport) {
 				throw new ArgumentException("SetupPushDataRenderer <No valid ReportModel>");
 			}
-			if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
+			if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) {
 				throw new ArgumentException("SetupPushDataRenderer <No valid ReportType>");
 			}
 			

src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs

@@ -64,20 +64,20 @@ namespace ReportGenerator{
 		}
 		
 		void DoCreate (ReportModel model) {
-			GlobalEnums.enmPushPullModel dataModel;
+			GlobalEnums.PushPullModelEnum dataModel;
 			dataModel = model.DataModel;
 			switch (dataModel) {
-				case GlobalEnums.enmPushPullModel.PullData:
+				case GlobalEnums.PushPullModelEnum.PullData:
 					customizer.Set("DataRow",GlobalEnums.ReportItemType.ReportRowItem);
 					GeneratePullDataReport generatePullDataReport = new GeneratePullDataReport(customizer,model);
 					generatePullDataReport.GenerateReport();
 					break;
-				case GlobalEnums.enmPushPullModel.PushData:
+				case GlobalEnums.PushPullModelEnum.PushData:
 					customizer.Set("DataRow",GlobalEnums.ReportItemType.ReportRowItem);
 					GeneratePushDataReport generatePushDataReport = new GeneratePushDataReport(customizer,model);
 					generatePushDataReport.GenerateReport();
 					break;
-				case GlobalEnums.enmPushPullModel.FormSheet:
+				case GlobalEnums.PushPullModelEnum.FormSheet:
 					GenerateFormSheetReport generateFormSheetReport = new GenerateFormSheetReport (customizer,model);
 					generateFormSheetReport.GenerateReport();
 					break;

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs

@@ -28,15 +28,15 @@ namespace ReportGenerator
 			if (reportModel == null) {
 				throw new ArgumentException("reportModel");
 			}
-			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.FormSheet) {
+			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.FormSheet) {
 				throw new ArgumentException ("Wrong DataModel in GeneratePullDataReport");
 			}
 			base.ReportItemCollection.Clear();
 		}
 		
 		public override void GenerateReport() {
-			base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.FormSheet;
+			base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.FormSheet;
-			base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.FormSheet;
+			base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.FormSheet;
 			base.GenerateReport();	
 			base.AdjustAllNames();
 		}

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePullDataReport.cs

@@ -36,7 +36,7 @@ namespace ReportGenerator {
 				throw new ArgumentException("reportModel");
 			}
 			
-			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PullData) {
+			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PullData) {
 				throw new ArgumentException ("Wrong DataModel in GeneratePullDataReport");
 			}
 			base.ReportItemCollection.Clear();
@@ -46,8 +46,8 @@ namespace ReportGenerator {
 		#region ReportGenerator.IReportGenerator interface implementation
 		public override void GenerateReport() {
 			try {
-				base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.DataReport;
+				base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.DataReport;
-				base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.PullData;
+				base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.PullData;
 				
 				
 				this.ReportModel.ReportSettings.AvailableFieldsCollection = 

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePushDataReport.cs

@@ -38,7 +38,7 @@ namespace ReportGenerator {
 			if (reportModel == null) {
 				throw new ArgumentException("reportModel");
 			}
-			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
+			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) {
 				throw new ArgumentException ("Wrong DataModel in GeneratePushReport");
 			}
 			//we can't use the customizer here
@@ -48,8 +48,8 @@ namespace ReportGenerator {
 		
 		public override void GenerateReport() {
 			
-			base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.DataReport;
+			base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.DataReport;
-			base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.PushData;
+			base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.PushData;
 			
 			
 			base.ReportModel.ReportSettings.AvailableFieldsCollection = base.ReportGenerator.ColumnCollection;

src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs

@@ -42,11 +42,11 @@ namespace ReportGenerator {
 		private string fileName;
 		private string path;
 		
-		private GlobalEnums.enmReportType reportType;
+		private GlobalEnums.ReportTypeEnum reportType;
 		private GraphicsUnit graphicsUnit;
 		
 		//Database
-		private GlobalEnums.enmPushPullModel dataModel;
+		private GlobalEnums.PushPullModelEnum dataModel;
 
 		private string connectionString;
 		private string catalogName;
@@ -125,7 +125,7 @@ namespace ReportGenerator {
 				reportName = value;
 			}
 		}
-		public SharpReportCore.GlobalEnums.enmReportType ReportType {
+		public SharpReportCore.GlobalEnums.ReportTypeEnum ReportType {
 			get {
 				return reportType;
 			}
@@ -190,7 +190,7 @@ namespace ReportGenerator {
 			}
 		}
 		
-		public SharpReportCore.GlobalEnums.enmPushPullModel DataModel {
+		public SharpReportCore.GlobalEnums.PushPullModelEnum DataModel {
 			get {
 				return dataModel;
 			}

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs

@@ -149,14 +149,14 @@ namespace ReportGenerator{
 			if (initDone) {
 				if (this.radioPullModell.Checked == true) {
 					base.NextWizardPanelID = "PullModel";
-					generator.DataModel = GlobalEnums.enmPushPullModel.PullData;
+					generator.DataModel = GlobalEnums.PushPullModelEnum.PullData;
 					GoOn();
 				} else if (this.radioPushModell.Checked == true){
 					base.NextWizardPanelID = "PushModel";
-					generator.DataModel = GlobalEnums.enmPushPullModel.PushData;
+					generator.DataModel = GlobalEnums.PushPullModelEnum.PushData;
 					GoOn();
 				} else if (this.radioFormSheet.Checked == true){
-					generator.DataModel = GlobalEnums.enmPushPullModel.FormSheet;
+					generator.DataModel = GlobalEnums.PushPullModelEnum.FormSheet;
 					base.EnableNext = false;
 					base.IsLastPanel = true;
 				}