Changeset 3038

Timestamp:

03/15/10 14:53:49 (14 years ago)

Author:

mkommend

Message:

removed warnings from HeuristicLab.Netron (ticket #915)

Location:

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446

Files:

• Analysis/ITree.cs (modified) (1 diff)
• Core/Scene graph/Model.cs (modified) (1 diff)
• Core/Scene graph/Page.cs (modified) (1 diff)
• Diagram elements/Connections/Connection.cs (modified) (1 diff)
• Diagram elements/Group/CollapsibleGroupShape.cs (modified) (1 diff)
• Diagram elements/Materials/ClickableIconLabelMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/ClickableIconMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/ClickableLabelMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/FolderMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/IconLabelMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/IconMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/LabelMaterial.cs (modified) (1 diff)
• Diagram elements/Materials/SwitchIconMaterial.cs (modified) (1 diff)
• Diagram elements/Shapes/ClassShape.cs (modified) (2 diffs)
• Diagram elements/Shapes/FileShape.cs (modified) (1 diff)
• Diagram elements/Shapes/ShapeFactory.cs (modified) (1 diff)
• Diagram elements/Shapes/SimpleEllipse.cs (modified) (1 diff)
• Diagram elements/Shapes/SimpleRectangle.cs (modified) (4 diffs)
• IO/Binary/BinarySerializer.cs (modified) (2 diffs)
• Layout/BalloonTreeLayout.cs (modified) (1 diff)
• Netron.Diagramming.Core-3.0.2672.12446.csproj (modified) (1 diff)
• Printing/DiagramPrinter.cs (modified) (1 diff)
• Serialization/Connection.Serialization.cs (modified) (1 diff)
• Tools/HotKeys.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Analysis/ITree.cs

@@ -17 +17 @@
         ///   <c>true</c> if this instance is directed; otherwise, <c>false</c>.
         /// </value>
-        bool IsDirected { get; set;}
+        new bool IsDirected { get; set;}
         /// <summary>
         /// Gets or sets the root of the tree

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/Scene graph/Model.cs

@@ -218 +218 @@
         /// the shapes of the diagram
         /// </summary>
-        [NonSerialized]
-        private CollectionBase<IShape> mShapes;
+        //[NonSerialized]
+        //private CollectionBase<IShape> mShapes;
         /// <summary>
         /// the bounding rectangle

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/Scene graph/Page.cs

@@ -34 +34 @@
         /// Occurs before an entity is transformed
         /// </summary>
-        public event EventHandler<CancelableEntityEventArgs> OnBeforeResize;
+        //public event EventHandler<CancelableEntityEventArgs> OnBeforeResize;
         #endregion
 

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Connections/Connection.cs

@@ -17 +17 @@
         /// </summary>
         // ------------------------------------------------------------------
-        protected const double connectionVersion = 1.0;
+        private const double connectionVersion = 1.0;
 
         #region Hack for the caps

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Group/CollapsibleGroupShape.cs

@@ -33 +33 @@
         // ------------------------------------------------------------------
         private CollectionBase<IDiagramEntity> mEntities;
-
-        // ------------------------------------------------------------------
-        /// <summary>
-        /// the bounding rectangle
-        /// </summary>
-        // ------------------------------------------------------------------
-        private Rectangle mRectangle;
 
         // ------------------------------------------------------------------

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/ClickableIconLabelMaterial.cs

@@ -56 +56 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/ClickableIconMaterial.cs

@@ -32 +32 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/ClickableLabelMaterial.cs

@@ -50 +50 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/FolderMaterial.cs

@@ -104 +104 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/IconLabelMaterial.cs

@@ -56 +56 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/IconMaterial.cs

@@ -40 +40 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/LabelMaterial.cs

@@ -35 +35 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Materials/SwitchIconMaterial.cs

@@ -78 +78 @@
         /// </summary>
         // ------------------------------------------------------------------
-        public virtual double Version
+        public override double Version
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Shapes/ClassShape.cs

@@ -86 +86 @@
         /// the list of items when set to list-type
         /// </summary>
-        private ClassShapeItemCollection mList = new ClassShapeItemCollection();       
+        private CollectionBase<ClassShapeItem> mList = new CollectionBase<ClassShapeItem>();       
         /// <summary>
         /// the <see cref="LabelMaterial"/> to display the free text
@@ -226 +226 @@
         /// Gets the list of items displayed in the body
         /// </summary>
-        public ClassShapeItemCollection List
+        public CollectionBase<ClassShapeItem> List
         {
             get

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Shapes/FileShape.cs

@@ -281 +281 @@
             public IntPtr hIcon;
             public IntPtr iIcon;
-            public uint dwAttributes;
+            public int dwAttributes;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
             public string szDisplayName;

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Shapes/ShapeFactory.cs

@@ -57 +57 @@
                     return null;
             }
-
-            return null;
         }
   

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Shapes/SimpleEllipse.cs

@@ -23 +23 @@
     /// the connectors
     /// </summary>
-    Connector cBottom, cLeft, cRight, cTop;
+    //Connector cBottom, cLeft, cRight, cTop;
     #endregion
 

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Diagram elements/Shapes/SimpleRectangle.cs

@@ -31 +31 @@
         /// </summary>
         // ------------------------------------------------------------------
-        Connector cBottom;
+        //Connector cBottom;
 
         // ------------------------------------------------------------------
@@ -38 +38 @@
         /// </summary>
         // ------------------------------------------------------------------
-        Connector cLeft;
+        //Connector cLeft;
 
         // ------------------------------------------------------------------
@@ -45 +45 @@
         /// </summary>
         // ------------------------------------------------------------------
-        Connector cRight;
+        //Connector cRight;
 
         // ------------------------------------------------------------------
@@ -52 +52 @@
         /// </summary>
         // ------------------------------------------------------------------
-        Connector cTop;
+        //Connector cTop;
 
         #endregion

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/IO/Binary/BinarySerializer.cs

@@ -27 +27 @@
       FileStream fs = new FileStream(fileName, FileMode.Create);
 
-      GenericFormatter<BinaryFormatter> f = new GenericFormatter<BinaryFormatter>();      
-      
-      try
-      {
-        Document document = control.Document;
-        
+      GenericFormatter<BinaryFormatter> f = new GenericFormatter<BinaryFormatter>();
 
-        //Warning!: cleaning up, you need to unhook all events since 
-                // unserializable classes hooked to events will give problems.        
-        f.Serialize<Document>(fs, document );
-        return true;
-      }     
-      catch(Exception exc)      
-      {
-        //site.OutputInfo("The graph was not saved, because some graph events were attached to non-serializable classes.\r\n This is a known issue and will be resolved in a later stadium.",OutputInfoLevels.Exception);
-        Trace.WriteLine(exc.Message, "BinarySerializer.SaveAs");
-        
-        //DumpInfo();
-      }
-      catch
-      {
-        Trace.WriteLine("Non-CLS exception caught.","BinarySerializer.SaveAs");
-      }
+      try {
+        Document document = control.Document;
+
+
+        //Warning!: cleaning up, you need to unhook all events since 
+        // unserializable classes hooked to events will give problems.        
+        f.Serialize<Document>(fs, document);
+        return true;
+      }
+      catch (Exception exc) {
+        //site.OutputInfo("The graph was not saved, because some graph events were attached to non-serializable classes.\r\n This is a known issue and will be resolved in a later stadium.",OutputInfoLevels.Exception);
+        Trace.WriteLine(exc.Message, "BinarySerializer.SaveAs");
+
+        //DumpInfo();
+      }
       finally
       {
@@ -117 +111 @@
                 MessageBox.Show(exc.Message, "BinarySerializer.Open");
       }
-      catch
-      {
-                MessageBox.Show("Non-CLS exception caught.", "BinarySerializer.Open");
-        
-      }
       finally
       {

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Layout/BalloonTreeLayout.cs

@@ -230 +230 @@
             public int d;
             public int r;
-            public double rx;
-            public double ry;
+            //public double rx;
+            //public double ry;
             public double a;
             public double c;

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj

@@ -85 +85 @@
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DocumentationFile>bin\Debug\Netron Documentation.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <FileAlignment>4096</FileAlignment>
     <DebugType>full</DebugType>

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Printing/DiagramPrinter.cs

@@ -19 +19 @@
         PrintDocument myDocument;
         IDiagramControl myDiagram;
-        PrinterSettings mySettings;
+        //PrinterSettings mySettings;
         PageSettings myPageSettings;
         int currentPageIndex = 0;

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Serialization/Connection.Serialization.cs

@@ -22 +22 @@
         /// <param name="info">The info.</param>
         /// <param name="context">The context.</param>
-        protected Connection(SerializationInfo info, StreamingContext context) : base(info, context)
+        private Connection(SerializationInfo info, StreamingContext context) : base(info, context)
         {
             if(Tracing.BinaryDeserializationSwitch.Enabled)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Tools/HotKeys.cs

@@ -33 +33 @@
         public void KeyUp(System.Windows.Forms.KeyEventArgs e)
         {
-            ICommand cmd = null;
             switch (e.KeyCode)
             {