Changeset 11420 for trunk/sources

Timestamp:

10/06/14 16:20:02 (10 years ago)

Author:

pfleck

Message:

#2229

• Changed the Content type of VRPInstanceProviderView. In the previous version the VRPInstanceProviderView is not used correctly as default View for VRPInstances and therefore the VRPImportDialog is not shown.
• Made IVRPInstanceProvider generic for consistency and to avoid unnecessary casts.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Instances.VehicleRouting.Views {
   [View("VRP InstanceProvider View")]
-  [Content(typeof(IProblemInstanceProvider<IVRPData>), IsDefaultView = true)]
+  [Content(typeof(IVRPInstanceProvider<>), IsDefaultView = true)]
   public partial class VRPInstanceProviderView<T> : ProblemInstanceProviderView<T> where T : class, IVRPData {
 
@@ -37 +37 @@
 
     protected override void importButton_Click(object sender, EventArgs e) {
-      var provider = Content as IVRPInstanceProvider;
+      var provider = Content as IVRPInstanceProvider<T>;
       if (provider != null) {
         using (var dialog = new VRPImportDialog(Content.Name)) {
@@ -54 +54 @@
 
     protected override void exportButton_Click(object sender, EventArgs e) {
-      var provider = Content as IVRPInstanceProvider;
+      var provider = Content as IVRPInstanceProvider<T>;
       if (provider != null) {
         if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public interface IVRPInstanceProvider {
+  public interface IVRPInstanceProvider<T> {
     bool CanImportData { get; }
-    IVRPData Import(string vrpFile, string tourFile);
+    T Import(string vrpFile, string tourFile);
 
     bool CanExportData { get; }
-    void Export(IVRPData instance, string path);
+    void Export(T instance, string path);
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider where T : IVRPData {
+  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider<T> where T : IVRPData {
     protected abstract string FileName { get; }
 
@@ -114 +114 @@
     protected abstract T LoadData(Stream stream);
 
-    public IVRPData Import(string vrpFile, string tourFile) {
+    public T Import(string vrpFile, string tourFile) {
       var data = ImportData(vrpFile);
       if (!String.IsNullOrEmpty(tourFile)) {
@@ -122 +122 @@
     }
 
-    public void Export(IVRPData instance, string path) {
-      ExportData((T)instance, path);
+    public void Export(T instance, string path) {
+      ExportData(instance, path);
     }