| 
						
					 | 
					
						
						
							
						
						fb938d3be8
					 | 
					
						
						
							
							Main
						
						
						
						
						
						
					 | 
					
						2022-12-09 14:09:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad6a452dc3
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-09 14:06:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47eacd09a2
					 | 
					
						
						
							
							GebietsDatei zusammen mit Mockklasse und Interface fertiggestellt und Kommentar angepasst
						
						
						
						
						
						
					 | 
					
						2022-12-09 13:59:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48683abab0
					 | 
					
						
						
							
							GebietsDatei zusammen mit Mockklasse und Interface fertiggestellt
						
						
						
						
						
						
					 | 
					
						2022-12-09 13:57:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b6ecf5886
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/GebietsDatei.java 
						
						
					 | 
					
						2022-12-09 13:53:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf5dff5820
					 | 
					
						
						
							
							Hallo
						
						
						
						
						
						
					 | 
					
						2022-12-09 13:51:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						82173e4c2a
					 | 
					
						
						
							
							getGesamtEinkommen geändert
						
						
						
						
						
						
					 | 
					
						2022-12-07 18:33:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01fc54a390
					 | 
					
						
						
							
							GebietsDatei Datei Einlesen fertig
						
						
						
						
						
						
					 | 
					
						2022-12-06 15:19:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c82b667244
					 | 
					
						
						
							
							gebietsklasse fertig III
						
						
						
						
						
						
					 | 
					
						2022-12-06 15:18:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f34a62c1b5
					 | 
					
						
						
							
							gebietsklasse fertig II
						
						
						
						
						
						
					 | 
					
						2022-12-06 15:18:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f659bbbf5b
					 | 
					
						
						
							
							gebietsklasse fertig
						
						
						
						
						
						
					 | 
					
						2022-12-06 15:14:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7c24fb672
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:58:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						014f8e9f66
					 | 
					
						
						
							
							ListenInterface ergänzt und Constructor erstellt
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:58:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4baf9cf98f
					 | 
					
						
						
							
							Merge remote-tracking branch 'Java/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:54:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						839fd9bb02
					 | 
					
						
						
							
							MockGebietsDatei angepasst
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:54:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c3b171002
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:54:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d231fcf99
					 | 
					
						
						
							
							Mock u interface
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:54:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8af1ba46c6
					 | 
					
						
						
							
							MockGebietsDatei angepasst
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:53:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea9efaeac7
					 | 
					
						
						
							
							Merge remote-tracking branch 'Java/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:52:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						489ce8a622
					 | 
					
						
						
							
							GebietsQuelle Interface angepasst
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:52:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0384ba5cc2
					 | 
					
						
						
							
							ohne toString
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:50:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c02d32bddb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:49:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ad57e97c9
					 | 
					
						
						
							
							GebietsQuelle Interface hinzugefügt
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:49:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c200188854
					 | 
					
						
						
							
							interface Gebiet
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:47:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8fc55b3a35
					 | 
					
						
						
							
							MockGebietsDatei hinzugefügt
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:46:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bca0c6b22b
					 | 
					
						
						
							
							Merge remote-tracking branch 'Java/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/EinkommenInfo.java
#	src/GebietListe.java 
						
						
					 | 
					
						2022-12-06 14:46:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						221a6c988f
					 | 
					
						
						
							
							Kommentar und main-methode ergänzt
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:41:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c0c729eaf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:39:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b27d7b4ac
					 | 
					
						
						
							
							Kommentar und main-methode ergänzt
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:39:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0ba15dea7c
					 | 
					
						
						
							
							Klasse Gebiet raus
						
						
						
						
						
						
					 | 
					
						2022-12-06 14:36:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1702d9738f
					 | 
					
						
						
							
							Merge remote-tracking branch 'Java/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/Gebiet.java 
						
						
					 | 
					
						2022-12-06 13:57:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2e2415aaf
					 | 
					
						
						
							
							Säuberung Kommentare
						
						
						
						
						
						
					 | 
					
						2022-12-06 13:56:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb3c310936
					 | 
					
						
						
							
							Klasse Gebiet
						
						
						
						
						
						
					 | 
					
						2022-12-03 08:13:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						879ab675b0
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:14:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						84f1f782e9
					 | 
					
						
						
							
							Hallo
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:14:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27d3986e11
					 | 
					
						
						
							
							Merge remote-tracking branch 'Java/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:12:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f0e7f5200
					 | 
					
						
						
							
							Funktionier du drecks Scheiße
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:12:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1219458ef5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:12:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9c86f9b32c
					 | 
					
						
						
							
							Kacken
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:11:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9b87d74cd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:11:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83764dfaf1
					 | 
					
						
						
							
							pushy
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:11:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f8b07e36d4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:10:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83782cc22e
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:10:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f4cf5248d
					 | 
					
						
						
							
							Er kam, er sah , er siegte
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:10:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c02d03293d
					 | 
					
						
						
							
							pushy
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:10:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0baa7c4dfd
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:09:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0e081c4f1
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:09:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						519f66f632
					 | 
					
						
						
							
							test
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:08:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7dd7420fb
					 | 
					
						
						
							
							Hallo
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:07:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5ee8d1c3b
					 | 
					
						
						
							
							Hallo
						
						
						
						
						
						
					 | 
					
						2022-12-02 15:05:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |