modified sample projects (produce some errors related to instrumentat…

…ion, issue #58)
VRL-Studio · Aug 18, 2015 · 7ef2b1a · 7ef2b1a
1 parent c17a2d7
commit 7ef2b1a
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 51 deletions.
diff --git a/VRL/VRL-UI/InstrumentationMain.groovy b/VRL/VRL-UI/InstrumentationMain.groovy
@@ -1,7 +1,7 @@
 package my.testpackage;
 public class MainCSG {
 
-    
+
     public static eu.mihosoft.vrl.v3d.jcsg.CSG createSphere(double radius) {
         eu.mihosoft.vrl.v3d.jcsg.Sphere sphere;
         sphere = (new eu.mihosoft.vrl.v3d.jcsg.Sphere(radius));
@@ -20,13 +20,10 @@ public class MainCSG {
         return cube.difference(sphere);
     }
     public static void main(String[] args) {
-        eu.mihosoft.vrl.v3d.jcsg.CSG res1;
-        res1 = (createDiff(13, 10));
-        eu.mihosoft.vrl.v3d.jcsg.CSG res2;
-        res2 = (createDiff(13, 9));
-        eu.mihosoft.vrl.v3d.jcsg.CSG res3;
-        res3 = (createDiff(13, 8));
-        res3 = (createDiff(13, 7));
+        createDiff(13, 10);
+        createDiff(13, 9);
+        createDiff(13, 8);
+        createDiff(13, 7);
     }
 }
 // <editor-fold defaultstate="collapsed" desc="VRL-Data">
@@ -444,4 +441,4 @@ public class MainCSG {
   </entry>
 </map>
 */
-// </editor-fold>
+// </editor-fold>
diff --git a/VRL/VRL-UI/MainWithChainedInvocations.groovy b/VRL/VRL-UI/MainWithChainedInvocations.groovy
@@ -1,8 +1,10 @@
 package my.testpackage;
 public class MainWithChainedInvocations {
 
-    
+
     public my.testpackage.MainWithChainedInvocations m1() {
+        m1();
+        m1();
         return this;
     }
     public static void main(String[] args) {
@@ -14,16 +16,6 @@ public class MainWithChainedInvocations {
 // <editor-fold defaultstate="collapsed" desc="VRL-Data">
 /*<!VRL!><Type:VRL-Layout>
 <map>
-  <entry>
-    <string>Script:my.testpackage.MainWithChainedInvocations:m1:inv:return</string>
-    <layout>
-      <x>324.3620700617288</x>
-      <y>57.24036530501096</y>
-      <width>200.0</width>
-      <height>150.0</height>
-      <contentVisible>true</contentVisible>
-    </layout>
-  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:declare m</string>
     <layout>
@@ -54,16 +46,6 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
-  <entry>
-    <string>Script:my.testpackage.MainWithChainedInvocations:m1</string>
-    <layout>
-      <x>45.0</x>
-      <y>181.0</y>
-      <width>309.3505859375</width>
-      <height>180.0</height>
-      <contentVisible>true</contentVisible>
-    </layout>
-  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:&lt;init&gt;</string>
     <layout>
@@ -74,16 +56,6 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
-  <entry>
-    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0</string>
-    <layout>
-      <x>667.8955288263747</x>
-      <y>413.66270958709157</y>
-      <width>200.0</width>
-      <height>150.0</height>
-      <contentVisible>true</contentVisible>
-    </layout>
-  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main</string>
     <layout>
@@ -94,16 +66,6 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
-  <entry>
-    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1</string>
-    <layout>
-      <x>663.8166713382085</x>
-      <y>222.65733992622984</y>
-      <width>200.0</width>
-      <height>150.0</height>
-      <contentVisible>true</contentVisible>
-    </layout>
-  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations</string>
     <layout>
@@ -134,6 +96,46 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:m1:inv:return</string>
+    <layout>
+      <x>324.3620700617288</x>
+      <y>57.24036530501096</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:m1</string>
+    <layout>
+      <x>45.0</x>
+      <y>181.0</y>
+      <width>309.3505859375</width>
+      <height>180.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0</string>
+    <layout>
+      <x>667.8955288263747</x>
+      <y>413.66270958709157</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1</string>
+    <layout>
+      <x>663.8166713382085</x>
+      <y>222.65733992622984</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
 </map>
 */
-// </editor-fold>
+// </editor-fold>