Merge remote-tracking branch 'origin/master'

src/org/eidecker/oca8lernen/general/ArrayFun.java

@@ -0,0 +1,35 @@
+package org.eidecker.oca8lernen.general;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author seidecke.
+ */
+public class ArrayFun {
+
+	char index;
+
+	@Test
+	public void testArrayInit() {
+		String[] strings = {"Hallo", "Welt"};
+		assertEquals(0, index);
+		assertEquals("Hallo", strings[index]);
+
+		assertEquals("Hallo", strings[(byte) 1]);
+		assertEquals("Hallo", strings[(short) 1]);
+		assertEquals("Hallo", strings[(char) 1]);
+
+		// assertEquals("Hallo", strings[(float) 1]); // Compilerfehler, muss Ganzzahl sein
+		// assertEquals("Hallo", strings[(long) 1]); // Compilerfehler, muss int oder kleiner sein
+
+		// Arrayklammern vor und nach Variablenname erlaubt
+		String [] twodim [];
+
+		String[][] twoDimStrings = {strings};
+
+
+	}
+
+}

src/org/eidecker/oca8lernen/general/CastExceptions.java

@@ -49,7 +49,13 @@ public class CastExceptions {
 class OberCast {
 
 	public void method() throws IOException{
+		Integer i;
 
+		long l2 = (int)12;
+
+		int i2 = 2;
+
+		i = (int)i2;
 	}
 
 }

src/org/eidecker/oca8lernen/general/ForEach.java

@@ -0,0 +1,24 @@
+package org.eidecker.oca8lernen.general;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author seidecke.
+ */
+public class ForEach {
+
+	@Test
+	public void testLaufvariable() {
+
+		int[] ints = new int[5];
+
+		for (int i: ints)
+			System.out.println(i);
+
+
+		List<String> sList;
+
+
+	}
+}

src/org/eidecker/oca8lernen/general/HeaderList.java

@@ -1,9 +1,58 @@
 package org.eidecker.oca8lernen.general;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author seidecke.
  */
 public class HeaderList extends ArrayList {
 }
+
+
+class Listtest {
+
+	@Test
+	public void testListInterface() {
+		anyList().add("Hallo");
+	}
+
+
+	@Test
+	public void testHashMapInterface() {
+
+		Map<String, List<String>> map = new HashMap<>();
+		List<String> l = new ArrayList<>();
+		l.add("1");
+		map.put("1", l);
+		map.get("1").add("2");
+
+		System.out.println(map.values());
+
+	}
+
+	private List<String> anyList() {
+		return Collections.emptyList();
+	}
+
+	@Test
+	public void longList() {
+		LinkedList linkedList = new LinkedList();
+
+		for (int i = 0; i <= Integer.MAX_VALUE; i++) {
+			linkedList.add(i);
+			if (i % 1_000_000 == 0) System.out.println(i / 1_000_000 + " Millionen, " + (((double)i / Integer.MAX_VALUE) * 100) + " Prozent");
+
+		}
+
+		linkedList.add(-1);
+	}
+
+
+
+}

src/org/eidecker/oca8lernen/general/InterfaceWithFields.java

@@ -1,5 +1,7 @@
 package org.eidecker.oca8lernen.general;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InterfaceWithFields implements T1, T2 {
@@ -18,6 +20,8 @@ public class InterfaceWithFields implements T1, T2 {
 interface T1 {
 	int VALUE = 99;
 	int VALUE_T1 = 1;
+
+	default int getValue() {return VALUE;}
 }
 
 interface T2 {
@@ -31,11 +35,15 @@ interface T2 {
 
 class Tester {
 
+	@Test
 	public void interfaceTest() {
 		InterfaceWithFields interfaceWithFields = new InterfaceWithFields();
 		assertEquals(99, ((T1)interfaceWithFields).VALUE);
 		assertEquals(98, ((T2)interfaceWithFields).VALUE);
 
+		T1 t1 = new InterfaceWithFields();
+		System.out.println(t1.getValue());
+
 		assertEquals(1, interfaceWithFields.VALUE_T1);
 		assertEquals(2, interfaceWithFields.VALUE_T2);
 	}

src/org/eidecker/oca8lernen/general/Overloading.java

@@ -202,6 +202,11 @@ class PrimitiveOverloading {
 		return VARIANTE_BYTE;
 	}
 
+	public String neuerVersuch(byte l) {
+		System.out.println("long");
+		return "long";
+	}
+
 }
 
 class PrimitiveOverloadingTester {
@@ -229,7 +234,30 @@ class PrimitiveOverloadingTester {
 		// Primitiv, nicht vorhanden, auch kein Wrapper
 		assertEquals(VARIANTE_INT, primitiveOverloading.overloadMe((short) 1));
 
+		primitiveOverloading.neuerVersuch((char)12);
 
+		OverloadMe2 overloadMe2 = new OverloadMe2();
+		// overloadMe2.one(1, 1);
+
+		overloadMe2.two(new Integer(1));
+	}
+
+}
+
+class OverloadMe2 {
+
+	public int one(double d, int i) {
+		return 1;
+	}
+
+	public int one(int d, double i) {
+		return 1;
+	}
+
+
+
+	public int two(Long i) {
+		return 1;
 	}
 
 }

src/org/eidecker/oca8lernen/general/Primitive.java

@@ -1,12 +1,12 @@
 package org.eidecker.oca8lernen.general;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 public class Primitive {
 
 
@@ -85,6 +85,8 @@ public class Primitive {
 		char c5;
 		byte b9 = 2;
 
+		byte b2 = 'a';
+
 		float f9 = Long.MAX_VALUE;
 		System.out.println("f9: " + f9);
 
@@ -112,6 +114,10 @@ public class Primitive {
 		assertFalse(short3 == short4);
 
 
+		Short short5 = new Short((short)127);
+		Short short6 = new Short((short)127);
+		assertFalse(short5 == short6);
+
 	}
 
 	@Test
@@ -123,3 +129,9 @@ public class Primitive {
 
 
 }
+
+class AndereKlasse {
+	public static void main(String[] args) {
+		System.out.println("Geht auch aus nicht public-Klasse");
+	}
+}

src/org/eidecker/oca8lernen/general/PrimitiveUndWrapperTest.java

@@ -37,6 +37,13 @@ public class PrimitiveUndWrapperTest {
 //		System.out.println(s);
 	}
 
+	@Test
+	public void literalUnderscore() {
+		// int i = 1_1_;
+
+		double d = 1_1.1_1;
+	}
+
 	@Test
 	public void wrapperEquals() {
 

src/org/eidecker/oca8lernen/general/StringIndex.java

@@ -57,6 +57,12 @@ public class StringIndex {
 
 		testStringBuilder = new StringBuilder("1234567890");
 		assertEquals("12345890", testStringBuilder.delete(5,7).toString());
+
+
+		testStringBuilder = new StringBuilder("1234567890");
+		assertEquals("1234567890", testStringBuilder.delete(5,5).toString());
+
+
 		testStringBuilder = new StringBuilder("1234567890");
 		assertEquals("71234567890", testStringBuilder.insert(0,7).toString());
 		testStringBuilder = new StringBuilder("1234567890");

src/org/eidecker/oca8lernen/general/SwitchSyntax.java

@@ -7,6 +7,9 @@ public class SwitchSyntax {
 	final int k = 0;
 
 	public SwitchSyntax() {
+		switch(1) {
+
+		}
 	}
 
 	@Test
@@ -21,13 +24,33 @@ public class SwitchSyntax {
 				break;
 				}
 			case 3:
-			default:
+			default: {
 				int j;
 				System.out.println("default");
 			}
+
+		}
 	}
 	// Todo SeEi
 
+	@Test
+	public void switchWithComputation() {
+
+		final int i = 3;
+
+		switch(getSwitchBEdingung()) {
+			case i:
+				System.out.println("i");
+				break;
+			case i-1:
+				System.out.println("i-1");
+			default:
+				System.out.println("Was anderes");
+		}
+
+
+	}
+
 	@Test
 	public void switchString() {
 		switch (getString()) {

src/org/eidecker/oca8lernen/lastminute/InterfacesDefault.java

@@ -0,0 +1,52 @@
+package org.eidecker.oca8lernen.lastminute;
+
+import org.junit.jupiter.api.Test;
+
+public class InterfacesDefault implements I1, I2{
+
+
+	@Override
+	public void method() {
+		System.out.println("Aus InterfacesDefault");
+		//System.out.println(s2);
+		//I1.super.method();
+
+		//System.out.println(I1.s);
+	}
+}
+
+class Außerhalb {
+
+	@Test
+	public void someMethod() {
+		I1 i1 = new InterfacesDefault();
+		i1.method();
+		System.out.println(i1.s);
+		System.out.println(i1.s2);
+
+		InterfacesDefault i2 = new InterfacesDefault();
+		i2.method();
+		System.out.println(((I1) i2).s);
+		System.out.println(((I2) i2).s);
+		//System.out.println(i2.s);
+
+	}
+
+}
+
+interface I1 {
+
+	String s = "Hallo";
+	String s2 = "Noch einer";
+
+	default void method() {
+		System.out.println("Aus I2");
+	}
+}
+
+interface I2 {
+
+	String s = "Welt";
+
+	void method();
+}

src/org/eidecker/oca8lernen/lastminute/Kleinigkeiten.java

@@ -1,19 +1,28 @@
 package org.eidecker.oca8lernen.lastminute;
 
-import org.eidecker.oca8lernen.lastminute.hilfspackage.KlasseInEinemAnderenPackage;
-import org.junit.jupiter.api.Test;
-
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ThreadFactory;
+import org.eidecker.oca8lernen.lastminute.hilfspackage.KlasseInEinemAnderenPackage;
+import org.junit.jupiter.api.Test;
 
 public class Kleinigkeiten {
 
 	// Methoden dürfen private final sein (final sinnlos)
 	private final String methode() {
+		LocalTime t1 = LocalTime.now();
+		LocalDate t2 = LocalDate.now();
+
+		// t1 instanceof t2;
+
+
 		return "Sinnlos";
+
+
 	}
 
 	@Test
@@ -24,6 +33,20 @@ public class Kleinigkeiten {
 //				 else System.out.println("2");
 	}
 
+	public void variabennamen (int i) {
+		// for (int i = i; )
+		// char c = 1.0;
+	}
+
+	@Test
+	public void removeFromArrayList() {
+		List<Integer> iList = new ArrayList<>();
+		iList.add(1);
+		iList.add(1);
+		iList.add(2);
+		iList.remove(new Integer(1));
+	}
+
 	@Test
 	public void testPackagePolymorphie() {
 		List<Oberklasse> oberklassen = Arrays.asList(new Oberklasse(), new KlasseInEinemAnderenPackage());
@@ -108,6 +131,8 @@ interface MySuperInterface extends Serializable, ThreadFactory {
 	default void m1() {
 
 	}
+
+	public abstract void my();
 }
 
 interface MyOtherSuperInterface {

src/org/eidecker/oca8lernen/lastminute/Oberklasse.java

@@ -1,15 +1,27 @@
 package org.eidecker.oca8lernen.lastminute;
 
+import org.eidecker.oca8lernen.lastminute.hilfspackage.PublicClassInEinemAnderenPackage;
+import org.junit.jupiter.api.Test;
+
 public class Oberklasse {
 
-	public final void publicMethode() {
+	static protected String feldInOberklasse;
 
+	public final void publicMethode() {
+		System.out.println("Public");
 	}
 
 	private final void privateMethode() {
 
 	}
 
+	@Test
+	public void test() {
+		PublicClassInEinemAnderenPackage publicClassInEinemAnderenPackage = new PublicClassInEinemAnderenPackage();
+		publicClassInEinemAnderenPackage.publicMethode();
+
+	}
+
 	final void packageMethode() {
 		System.out.println("packageMethode in Oberklasse");
 	}

src/org/eidecker/oca8lernen/lastminute/StaticSichtbarkeit.java

@@ -9,13 +9,35 @@ public class StaticSichtbarkeit {
 		Ober ober = new Unter();
 		ober.methode2(ober); // Ober, da zur Compilezeit ausgewählt (Bei Überladen würde nur die Signatur gewählt!)
 
-		Unter.methode2(ober);
+		System.out.println(ober.s);
+
+		String a = "";
+		a += "Welt";
+		// a -= "Welte";
+		String b = null;
+		System.out.println(b instanceof Object);
+
+
+
+
 	}
 
 }
 
+interface Interface {
+	static void methode2(Ober ober) {
+		System.out.println("Interface");
+	}
 
-class Ober {
+	static void methode3(Ober ober) {
+		System.out.println("Interface");
+	}
+}
+
+
+class Ober implements Interface {
+
+	public static String s = "OberStatic";
 
 	private final void geheimeMethode() {
 
@@ -25,11 +47,17 @@ class Ober {
 		System.out.println("Ober");
 	}
 
+	void methode3(Ober ober) {
+
+	}
+
 
 }
 
 class Unter extends Ober {
 
+	public String s = "UnterNichtStatic";
+
 	public void geheimeMethode() {
 
 	}

src/org/eidecker/oca8lernen/lastminute/castbaeume/Graph.java

@@ -11,6 +11,16 @@ public class Graph {
 		e = (E)f;
 	}
 
+	@Test
+	public void testArrayAssignment() {
+		D[] ds = {};
+		E[] es = {};
+
+		es = (E[])ds;
+
+		ds = (D[])es;
+	}
+
 }
 
 /*

src/org/eidecker/oca8lernen/lastminute/hilfspackage/KlasseInEinemAnderenPackage.java

@@ -1,10 +1,23 @@
 package org.eidecker.oca8lernen.lastminute.hilfspackage;
 
 import org.eidecker.oca8lernen.lastminute.Oberklasse;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
 
 public class KlasseInEinemAnderenPackage extends Oberklasse {
 
+	protected String feldInOberklasse;
+
 	void privateMethode() {
+		try {
+			// anotherOne();
+		} catch (Exception e) {
+
+		}
+	}
+
+	void anotherOne() throws IOException {
 
 	}
 
@@ -17,3 +30,17 @@ public class KlasseInEinemAnderenPackage extends Oberklasse {
 	}
 
 }
+
+class AuchInEinemAnderenPackage {
+
+	public void publicMethode() {
+		System.out.println("Public AuchInEinemAnderenPackage");
+	}
+
+	@Test
+	public void testMe() {
+		KlasseInEinemAnderenPackage klasseInEinemAnderenPackage = new KlasseInEinemAnderenPackage();
+		klasseInEinemAnderenPackage.publicMethode();
+	}
+
+}

src/org/eidecker/oca8lernen/lastminute/hilfspackage/PublicClassInEinemAnderenPackage.java

@@ -0,0 +1,30 @@
+package org.eidecker.oca8lernen.lastminute.hilfspackage;
+
+public class PublicClassInEinemAnderenPackage extends AuchInEinemAnderenPackage {
+
+	public static void main(String[] args) {
+		"Hallo".concat("Test");
+	}
+
+	public static String s;
+
+}
+
+class NochEineSub extends PublicClassInEinemAnderenPackage {
+	public String s = "nicht statisch";
+
+	public static void main(String[] args) {
+		PublicClassInEinemAnderenPackage n = new NochEineSub();
+		System.out.println(n.s);
+		int k;
+		int j=k=3;
+		System.out.println(k);
+		System.out.println(j);
+
+		 int i = Integer.MIN_VALUE;
+		 int i2 = -i;
+		System.out.println(i);
+		 System.out.println(i2);
+
+	}
+}