Removed import within class body.

Unfortunately, mainline Processing is inconsistent on if imports within class bodies are allowed by the language definition. JavaBuild currently allows it (though does not explicitly permit it) while SourceUtil assumes that imports are "hoistable" to the top of the sketch so imply that the language does not permit it. The Sam Pottinger branch of Processing (specifically sampottinger/processing#15) makes SourceUtil's assumption explicity by dissallowing import statements within class bodies. This PR updates romanesco in response.
sampottinger · Aug 23, 2019 · b9dea80 · b9dea80
1 parent 2e06aa9
commit b9dea80
Show file tree

Hide file tree

Showing 55 changed files with 517 additions and 1,134 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/sources/A___rendering_33/A__CORE_ROMANESCO.pde b/src/sources/A___rendering_33/A__CORE_ROMANESCO.pde
@@ -449,14 +449,3 @@ void center_sketch(ivec2 loc) {
   int term_y_1 = height/2;
   loc.y = term_y_0 - term_y_1;
 }
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/A___rendering_33.pde b/src/sources/A___rendering_33/A___rendering_33.pde
@@ -472,6 +472,3 @@ void mouseWheel(MouseEvent e) {
     wheel[0] = e.getCount() *speedWheel;
   } 
 }
-
-
-
diff --git a/src/sources/A___rendering_33/A_debug.pde b/src/sources/A___rendering_33/A_debug.pde
@@ -33,7 +33,3 @@ void test_set_pix_density() {
     set(x,y,c);
   }
 }
-
-
-
-
diff --git a/src/sources/A___rendering_33/B_Core_Prescene.pde b/src/sources/A___rendering_33/B_Core_Prescene.pde
@@ -364,6 +364,3 @@ void key_false() {
   if (key_left) key_left = false;
   if (key_right) key_right = false;
 }
-
-
-
diff --git a/src/sources/A___rendering_33/B_Core_Scene.pde b/src/sources/A___rendering_33/B_Core_Scene.pde
@@ -74,7 +74,7 @@ void init_value_temp_prescene() {
 * MANAGE DIALOGUE SCENE
 */
 void save_dial_scene(String path) {
-  Table save_dial = new Table();
+  processing.data.Table save_dial = new processing.data.Table();
   save_dial.addColumn("fx active");
   save_dial.addColumn("fx slider active");
   TableRow table_row = save_dial.addRow();
@@ -100,7 +100,3 @@ void save_dial_scene(String path) {
   table_row.setString("fx slider active",list_slider);
   saveTable(save_dial,path+"/dialogue_from_scene.csv");
 }
-
-
-
-
diff --git a/src/sources/A___rendering_33/D_depracated.pde b/src/sources/A___rendering_33/D_depracated.pde
@@ -481,17 +481,3 @@ class Canvas {
 }
 // END CANVAS
 /////////////
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Abyss.pde b/src/sources/A___rendering_33/O_Abyss.pde
@@ -1584,16 +1584,3 @@ class The_Abbyss extends Romanesco {
   //END CATALOGUE
 
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Arbre.pde b/src/sources/A___rendering_33/O_Arbre.pde
@@ -242,12 +242,3 @@ class ArbreRomanesco extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Atome.pde b/src/sources/A___rendering_33/O_Atome.pde
@@ -1462,17 +1462,3 @@ String whichSentence(String txt, int whichChapter, int whichSentence) {
 
   return repartition[whichChapter][whichSentence] ;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_BoumBoum.pde b/src/sources/A___rendering_33/O_BoumBoum.pde
@@ -125,15 +125,3 @@ class BoumBoum extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Boxolyzer.pde b/src/sources/A___rendering_33/O_Boxolyzer.pde
@@ -263,18 +263,3 @@ class Boxolyzer extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Cellular_automata.pde b/src/sources/A___rendering_33/O_Cellular_automata.pde
@@ -229,22 +229,3 @@ class Cellular_automata extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Ecosystem_host.pde b/src/sources/A___rendering_33/O_Ecosystem_host.pde
@@ -350,32 +350,3 @@ void costume_DNA(Helix helix, int target, vec3 size, float direction, Costume co
   costume(pos_b, size, angle_b,costume) ;
 
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Escargot.pde b/src/sources/A___rendering_33/O_Escargot.pde
@@ -1822,9 +1822,3 @@ int timer(float tempo) {
   chronometer = newChronometer ;
   return chrnmtr ;
 }
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_FF_Flux.pde b/src/sources/A___rendering_33/O_FF_Flux.pde
@@ -195,22 +195,3 @@ class Flux extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_FF_Force_field.pde b/src/sources/A___rendering_33/O_FF_Force_field.pde
@@ -354,22 +354,3 @@ class FF extends Romanesco {
     colorMode(color_mode_ref,color_arg_ref.red(),color_arg_ref.gre(),color_arg_ref.blu(),color_arg_ref.alp());
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_FF_Puppet_Master.pde b/src/sources/A___rendering_33/O_FF_Puppet_Master.pde
@@ -329,15 +329,3 @@ class Puppet_master extends Romanesco {
     } else return true;
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Grillo.pde b/src/sources/A___rendering_33/O_Grillo.pde
@@ -213,18 +213,3 @@ class Grillo extends Romanesco {
     }
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Hexagone.pde b/src/sources/A___rendering_33/O_Hexagone.pde
@@ -283,12 +283,3 @@ class Honeycomb extends Romanesco {
   }
 }
 //end object two
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Kino.pde b/src/sources/A___rendering_33/O_Kino.pde
@@ -201,11 +201,3 @@ class Kino extends Romanesco {
     }
 	}
 }
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Kofosphere.pde b/src/sources/A___rendering_33/O_Kofosphere.pde
@@ -234,7 +234,3 @@ class Kofosphere extends Romanesco {
     }
   }
 }
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Letter.pde b/src/sources/A___rendering_33/O_Letter.pde
@@ -304,9 +304,3 @@ class Letter extends Romanesco {
     return pts ;
   }
 }
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Lorenz.pde b/src/sources/A___rendering_33/O_Lorenz.pde
@@ -149,15 +149,3 @@ class Lorenz extends Romanesco {
     if(mode == 1) endShape() ;
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Mer.pde b/src/sources/A___rendering_33/O_Mer.pde
@@ -217,18 +217,3 @@ class Mer extends Romanesco {
   }
   //
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/sources/A___rendering_33/O_Rosace.pde b/src/sources/A___rendering_33/O_Rosace.pde
@@ -1367,12 +1367,3 @@ class Rose {
 
 
 }
-
-
-
-
-
-
-
-
-