diff --git a/src/main/java/lecture8_encapsulation/PersonRecord.java b/src/main/java/lecture8_encapsulation/PersonRecord.java index f96d8f387fe05a4729671576c51412cbcef5d008..3c98867545a7966af63c99aa320ba8d2e70181a2 100644 --- a/src/main/java/lecture8_encapsulation/PersonRecord.java +++ b/src/main/java/lecture8_encapsulation/PersonRecord.java @@ -1,7 +1,5 @@ package lecture8_encapsulation; -public record PersonRecord(int age, String name) { - -} +public record PersonRecord(int age, String name) {} diff --git a/src/main/java/lecture8_encapsulation/TrafficLightVisualizer.java b/src/main/java/lecture8_encapsulation/TrafficLightVisualizer.java index 1f1b8862fac97f0fb4a57d0a64b4ff311739e06b..7d1597136d60d9c94b03d06e0d828d7168e99a0a 100644 --- a/src/main/java/lecture8_encapsulation/TrafficLightVisualizer.java +++ b/src/main/java/lecture8_encapsulation/TrafficLightVisualizer.java @@ -87,7 +87,6 @@ public class TrafficLightVisualizer extends JPanel{ try { Thread.sleep(1000); } catch (InterruptedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/src/main/java/lecture8_encapsulation/UsePerson.java b/src/main/java/lecture8_encapsulation/UsePerson.java index c841ef1bde922c816dd1bc9973269cfad2d71774..c8bb52184bc8bec577962134f33fbc8a8cb6bb06 100644 --- a/src/main/java/lecture8_encapsulation/UsePerson.java +++ b/src/main/java/lecture8_encapsulation/UsePerson.java @@ -4,7 +4,13 @@ public class UsePerson { public static void main(String[] args) { - + PersonRecord pr = new PersonRecord(12, "Per"); + System.out.println(pr); + Person p = new Person(17,"Lise"); + System.out.println(p); + + System.out.println(pr.name()); + System.out.println(p.getName()); } } diff --git a/src/main/java/lecture8_encapsulation/useTrafficLight.java b/src/main/java/lecture8_encapsulation/useTrafficLight.java index b720c6c8bd5aa7c37fab4d8ea3b8e20701260ceb..372d3c0cf819ab40528db6190812d7b99a527704 100644 --- a/src/main/java/lecture8_encapsulation/useTrafficLight.java +++ b/src/main/java/lecture8_encapsulation/useTrafficLight.java @@ -11,7 +11,7 @@ public class useTrafficLight { //light.green=true; //not allowed when variable is private viewer.view(light); - //viewer.run(); + viewer.run(); // System.out.println(light.isValid(true, false, true)); // System.out.println(light.isValid(true, true, true)); diff --git a/src/main/java/lecture9/MyPanel.java b/src/main/java/lecture9/MyPanel.java new file mode 100644 index 0000000000000000000000000000000000000000..daf6154c55fa92f5de84ec6c4138698bbc35abe7 --- /dev/null +++ b/src/main/java/lecture9/MyPanel.java @@ -0,0 +1,27 @@ +package lecture9; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; + +import javax.swing.JPanel; + +public class MyPanel extends JPanel{ + + @Override + protected void paintComponent(Graphics g) { + super.paintComponent(g); + for(int i=0; i<100; i+=10) { + g.setColor(Color.GREEN); + g.fillOval(2*i,100 ,80,i); + g.setColor(Color.BLACK); + g.drawOval(2*i,100 ,80,i); + } + g.fillOval(200,100 ,70 ,40); + + Graphics2D g2 = (Graphics2D)g; + + + } + +} diff --git a/src/main/java/lecture9/Range.java b/src/main/java/lecture9/Range.java new file mode 100644 index 0000000000000000000000000000000000000000..4a7540716334120266eb4e1c2c83e4c286169093 --- /dev/null +++ b/src/main/java/lecture9/Range.java @@ -0,0 +1,30 @@ +package lecture9; + +import java.util.ArrayList; +import java.util.Iterator; + +public class Range implements Iterable<Integer>{ + + int max; + + Range(int max){ + this.max = max; + } + + ArrayList<Integer> getList(){ + ArrayList<Integer> indices = new ArrayList<Integer>(); + for(int i=0; i<max; i++) { + indices.add(i); + } + return indices; + } + + @Override + public Iterator<Integer> iterator() { + return getList().iterator(); + } + + static Range range(int max) { + return new Range(max); + } +} diff --git a/src/main/java/lecture9/UseGraphics.java b/src/main/java/lecture9/UseGraphics.java new file mode 100644 index 0000000000000000000000000000000000000000..0c64d984b3b66e09bcda1fe961c606bf0dace3bb --- /dev/null +++ b/src/main/java/lecture9/UseGraphics.java @@ -0,0 +1,18 @@ +package lecture9; + +import javax.swing.JFrame; + +public class UseGraphics { + + public static void main(String[] args) { + JFrame myFrame = new JFrame("My program"); + myFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + myFrame.setSize(300, 300); + + MyPanel myPanel = new MyPanel(); + myFrame.add(myPanel); + + myFrame.setVisible(true); + } + +} diff --git a/src/main/java/lecture9/UseRange.java b/src/main/java/lecture9/UseRange.java new file mode 100644 index 0000000000000000000000000000000000000000..758a8c98348e759baa36f7685ab8b0793af2a55a --- /dev/null +++ b/src/main/java/lecture9/UseRange.java @@ -0,0 +1,19 @@ +package lecture9; + +import static lecture9.Range.range; + +public class UseRange { + + public static void main(String[] args) { + //Range range = new Range(10); + +// for(int i:range.getList()) { +// for(int i:new Range(10)) { +// for(int i:Range.range(10)) { + for(int i:range(10)) { + System.out.println(i); + } + + } + +}