Changeset 9181

Timestamp:

01/22/13 22:57:09 (12 years ago)

Author:

mkommend

Message:

#2006: Changed GhostFactory to not hold a reference to the View object and completely removed the TextEditor tool as it was not in use.

Location:

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

Files:

• Controller.cs (modified) (1 diff)
• Ghosts.cs (modified) (4 diffs)
• HeuristicLab.Netron-3.0.2672.12446.csproj (modified) (2 diffs)
• NetronVisualization.cs (modified) (1 diff)
• TextEditor.cs (deleted)
• View.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs

@@ -45 +45 @@
 
     public override bool ActivateTextEditor(ITextProvider textProvider) {
-      TextEditor.GetEditor(textProvider);
-      TextEditor.Show();
-      return true;
+      return false;
     }
 

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Ghosts.cs

@@ -35 +35 @@
 namespace HeuristicLab.Netron {
   internal static class GhostsFactory {
-    private static RectGhost mRectangular;
-    private static LineGhost mLine;
-    private static EllipticGhost mEllipse;
-    private static MultiLineGhost mMultiLine;
-    private static CurvedLineGhost mCurvedLine;
-    private static PolygonGhost mPolygon;
-
-    private static IView mView;
-    public static IView View {
-      get { return mView; }
-      set { mView = value; }
-    }
-
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-    public static IGhost GetGhost(object pars, GhostTypes type) {
+    public static IGhost GetGhost(object pars, GhostTypes type, IView View) {
       Point[] points;
       switch (type) {
         case GhostTypes.Rectangle:
-          if (mRectangular == null)
-            mRectangular = new RectGhost(View);
+          var mRectangular = new RectGhost(View);
           points = (Point[])pars;
           mRectangular.Start = points[0];
@@ -60 +46 @@
           return mRectangular;
         case GhostTypes.Ellipse:
-          if (mEllipse == null)
-            mEllipse = new EllipticGhost(View);
+          var mEllipse = new EllipticGhost(View);
           points = (Point[])pars;
           mEllipse.Start = points[0];
@@ -67 +52 @@
           return mEllipse;
         case GhostTypes.Line:
-          if (mLine == null)
-            mLine = new LineGhost(View);
+          var mLine = new LineGhost(View);
           points = (Point[])pars;
           mLine.Start = points[0];
@@ -74 +58 @@
           return mLine;
         case GhostTypes.MultiLine:
-          if (mMultiLine == null)
-            mMultiLine = new MultiLineGhost(View);
+          var mMultiLine = new MultiLineGhost(View);
           points = (Point[])pars;
           mMultiLine.Points = points;
           return mMultiLine;
         case GhostTypes.CurvedLine:
-          if (mCurvedLine == null)
-            mCurvedLine = new CurvedLineGhost(View);
+          var mCurvedLine = new CurvedLineGhost(View);
           points = (Point[])pars;
           mCurvedLine.Points = points;
           return mCurvedLine;
         case GhostTypes.Polygon:
-          if (mPolygon == null)
-            mPolygon = new PolygonGhost(View);
+          var mPolygon = new PolygonGhost(View);
           points = (Point[])pars;
           mPolygon.Points = points;

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

@@ -122 +122 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TextEditor.cs" />
     <Compile Include="View.cs" />
   </ItemGroup>
@@ -171 +170 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent>
+    <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs

@@ -49 +49 @@
         this.AttachToDocument(Document);
         this.Controller.View = View;
-        TextEditor.Init(this);
 
         View.OnCursorChange += new EventHandler<CursorEventArgs>(mView_OnCursorChange);

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/View.cs

@@ -42 +42 @@
       this.HorizontalRuler.Visible = true;
       this.VerticalRuler.Visible = true;
-      GhostsFactory.View = this;
     }
 
@@ -102 +101 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-              GhostTypes.Ellipse);
+              GhostTypes.Ellipse, this);
     }
     public override void PaintGhostRectangle(
@@ -112 +111 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-          GhostTypes.Rectangle);
+          GhostTypes.Rectangle, this);
     }
     public override void PaintAntsRectangle(
@@ -129 +128 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-          GhostTypes.Line);
+          GhostTypes.Line, this);
     }
     public override void PaintGhostLine(
@@ -139 +138 @@
       switch (curveType) {
         case MultiPointType.Straight:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine, this);
           break;
         case MultiPointType.Polygon:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon, this);
           break;
         case MultiPointType.Curve:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine, this);
           break;