v1.2 [MAJOR UPDATE]

-Added a new class to manage the game (GameManager) -Added a new function which allows to save and load the match -Added a new function which allows to go back to the start screen -Added a progress bar which shows match status -Updated card back and application icon
acerbisgianluca · Dec 3, 2017 · 9d1d373 · 9d1d373
1 parent f7a8170
commit 9d1d373
Show file tree

Hide file tree

Showing 56 changed files with 628 additions and 1,096 deletions.
diff --git a/build.xml b/build.xml
@@ -7,8 +7,8 @@
 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="Memo" default="default" basedir=".">
-    <description>Builds, tests, and runs the project Memo.</description>
+<project name="Memory" default="default" basedir=".">
+    <description>Builds, tests, and runs the project Memory.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
@@ -58,7 +58,7 @@
 
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="Memo-impl.jar">
+        <target name="run" depends="Memory-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
             </exec>

diff --git a/build/built-jar.properties b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Fri, 01 Dec 2017 18:53:31 +0100
+#Sun, 03 Dec 2017 19:53:19 +0100
 
 
-D\:\\Project\\Java\ Project\\Memo=
+D\:\\Project\\Java\ Project\\Memory=
diff --git a/build/classes/.netbeans_automatic_build b/build/classes/.netbeans_automatic_build
diff --git a/build/classes/.netbeans_update_resources b/build/classes/.netbeans_update_resources
diff --git a/build/classes/Memory/Carta.class b/build/classes/Memory/Carta.class
diff --git a/build/classes/Memory/Game$1.class b/build/classes/Memory/Game$1.class
diff --git a/build/classes/Memory/Game$10.class b/build/classes/Memory/Game$10.class
diff --git a/build/classes/Memory/Game$11.class b/build/classes/Memory/Game$11.class
diff --git a/build/classes/Memory/Game$12.class b/build/classes/Memory/Game$12.class
diff --git a/build/classes/Memory/Game$13.class b/build/classes/Memory/Game$13.class
diff --git a/build/classes/Memory/Game$14.class b/build/classes/Memory/Game$14.class
diff --git a/build/classes/Memory/Game$15.class b/build/classes/Memory/Game$15.class
diff --git a/build/classes/Memory/Game$16.class b/build/classes/Memory/Game$16.class
diff --git a/build/classes/Memory/Game$17.class b/build/classes/Memory/Game$17.class
diff --git a/build/classes/Memory/Game$18.class b/build/classes/Memory/Game$18.class
diff --git a/build/classes/Memory/Game$19.class b/build/classes/Memory/Game$19.class
diff --git a/build/classes/Memory/Game$2.class b/build/classes/Memory/Game$2.class
diff --git a/build/classes/Memory/Game$20.class b/build/classes/Memory/Game$20.class
diff --git a/build/classes/Memory/Game$21.class b/build/classes/Memory/Game$21.class
diff --git a/build/classes/Memory/Game$3.class b/build/classes/Memory/Game$3.class
diff --git a/build/classes/Memory/Game$4.class b/build/classes/Memory/Game$4.class
diff --git a/build/classes/Memory/Game$5.class b/build/classes/Memory/Game$5.class
diff --git a/build/classes/Memory/Game$6.class b/build/classes/Memory/Game$6.class
diff --git a/build/classes/Memory/Game$7.class b/build/classes/Memory/Game$7.class
diff --git a/build/classes/Memory/Game$8.class b/build/classes/Memory/Game$8.class
diff --git a/build/classes/Memory/Game$9.class b/build/classes/Memory/Game$9.class
diff --git a/build/classes/Memory/Game.class b/build/classes/Memory/Game.class
diff --git a/build/classes/Memory/Game.form b/build/classes/Memory/Game.form
diff --git a/build/classes/Memory/GameManager.class b/build/classes/Memory/GameManager.class
diff --git a/build/classes/Memory/Mazzo.class b/build/classes/Memory/Mazzo.class
diff --git a/build/classes/Memory/Start$1.class b/build/classes/Memory/Start$1.class
diff --git a/build/classes/Memory/Start$2.class b/build/classes/Memory/Start$2.class
diff --git a/build/classes/Memory/Start$3.class b/build/classes/Memory/Start$3.class
diff --git a/build/classes/Memory/Start$4.class b/build/classes/Memory/Start$4.class
diff --git a/build/classes/Memory/Start.class b/build/classes/Memory/Start.class
diff --git a/build/classes/Memory/Start.form b/build/classes/Memory/Start.form
diff --git a/build/classes/Memory/img/8.jpg b/build/classes/Memory/img/8.jpg
diff --git a/build/classes/Memory/img/logo.png b/build/classes/Memory/img/logo.png
diff --git a/dist/Memo.jar b/dist/Memo.jar
diff --git a/dist/Memory.jar b/dist/Memory.jar
diff --git a/dist/Memory.zip b/dist/Memory.zip
diff --git a/dist/README.TXT b/dist/README.TXT
@@ -11,7 +11,7 @@ JAR files manifest file (MANIFEST.MF).
 To run the project from the command line, go to the dist folder and
 type the following:
 
-java -jar "Memo.jar" 
+java -jar "Memory.jar" 
 
 To distribute this project, zip up the dist folder (including the lib folder)
 and distribute the ZIP file.

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Memo-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Memory-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -440,7 +440,7 @@ is divided into following sections:
                 </condition>
                 <union id="test.set"/>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Memo" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Memory" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -588,7 +588,7 @@ is divided into following sections:
                 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename Memo -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename Memory -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -880,7 +880,7 @@ is divided into following sections:
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: Memo was already built"/>
+        <echo level="warn" message="Cycle detected: Memory was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
@@ -1361,7 +1361,7 @@ is divided into following sections:
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: Memo was already built"/>
+        <echo level="warn" message="Cycle detected: Memory was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=77818514
-build.xml.script.CRC32=90f0c7e9
+build.xml.data.CRC32=1d05f7fd
+build.xml.script.CRC32=2742f061
 build.xml.stylesheet.CRC32=8064a381@1.80.1.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=77818514
-nbproject/build-impl.xml.script.CRC32=3074c0df
+nbproject/build-impl.xml.data.CRC32=1d05f7fd
+nbproject/build-impl.xml.script.CRC32=a75ce13d
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -2,10 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/D:/Project/Java%20Project/Memo/src/Memory/Game.java</file>
-            <file>file:/D:/Project/Java%20Project/Memo/src/Memory/Start.java</file>
-            <file>file:/D:/Project/Java%20Project/Memo/src/Memory/Deck.java</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -3,7 +3,7 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=Memo
+application.title=Memory
 application.vendor=Gianluca
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -25,7 +25,7 @@ debug.test.classpath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/Memo.jar
+dist.jar=${dist.dir}/Memory.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=

diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>Memo</name>
+            <name>Memory</name>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

diff --git a/src/Memory/Carta.java b/src/Memory/Carta.java