From 031e7ee47d482c6f3f09246877c9ec9400babfc4 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 1 Dec 2021 12:40:11 +0100 Subject: [PATCH] Contol Windwo Update. Velocity Change implemented. FONT and some other Var and method needs to be implemented in the GUI class not in Menu Window Database Update --- lib/Conway-Game-Of-Live.mv.db | Bin 24576 -> 24576 bytes lib/Conway-Game-Of-Live.trace.db | 142 +++++++++++++++++++++++++++++++ src/data/database/DataBase.java | 48 +++++++---- src/game/Control.java | 24 ++++-- src/gui/GUI.java | 2 +- src/gui/MenuWindow.java | 10 +-- src/main/Main.java | 7 +- 7 files changed, 196 insertions(+), 37 deletions(-) diff --git a/lib/Conway-Game-Of-Live.mv.db b/lib/Conway-Game-Of-Live.mv.db index ba27498cd5fddd2548afba19d6d042a62b58b690..3689af60367fc8682da907778ae720a911669688 100644 GIT binary patch literal 24576 zcmeI4&vV*F6vu_Z&BRSQ!y&z;vzA-ConaXL7U(8}Fw9__fJmGZ)k>>`2?mdm(@bZ2 z>mSimbLyezUOMgc*#1TBy{q4A+$6Sx6VrJwjovUWad6Mlz2NB ze@hHe5QK{R>~#9vkX_oE5NB$L759WV0r3n`_jE~9YNW1L{MpHo6VNwbkdyg%HjNJO zCnRv6krP96H5F@)y1~I85C8%|00;m9AOHk_01yBIKmZ5;0U+?f2(&@}e=zoNVITkm zfB+Bx0zd!=00AHX1b_e#00QreK$7IgUQz`hRVE}%^&dIMv+n0u}36&{%85nZq z*m+9kv{c|^HVX{mE3{5P5PYq!RD$slF=SQK9bd?60qA*;$J55_bQ%}}TJ|5UDp>og z@Mm$I6D3(uxpHX}Z66LS8#VftXps?qt`px;YS<$Vam6~3eBz4= z{j7>r&(TF)6&0c=#C3Gt6Ez|To+s#7tnDDPx!>uPOIrxt{bMb$rC~PORukFgZr4Km zgW+zs)8MQ8p1E&zdaVQg%Z(5l-)Zuw)3Z_2YMDc7WzRaa(Ic}vv{37y&m1^-GO(@v z(ZG5*w0aF|)Tq@p%harq*=jaMN?lS%HM!mz?P^L((3`bZqfSp9lIRV)-RNaxAB@uL zr003pD^%j!=+WEasoniX+w3R%9(S5{JG#4MN89S`wQY9Kp4GGZrrkN{MSC~CDwjS- zTX&BVhRZS%4Q#V-qsJY)jTE$Nbq{)bgOElvI_1(Abl@JoecYO+Z7z&ka%YF^O+88O zg?`uT9QRwH7*1oZyuP{L9L|IB^!Yp}RZ6?1!}2=c{^r@t+1?J@Tb*Mv9nZJ7H|c@* zx%mPVFpewUE>5|7-0kQ)UX?MpCgT@mpE@j|61E;hzDh`3 znS9ojX$!85xaVD&=xMde>GX6?OP*5C7I)3yQCjVUUB=sC#@pp)x`~-u;#=QjX6$h_ zT7DIITs<*UOg(O7r6BorE%UgND_zn|moYOMFk^ARP&g7sHWEqYSANs+WH6EujV6FW zXGS_1!Zw`@(cp&daK?NVoiaW`UO1s7i|pI#`L_#NK`E#Ou^_KuXAR>beK_4oA3zj` zlywOEPWXxU^(ckw00AHX1b_e#00KbZLIl#KY_7kvI(n*|vpRZ5lmo*+Uh-?t&$ILR4Od0jUvWA9>7H3c`5;SxMorxgnXJr>o zx~%LXjD3WeWdDCX!{{jCW-G6N+&IOU==@kQCY@L@rX5g>7kY5PhkyVO00KY&2mk>f z00gc?;Jp6M^}nC%e^;RTU%x*6Pk-c}{uh8ZB$>S&nfr3jFp;h0Di=FNKi}AFpy`FMU)-ai_Es#htPa z#GS6RfP#a701yBIKmZ7=Ab~{xGy0p=&RPCn_7zojvA66L`bHXmSWM=!>EuhKZ8PIB zo0DC()#>?Y{=fK&d&O!Trp7tbINmC2oLoGl)y`>&#+w%BdA0M|Uu-PD%sIC&Epyf{ zTn`YIImh;0Uw!kf00e*l5V%eP=k+%$p)>vO JO4pSC{};z@%Xt6* literal 24576 zcmeI4OK;mo5XVJXPEofmphI$O*K%98fFSTqi8o53ECG5XB9%BNfsbV(Se6Wl4ubaD z571kC>7hV-?FVSlLofY4z4p}Qdo9I@-N>;Wj1DB16v^RlSHu0!jNMlGvOS$U$Ep~u zjmbAy))ZSal`A_7Z28z#ImK0YS*+rkQugMH6U!$DU*N@ZGM|Mf zcvI{<&+$U7VG-MkCGX_m0|bBo5C8%|00;m9AOHk_01yBIKmZ8b7=bqE{~KcuHwFSg z00;m9AOHk_01yBIKmZ5;0U+?M2*gQ#*Nv+H`0^A7ss0n|RCTLl^-@(twmicxeNrKC zYCXeCvR=&RzG{;L!3VpXSoS9;SQS_iJLIgi6o6dzbTVtq&t|^LqK$t@RYCsm+^<{P zIgS@ZDOW7)p)ZdN-9(L{u9^C{KI(Lvh-cYip@d4i-!ajCG&1xd>aNHEJ(>GC5Z)qc9WnVus(POPU(ot(Lq)s%R8m8VG8~US> z-f!sRMztpEnyintR9@X{kpnqrtG{W8~7QP@I_vp?2*3?XGrQhNwJE9-zY5XkYxBeN^ z`ki5NT&}pi*K3ZJ{$zH%^b6%ey>LVh7n%7V(c!JV{ry~SYdb&9-Oqg({(39CYo}Yz zHu>dNxNs?iOEFwZ;ZnXA9JQ@zWrr)b`ti&w0;gWYYvRK;-q~In$JIVdM zl^HkD35os}l38n_|I=A(G`9}sX_WrQA~kXLs43|t?T)S$=>LCm-_uISO_dN170=yN zLO-NRC>s}1TqaRM0tw1wT1dE*7P>HAvo3yIst@TH&QGaf`2UEXD1MZVpK2(3R#Xr9 zdlOolk>Rv%9;VF0)DU~`RZk$s?vhFit-UE7DW|HM=*YMc>Byu(bR81g z&HrON6KCYI*Ps9Y5%T|#|Bs3t-nK~L2J`>lzCQmyJfHvnE&p%sL6-lgqF!nI%e%wz zuPn!YQT&UJeqF8-;0@8Qs1krUuk~n?mpQa^1x>d+7?wd?4elmE#0w!_J>+{XWcMbB zbX52*hwS1PU{t7(ybZ%bg`@!?rL`Fk>;M8l00;m9AOHkn{ZHxdRR5EGss0x@nG-CB z+jI^+&Ht~abE*7)P_=r=#BFN3OJ`*_ZFG7)lKf00e*lMIg!l RXZoAg(5e2n#cRs{{|Cf)xK{uG diff --git a/lib/Conway-Game-Of-Live.trace.db b/lib/Conway-Game-Of-Live.trace.db index 0a1891f..873b82f 100644 --- a/lib/Conway-Game-Of-Live.trace.db +++ b/lib/Conway-Game-Of-Live.trace.db @@ -1281,3 +1281,145 @@ SELECT * FROM GAMEINFO WHERE NAME="DUstinkst" [42122-200] org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax Fehler in SQL Befehl "SELECT * FROM GAMEINFO WHERE NAME 'DUstinkst'[*]" Syntax error in SQL statement "SELECT * FROM GAMEINFO WHERE NAME 'DUstinkst'[*]"; SQL statement: select * from gameInfo where name 'DUstinkst' [42000-200] +2021-12-01 11:00:51 jdbc[3]: exception +java.sql.SQLClientInfoException: Client info name 'ApplicationName' not supported. + at org.h2.jdbc.JdbcConnection.setClientInfo(JdbcConnection.java:1749) + at com.intellij.database.remote.jdbc.impl.RemoteConnectionImpl.setClientInfo(RemoteConnectionImpl.java:470) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:359) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:562) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:796) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:677) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:676) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2021-12-01 11:00:59 jdbc[4]: exception +java.sql.SQLClientInfoException: Client info name 'ApplicationName' not supported. + at org.h2.jdbc.JdbcConnection.setClientInfo(JdbcConnection.java:1749) + at com.intellij.database.remote.jdbc.impl.RemoteConnectionImpl.setClientInfo(RemoteConnectionImpl.java:470) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:359) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:562) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:796) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:677) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:676) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2021-12-01 11:13:50 jdbc[3]: exception +java.sql.SQLClientInfoException: Client info name 'ApplicationName' not supported. + at org.h2.jdbc.JdbcConnection.setClientInfo(JdbcConnection.java:1749) + at com.intellij.database.remote.jdbc.impl.RemoteConnectionImpl.setClientInfo(RemoteConnectionImpl.java:470) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:359) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:562) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:796) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:677) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:676) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2021-12-01 11:13:50 jdbc[4]: exception +java.sql.SQLClientInfoException: Client info name 'ApplicationName' not supported. + at org.h2.jdbc.JdbcConnection.setClientInfo(JdbcConnection.java:1749) + at com.intellij.database.remote.jdbc.impl.RemoteConnectionImpl.setClientInfo(RemoteConnectionImpl.java:470) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:359) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:200) + at java.rmi/sun.rmi.transport.Transport$1.run(Transport.java:197) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Transport.java:196) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:562) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:796) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(TCPTransport.java:677) + at java.base/java.security.AccessController.doPrivileged(Native Method) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:676) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2021-12-01 12:20:27 jdbc[4]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Feld "GEN" nicht gefunden +Column "GEN" not found; SQL statement: +select gen from gameInfo where name = 'DUstinkst' [42122-200] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:453) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:429) + at org.h2.message.DbException.get(DbException.java:205) + at org.h2.message.DbException.get(DbException.java:181) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:163) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:145) + at org.h2.command.dml.Select.prepare(Select.java:1206) + at org.h2.command.Parser.prepareCommand(Parser.java:744) + at org.h2.engine.Session.prepareLocal(Session.java:657) + at org.h2.engine.Session.prepareCommand(Session.java:595) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1235) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) + at data.database.DataBase.resultSetSQL(DataBase.java:42) + at data.database.DataBase.getGen(DataBase.java:165) + at game.Control.getFromDatabase(Control.java:103) + at game.Control.buildGameWindow(Control.java:68) + at gui.GUI.buildGameWindow(GUI.java:81) + at gui.MenuWindow$10.actionPerformed(MenuWindow.java:334) + at java.desktop/javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1972) + at java.desktop/javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2313) + at java.desktop/javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:405) + at java.desktop/javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:262) + at java.desktop/javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:279) + at java.desktop/java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:297) + at java.desktop/java.awt.Component.processMouseEvent(Component.java:6626) + at java.desktop/javax.swing.JComponent.processMouseEvent(JComponent.java:3389) + at java.desktop/java.awt.Component.processEvent(Component.java:6391) + at java.desktop/java.awt.Container.processEvent(Container.java:2266) + at java.desktop/java.awt.Component.dispatchEventImpl(Component.java:5001) + at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2324) + at java.desktop/java.awt.Component.dispatchEvent(Component.java:4833) + at java.desktop/java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4948) + at java.desktop/java.awt.LightweightDispatcher.processMouseEvent(Container.java:4575) + at java.desktop/java.awt.LightweightDispatcher.dispatchEvent(Container.java:4516) + at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2310) + at java.desktop/java.awt.Window.dispatchEventImpl(Window.java:2780) + at java.desktop/java.awt.Component.dispatchEvent(Component.java:4833) + at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:773) + at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:722) + at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:716) + at java.base/java.security.AccessController.doPrivileged(AccessController.java:399) + at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86) + at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:97) + at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:746) + at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:744) + at java.base/java.security.AccessController.doPrivileged(AccessController.java:399) + at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86) + at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:743) + at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203) + at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124) + at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113) + at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109) + at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) + at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90) diff --git a/src/data/database/DataBase.java b/src/data/database/DataBase.java index 1b2d3f2..83f24bc 100644 --- a/src/data/database/DataBase.java +++ b/src/data/database/DataBase.java @@ -121,46 +121,60 @@ public class DataBase { } - public Boolean[][] getGrid(String gridName){ + public boolean[][] getGrid(String gridName){ connect(); - ResultSet resultSet = resultSetSQL("select * from gameInfo where name = '"+gridName+"'"); + ResultSet resultInfo = resultSetSQL("select * from gameInfo where name = '"+gridName+"'"); try { - resultSet.next(); - int id = resultSet.getInt("id"); - String name = resultSet.getString("name"); - int width = resultSet.getInt("width"); - int height = resultSet.getInt("height"); - int gen = resultSet.getInt("generation"); + resultInfo.next(); + int id = resultInfo.getInt("id"); + int width = resultInfo.getInt("width"); + int height = resultInfo.getInt("height"); + + resultInfo.close(); boolean[][] cells = new boolean[width][height]; - ResultSet data = resultSetSQL("select * from gameData where id ="+id); - data.next(); - System.out.println(""); + + ResultSet resultData = resultSetSQL("select * from gameData where id ="+id); - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - cells[x][y] = false; - } + while (resultData.next()){ + cells[resultData.getInt("x")][resultData.getInt("y")] = true; } + return cells; + } catch (SQLException e) { e.printStackTrace(); } - - disconnect(); return null; } + public int getGen(String gridName){ + connect(); + ResultSet resultSet = resultSetSQL("select generation from gameInfo where name = '"+gridName+"'"); + try { + resultSet.next(); + int gen = resultSet.getInt("generation"); + disconnect(); + return gen; + } catch (SQLException e) { + e.printStackTrace(); + } + + disconnect(); + return 0; + + } + } diff --git a/src/game/Control.java b/src/game/Control.java index 7c1a9d1..880c4af 100644 --- a/src/game/Control.java +++ b/src/game/Control.java @@ -3,12 +3,9 @@ package game; import data.database.DataBase; import gui.GUI; -import java.sql.ResultSet; import java.util.List; import java.util.concurrent.ThreadLocalRandom; -import static java.lang.Math.round; - public class Control { private GUI gui; @@ -41,7 +38,7 @@ public class Control { clock.start(); } - public void buildGameWindow(int xSize, int ySize, int cellCount, StartMode startMode) { + public void buildGameWindow(int xSize, int ySize, int cellCount, String startMode) { this.xSize = xSize; this.ySize = ySize; this.cellCount = cellCount; @@ -58,15 +55,18 @@ public class Control { switch (startMode) { - case Task1 -> { + case "Task1" -> { generateTask1(); } - case Randomized -> { + case "Randomized" -> { generateRandomized(); } - case Manuel -> { + case "Manuel" -> { buildManuelGame(); } + default -> { + getFromDatabase(startMode); + } } saveFirstGrid(); @@ -76,7 +76,7 @@ public class Control { gui.createGameWindow(this.xSize, this.ySize, this.width, this.height); setRunning(true); - if (startMode == StartMode.Manuel) { + if (startMode == "Manuel") { setRunning(false); gui.buildControlWindow(); } @@ -97,6 +97,14 @@ public class Control { } + private void getFromDatabase(String name){ + + cells = dataBase.getGrid(name); + gen = dataBase.getGen(name); + syncCells(); + + } + private void generateTask1() { for (int x = 0; x < xSize; x++) { for (int y = 0; y < ySize; y++) { diff --git a/src/gui/GUI.java b/src/gui/GUI.java index 133d717..dc4b1ea 100644 --- a/src/gui/GUI.java +++ b/src/gui/GUI.java @@ -77,7 +77,7 @@ public class GUI { gameWindow.showGrid(grid); } - public void buildGameWindow(int xSize, int ySize, int cellCount, StartMode startMode){ + public void buildGameWindow(int xSize, int ySize, int cellCount, String startMode){ control.buildGameWindow(xSize, ySize, cellCount, startMode); } diff --git a/src/gui/MenuWindow.java b/src/gui/MenuWindow.java index dec6256..4ce1d2f 100644 --- a/src/gui/MenuWindow.java +++ b/src/gui/MenuWindow.java @@ -1,8 +1,6 @@ package gui; -import game.StartMode; - import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -333,11 +331,7 @@ public class MenuWindow { @Override public void actionPerformed(ActionEvent e) { - int index = modeBox.getSelectedIndex(); - - StartMode startMode = StartMode.values()[index + 1]; // + 1 BECAUSE MANUEL HAS THE FIRST INDEX IN ENUM - - gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, startMode); + gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, modeBox.getSelectedItem().toString()); menuWindow.setVisible(false); } @@ -359,7 +353,7 @@ public class MenuWindow { manuelStart.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, StartMode.Manuel); + gui.buildGameWindow(xAxisSize, yAxisSize, cellCount, "Manuel"); menuWindow.setVisible(false); } }); diff --git a/src/main/Main.java b/src/main/Main.java index d9552d1..7ca7254 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -2,6 +2,7 @@ package main; import data.database.DataBase; +import game.Control; public class Main { @@ -13,8 +14,8 @@ public class Main { public static void main(String[] args) { -// Control control = new Control(); - // control.start(); + Control control = new Control(); + control.start(); DataBase dataBase = new DataBase(); // dataBase.deleteTables(); // dataBase.createTables(); @@ -35,7 +36,7 @@ public class Main { // // System.out.println(dataBase.getAllGrids()); - dataBase.getGrid("DUstinkst"); +// boolean[][] x = dataBase.getGrid("penis"); }