Changeset 8 for trunk/sources

Timestamp:

02/20/08 11:08:04 (17 years ago)

Author:

gkronber

Message:

removed silly assertion statements (ticket #12)

Location:

trunk/sources

Files:

• HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs (modified) (24 diffs)
• HeuristicLab.PluginInfrastructure.GUI/PluginAction.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure.GUI/PluginNameTransform.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/BaseClasses/PluginBase.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/Loader.cs (modified) (1 diff)
• HeuristicLab/MainForm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs

@@ -111 +111 @@
 
     private void publishButton_Click(object sender, EventArgs args) {
-      Trace.Assert(pluginTreeView.SelectedNode.Tag is PluginTag);
 
       PluginInfo plugin = ((PluginTag)pluginTreeView.SelectedNode.Tag).Plugin;
@@ -235 +234 @@
               return tag.PluginName == upgrade.Name;
             });
-            // only one plugin must be found
-            Trace.Assert(oldPlugins.Count == 1);
             PluginTag oldPlugin = oldPlugins[0];
-
-            // the plugin must be installed already
-            Trace.Assert(oldPlugin.State == PluginState.Installed);
-            // the old plugin has to have an older version than the upgrade
-            Trace.Assert(oldPlugin.PluginVersion < upgrade.Version);
 
             // store the upgrade in the old plugin
@@ -255 +247 @@
             });
 
-            // only one plugin must be found
-            Trace.Assert(currentPlugins.Count == 1);
             PluginTag currentPlugin = currentPlugins[0];
-
-            // the plugin must be available already
-            Trace.Assert(currentPlugin.State == PluginState.Available);
-            // the old plugin has to have an older version than the overriding plugin
-            Trace.Assert(currentPlugin.PluginVersion < overridingPlugin.Version);
 
             // replace the plugin description of the available plugin to point to the overriding plugin
@@ -333 +318 @@
         });
 
-        // either none or exactly one plugin to upgrade can be found
-        Trace.Assert(oldPlugins.Count <= 1);
         if(oldPlugins.Count == 1) {
           if(oldPlugins[0].PluginVersion < availablePlugin.Version) {
@@ -352 +335 @@
         });
 
-        // either none or exactly one plugin to override can be found
-        Trace.Assert(currentPlugins.Count <= 1);
         if(currentPlugins.Count == 1) {
           if(currentPlugins[0].PluginVersion < availablePlugin.Version) {
@@ -374 +355 @@
           MarkRemove(action.Plugin);
         } else
-          Trace.Assert(false); // is not allowed to happen
+          throw new InvalidOperationException();
       }
 
@@ -387 +368 @@
 
     private void MarkInstall(PluginTag actionTag) {
-
-      Trace.Assert(actionTag.State == PluginState.Available);
-
       if(!CheckInstallConflicts(actionTag)) {
         CreateNewInstallAction(actionTag);
@@ -398 +376 @@
 
     private void UnmarkInstall(PluginTag actionTag) {
-      Trace.Assert(actionTag.State == PluginState.Available);
-
-      Trace.Assert(GetOverlappingActions(actionTag, ManagerAction.Any).TrueForAll(delegate(PluginAction fixedPoint) {
-        return fixedPoint.Action == ManagerAction.Install;
-      }));
-
       if(!CheckNoActionConflict(actionTag)) {
         List<PluginAction> rootActions = GetActionsInvolving(actionTag);
-        // if there is no conflict then there can only be one action connected to the pluginTag
-        Trace.Assert(rootActions.Count == 1);
         PluginAction rootAction = rootActions[0];
         actions.Remove(rootAction.Plugin);
@@ -418 +388 @@
     private void HandleNoActionConflict(PluginTag actionTag) {
       List<PluginAction> conflictingActions = GetOverlappingActions(actionTag, ManagerAction.Any);
-
-      Trace.Assert(conflictingActions.Count > 1);
       PluginAction theAction = GetSmallestActionInvolving(actionTag, conflictingActions);
       conflictingActions.Remove(theAction);
-
-
       string action = theAction.GetInverseActionString();
-
       DialogResult userResult = ShowGenericConflictDialog(action, theAction, conflictingActions);
-
       if(userResult == DialogResult.OK) {
         conflictingActions.ForEach(delegate(PluginAction conflictingAction) {
@@ -445 +409 @@
 
     private void MarkRemove(PluginTag actionTag) {
-
-      Trace.Assert((actionTag.State & (PluginState.Installed | PluginState.Upgradeable)) != 0);
-
       if(!CheckRemoveConflicts(actionTag)) {
         CreateNewRemoveAction(actionTag);
@@ -456 +417 @@
 
     private void UnmarkRemove(PluginTag pluginTag) {
-
-      Trace.Assert(pluginTag.State == PluginState.Installed);
-
-      Trace.Assert(GetOverlappingActions(pluginTag, ManagerAction.Any).TrueForAll(delegate(PluginAction action) {
-        return action.Action == ManagerAction.Remove;
-      }));
-
       if(!CheckNoActionConflict(pluginTag)) {
-        Trace.Assert(GetOverlappingActions(pluginTag, ManagerAction.Remove).Count == 1);
         List<PluginAction> rootActions = GetActionsInvolving(pluginTag);
         // if there is no conflict then there can only be one action connected to the pluginTag
-        Trace.Assert(rootActions.Count == 1);
         PluginAction rootAction = rootActions[0];
-
         // kill the root action
         actions.Remove(rootAction.Plugin);
@@ -547 +498 @@
 
     private DialogResult ShowGenericConflictDialog(string action, PluginAction theAction, List<PluginAction> conflictingActions) {
-
-      Trace.Assert(conflictingActions.Count > 0);
-
       string message = "The actions:\n\n";
       conflictingActions.ForEach(delegate(PluginAction conflictingAction) {
@@ -577 +525 @@
 
     private PluginAction GetSmallestActionInvolving(PluginTag actionTag, List<PluginAction> actions) {
-      Trace.Assert(actions.Count > 0);
       PluginAction smallestAction;
       // if there is an action defined for which actionTag is the root then us it as root tag
@@ -814 +761 @@
         string[] extractedFiles = Directory.GetFiles(tempDir, "*", SearchOption.AllDirectories);
         foreach(string extractedFile in extractedFiles) {
-          Trace.Assert(extractedFile.StartsWith(tempDir));
           File.Copy(extractedFile, pluginDir + extractedFile.Remove(0, tempDir.Length));
         }
@@ -822 +768 @@
         string[] extractedFiles = Directory.GetFiles(tempDir, "*", SearchOption.AllDirectories);
         foreach(string extractedFile in extractedFiles) {
-          Trace.Assert(extractedFile.StartsWith(tempDir));
           string filename = pluginDir + extractedFile.Remove(0, tempDir.Length);
           if(File.Exists(filename)) {
@@ -832 +777 @@
         string[] backupFiles = Directory.GetFiles(backupDir, "*", SearchOption.AllDirectories);
         foreach(string backupFile in backupFiles) {
-          Trace.Assert(backupFile.StartsWith(backupDir));
           File.Copy(backupFile, pluginDir + backupFile.Remove(0, backupDir.Length));
         }
@@ -853 +797 @@
           if(tag.State == PluginState.Upgradeable || (involvingActions.Count > 0 && involvingActions[0].Action == ManagerAction.Remove)) {
             tag.Plugin.Files.ForEach(delegate(string filename) {
-              Trace.Assert(filename.StartsWith(pluginDir));
               DialogResult result = MessageBox.Show("Deleting: " + filename, "Warning: deleting file", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
               if(result == DialogResult.OK) {
@@ -866 +809 @@
         string[] backupFiles = Directory.GetFiles(backupDir, "*", SearchOption.AllDirectories);
         foreach(string backupFile in backupFiles) {
-          Trace.Assert(backupFile.StartsWith(backupDir));
           string oldFileName = pluginDir + backupFile.Remove(0, backupDir.Length);
           if(!File.Exists(oldFileName)) {
@@ -888 +830 @@
           if(tag.State == PluginState.Upgradeable || (actionsInvolving.Count > 0 && actionsInvolving[0].Action == ManagerAction.Remove)) {
             tag.Plugin.Files.ForEach(delegate(string filename) {
-              Trace.Assert(filename.StartsWith(pluginDir));
               File.Copy(filename, backupDir + filename.Remove(0, pluginDir.Length));
             });
@@ -998 +939 @@
 
     private void removeButton_Clicked(object sender, EventArgs e) {
-      AssertAction();
       // get the tag of the selected treeNode
       PluginTag actionTag = (PluginTag)pluginTreeView.SelectedNode.Tag;
       List<PluginAction> rootActions = GetActionsInvolving(actionTag);
       if(rootActions.Count>0) {
-        Trace.Assert(rootActions.TrueForAll(delegate(PluginAction rootAction) {
-          return rootAction.Action == ManagerAction.Remove;
-        }));
         UnmarkRemove(actionTag);
       } else {
@@ -1018 +955 @@
 
     private void installButton_Clicked(object sender, EventArgs e) {
-      AssertAction();
       // get the tag of the selected treeNode
       PluginTag actionTag = (PluginTag)pluginTreeView.SelectedNode.Tag;
@@ -1024 +960 @@
 
       if(rootActions.Count > 0) {
-        Trace.Assert(rootActions.TrueForAll(delegate(PluginAction rootAction) {
-          return rootAction.Action == ManagerAction.Install;
-        }));
         UnmarkInstall(actionTag);
       } else {
@@ -1036 +969 @@
       // update the plugin detail information of the selected plugin
       DisplayPluginInfo(actionTag.GetPluginDetails());
-    }
-
-    private void AssertAction() {
-      Trace.Assert(pluginTreeView.SelectedNode != null);
-      Trace.Assert(pluginTreeView.SelectedNode.Tag is PluginTag);
     }
 
@@ -1101 +1029 @@
           // check if none of the files exist
           foreach(string filename in Directory.GetFiles(cacheDir)) {
-            Trace.Assert(filename.StartsWith(cacheDir));
             if(File.Exists(pluginDir + filename.Remove(0, cacheDir.Length))) {
               ShowErrorDialog("Sorry can't install the plugin "+packageName+"\nThe file: "+filename.Remove(0, cacheDir.Length)+" already exist in "+pluginDir+"\nIt seems the plugin is already installed.");

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/PluginAction.cs

@@ -64 +64 @@
         default:
           // this method is not defined for actions other than "Install" and "Remove"
-          Trace.Assert(false);
+          throw new InvalidOperationException();
           return "";
       }

trunk/sources/HeuristicLab.PluginInfrastructure.GUI/PluginNameTransform.cs

@@ -44 +44 @@
 
     public string TransformFile(string name) {
-      //Trace.Assert(name.StartsWith(pluginDir));
       if(name.StartsWith(pluginDir)) {
         return name.Remove(0, pluginDir.Length);

trunk/sources/HeuristicLab.PluginInfrastructure/BaseClasses/ApplicationBase.cs

@@ -39 +39 @@
 
       // exactly one attribute of the type ClassInfoAttribute must be given
-      Trace.Assert(pluginAttributes.Length == 1);
+      if(pluginAttributes.Length != 1) {
+        throw new InvalidPluginException();
+      }
 
       // after the assertion we are sure that the array access will not fail

trunk/sources/HeuristicLab.PluginInfrastructure/BaseClasses/PluginBase.cs

@@ -44 +44 @@
 
       // exactly one attribute of the type ClassInfoAttribute must be given
-      Trace.Assert(pluginAttributes.Length == 1);
+      if(pluginAttributes.Length != 1) {
+        throw new InvalidPluginException();
+      }
 
       // after the assertion we are sure that the array access will not fail

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -55 +55 @@
     <Compile Include="Interfaces\IControl.cs" />
     <Compile Include="Interfaces\IControlManager.cs" />
+    <Compile Include="InvalidPluginException.cs" />
     <Compile Include="PluginManager.cs" />
     <Compile Include="PluginManagerActionEventArgs.cs" />

trunk/sources/HeuristicLab.PluginInfrastructure/Loader.cs

@@ -217 +217 @@
         this.pluginAssemblies[pluginName] = pluginAssemblies;
       } else {
-        Trace.Assert(false);
+        throw new InvalidPluginException();
       }
     }

trunk/sources/HeuristicLab/MainForm.cs

@@ -77 +77 @@
 
     private void applicationsListView_ItemActivate(object sender, EventArgs e) {
-      if(applicationsListView.SelectedItems.Count > 0) {
-        Trace.Assert(applicationsListView.SelectedItems.Count == 1);
+      if(applicationsListView.SelectedItems.Count > 0) {        
         ListViewItem selected = applicationsListView.SelectedItems[0];
         if(selected == pluginManagerListViewItem) {