simple reformatting

Marius-Juston · Dec 14, 2019 · 8861331 · 8861331
1 parent 04fee2a
commit 8861331
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 37 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Path Planning.iml b/Path Planning.iml
@@ -19,19 +19,5 @@
     <orderEntry type="library" name="motionLibrary" level="project" />
     <orderEntry type="library" name="fx-gson-3.1.0-sources" level="project" />
     <orderEntry type="library" name="gson-2.8.5" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/Downloads/opencv/build/java/opencv-343.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <NATIVE>
-          <root url="file://$USER_HOME$/Downloads/opencv/build/java/x64" />
-        </NATIVE>
-        <SOURCES>
-          <root url="jar://$USER_HOME$/Downloads/opencv/build/java/opencv-343.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
 </module>
diff --git a/out/production/Path_Planning.jar b/out/production/Path_Planning.jar
diff --git a/src/calibration/Field.java b/src/calibration/Field.java
@@ -291,20 +291,6 @@ public void addObstacle(FieldBorder obstacle) {
 //    Mesher.createMesh();
   }
 
-  @Override
-  public String toString() {
-    return "Field{" +
-        "robotWidth=" + robotWidth +
-        ", SCALE=" + SCALE +
-        ", UNIT=" + UNIT +
-        ", fieldObstacles=" + fieldObstacles +
-        ", imageFile=" + getImageFile() +
-        ", image=" + getImage() +
-        ", obstacleGroup=" + getObstacleGroup() +
-        ", fieldBorder=" + fieldBorder +
-        '}';
-  }
-
   public void improveImageContrast() {
     ColorAdjust colorAdjust = new ColorAdjust(0, 0, 0, 0);
   }
@@ -332,4 +318,18 @@ public Group getObstacleGroup() {
   public void setObstacleGroup(Group obstacleGroup) {
     this.obstacleGroup = obstacleGroup;
   }
+
+  @Override
+  public String toString() {
+    return "Field{" +
+        "robotWidth=" + robotWidth +
+        ", SCALE=" + SCALE +
+        ", UNIT=" + UNIT +
+        ", fieldObstacles=" + fieldObstacles +
+        ", imageFile=" + getImageFile() +
+        ", image=" + getImage() +
+        ", obstacleGroup=" + getObstacleGroup() +
+        ", fieldBorder=" + fieldBorder +
+        '}';
+  }
 }