Skip to content
Snippets Groups Projects
Verified Commit 759cb9e8 authored by Biryuk, Volodymyr's avatar Biryuk, Volodymyr
Browse files

Remove redundant colors and method to get colors 

The colors can be get via a method. Necessary for testing.
parent 448f118b
No related branches found
No related tags found
1 merge request!3Remove redundant colors and method to get colors
Hide whitespace changes
Inline Side-by-side
Turtle.java
+ 17
− 10
View file @ 759cb9e8
...@@ -68,16 +68,7 @@ public class Turtle ...@@ -68,16 +68,7 @@ public class Turtle
FARBEN.put("hellgrau", Color.LIGHT_GRAY); FARBEN.put("hellgrau", Color.LIGHT_GRAY);
FARBEN.put("magenta", Color.MAGENTA); FARBEN.put("magenta", Color.MAGENTA);
FARBEN.put("pink", Color.PINK); FARBEN.put("pink", Color.PINK);
FARBEN.put("gelb", Color.YELLOW); FARBEN.put("gelb", Color.YELLOW);
FARBEN.put("schwarz", Color.BLACK);
FARBEN.put("weiss", Color.WHITE);
FARBEN.put("cyan", Color.CYAN);
FARBEN.put("grau", Color.GRAY);
FARBEN.put("blau", Color.BLUE);
FARBEN.put("orange", Color.ORANGE);
FARBEN.put("gruen", Color.GREEN);
FARBEN.put("rot", Color.RED);
FARBEN.put("dunkelgrau", Color.DARK_GRAY);
FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]); FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]);
} }
...@@ -276,6 +267,22 @@ public class Turtle ...@@ -276,6 +267,22 @@ public class Turtle
} }
} }
} }
@Override
public String toString()
{
String farbreihenfolge = "";
for(Color c : FARB_ARRAY)
{
farbreihenfolge += c + ", ";
}
return farbreihenfolge;
}
public Color[] gibFarben()
{
return FARB_ARRAY;
}
} }
/** /**
......
bluej.pkg
+ 38
− 22
View file @ 759cb9e8
...@@ -2,22 +2,25 @@ ...@@ -2,22 +2,25 @@
dependency1.from=Dompteur dependency1.from=Dompteur
dependency1.to=Turtle dependency1.to=Turtle
dependency1.type=UsesDependency dependency1.type=UsesDependency
editor.fx.0.height=722 dependency2.from=TurtleTest
editor.fx.0.width=800 dependency2.to=Turtle
editor.fx.0.x=790 dependency2.type=UsesDependency
editor.fx.0.y=102 editor.fx.0.height=875
objectbench.height=102 editor.fx.0.width=1440
objectbench.width=461 editor.fx.0.x=0
editor.fx.0.y=25
objectbench.height=158
objectbench.width=413
package.divider.horizontal=0.6 package.divider.horizontal=0.6
package.divider.vertical=0.7966417910447762 package.divider.vertical=0.7965474722564735
package.editor.height=420 package.editor.height=639
package.editor.width=661 package.editor.width=604
package.editor.x=704 package.editor.x=0
package.editor.y=449 package.editor.y=25
package.frame.height=600 package.frame.height=875
package.frame.width=800 package.frame.width=720
package.numDependencies=1 package.numDependencies=2
package.numTargets=2 package.numTargets=4
package.showExtends=true package.showExtends=true
package.showUses=true package.showUses=true
project.charset=windows-1252 project.charset=windows-1252
...@@ -34,11 +37,24 @@ target1.type=ClassTarget ...@@ -34,11 +37,24 @@ target1.type=ClassTarget
target1.width=80 target1.width=80
target1.x=170 target1.x=170
target1.y=120 target1.y=120
target2.height=50 target2.height=70
target2.name=Dompteur target2.name=TurtleTest
target2.naviview.expanded=true
target2.showInterface=false target2.showInterface=false
target2.type=ClassTarget target2.type=UnitTestTargetJunit5
target2.width=90 target2.width=120
target2.x=70 target2.x=270
target2.y=40 target2.y=220
target3.height=50
target3.name=Dompteur
target3.naviview.expanded=true
target3.showInterface=false
target3.type=ClassTarget
target3.width=90
target3.x=70
target3.y=40
target4.height=70
target4.name=README.md
target4.type=TextTarget
target4.width=120
target4.x=10
target4.y=180
package.bluej
+ 38
− 22
View file @ 759cb9e8
...@@ -2,22 +2,25 @@ ...@@ -2,22 +2,25 @@
dependency1.from=Dompteur dependency1.from=Dompteur
dependency1.to=Turtle dependency1.to=Turtle
dependency1.type=UsesDependency dependency1.type=UsesDependency
editor.fx.0.height=722 dependency2.from=TurtleTest
editor.fx.0.width=800 dependency2.to=Turtle
editor.fx.0.x=790 dependency2.type=UsesDependency
editor.fx.0.y=102 editor.fx.0.height=875
objectbench.height=102 editor.fx.0.width=1440
objectbench.width=461 editor.fx.0.x=0
editor.fx.0.y=25
objectbench.height=158
objectbench.width=413
package.divider.horizontal=0.6 package.divider.horizontal=0.6
package.divider.vertical=0.7966417910447762 package.divider.vertical=0.7965474722564735
package.editor.height=420 package.editor.height=639
package.editor.width=661 package.editor.width=604
package.editor.x=704 package.editor.x=0
package.editor.y=449 package.editor.y=25
package.frame.height=600 package.frame.height=875
package.frame.width=800 package.frame.width=720
package.numDependencies=1 package.numDependencies=2
package.numTargets=2 package.numTargets=4
package.showExtends=true package.showExtends=true
package.showUses=true package.showUses=true
project.charset=windows-1252 project.charset=windows-1252
...@@ -34,11 +37,24 @@ target1.type=ClassTarget ...@@ -34,11 +37,24 @@ target1.type=ClassTarget
target1.width=80 target1.width=80
target1.x=170 target1.x=170
target1.y=120 target1.y=120
target2.height=50 target2.height=70
target2.name=Dompteur target2.name=TurtleTest
target2.naviview.expanded=true
target2.showInterface=false target2.showInterface=false
target2.type=ClassTarget target2.type=UnitTestTargetJunit5
target2.width=90 target2.width=120
target2.x=70 target2.x=270
target2.y=40 target2.y=220
target3.height=50
target3.name=Dompteur
target3.naviview.expanded=true
target3.showInterface=false
target3.type=ClassTarget
target3.width=90
target3.x=70
target3.y=40
target4.height=70
target4.name=README.md
target4.type=TextTarget
target4.width=120
target4.x=10
target4.y=180
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment