Merge branch 'main' of https://git.ngb.schule/Tim/wordle

# Conflicts:
#	src/Game.java

.gitignore

@@ -13,7 +13,6 @@ Dokumente*
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear

src/Game.java

@@ -124,6 +124,18 @@ public class Game {
 		return port;
 	}
 
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
     public void setPort(int port) {
         this.port = port;
     }

src/User.java

@@ -151,4 +151,7 @@ public class User
        int[] result = {getWonInTurn(1),getWonInTurn(2),getWonInTurn(3),getWonInTurn(4),getWonInTurn(5),getWonInTurn(6)};
        return result;
     }
+    
+    
+    
 }

src/package.bluej

@@ -2,7 +2,7 @@
 dependency1.from=DatabaseConnector
 dependency1.to=QueryResult
 dependency1.type=UsesDependency
-dependency10.from=User
+dependency10.from=Game
 dependency10.to=DatabaseConnector
 dependency10.type=UsesDependency
 dependency2.from=DatabaseConnector
@@ -11,28 +11,28 @@ dependency2.type=UsesDependency
 dependency3.from=Server
 dependency3.to=List
 dependency3.type=UsesDependency
-dependency4.from=Game
+dependency4.from=WordleServer
-dependency4.to=WordleServer
+dependency4.to=List
 dependency4.type=UsesDependency
-dependency5.from=Game
+dependency5.from=WordleServer
-dependency5.to=User
+dependency5.to=Game
 dependency5.type=UsesDependency
-dependency6.from=Game
+dependency6.from=WordleServer
 dependency6.to=DatabaseConnector
 dependency6.type=UsesDependency
-dependency7.from=WordleServer
+dependency7.from=User
-dependency7.to=List
+dependency7.to=DatabaseConnector
 dependency7.type=UsesDependency
-dependency8.from=WordleServer
+dependency8.from=Game
-dependency8.to=Game
+dependency8.to=WordleServer
 dependency8.type=UsesDependency
-dependency9.from=WordleServer
+dependency9.from=Game
-dependency9.to=DatabaseConnector
+dependency9.to=User
 dependency9.type=UsesDependency
-editor.fx.0.height=1026
+editor.fx.0.height=1017
-editor.fx.0.width=1696
+editor.fx.0.width=854
-editor.fx.0.x=-8
+editor.fx.0.x=100
-editor.fx.0.y=-8
+editor.fx.0.y=100
 objectbench.height=153
 objectbench.width=1656
 package.divider.horizontal=0.6
@@ -65,8 +65,8 @@ target10.name=GUI
 target10.showInterface=false
 target10.type=ClassTarget
 target10.width=120
-target10.x=140
+target10.x=10
-target10.y=150
+target10.y=270
 target11.height=60
 target11.name=Queue
 target11.showInterface=false
@@ -79,8 +79,8 @@ target2.name=DatabaseConnector
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=150
-target2.x=180
+target2.x=220
-target2.y=70
+target2.y=80
 target3.height=60
 target3.name=QueryResult
 target3.showInterface=false
@@ -93,14 +93,14 @@ target4.name=Game
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=180
-target4.x=630
+target4.x=680
-target4.y=340
+target4.y=320
 target5.height=70
 target5.name=User
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=130
-target5.x=900
+target5.x=930
 target5.y=180
 target6.height=70
 target6.name=Server
@@ -121,8 +121,8 @@ target8.name=Guest
 target8.showInterface=false
 target8.type=ClassTarget
 target8.width=130
-target8.x=900
+target8.x=10
-target8.y=310
+target8.y=180
 target9.height=60
 target9.name=List
 target9.showInterface=false