Skip to content

Commit

Permalink
Merge pull request #8 from LSantos06/new
Browse files Browse the repository at this point in the history 
New
  • Loading branch information
@LSantos06
LSantos06 committed May 27, 2016
2 parents 8e32dbd + 7816fed commit 10664de
Show file tree
Hide file tree
Showing 48 changed files with 1,323 additions and 1,679 deletions.
832 changes: 832 additions & 0 deletions .metadata/.log
View file

Large diffs are not rendered by default.

Binary file modified .metadata/.mylyn/tasks.xml.zip
View file
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.core.resources/.projects/GameOfLife/.markers.snap
View file
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.core.resources/.projects/GameOfLife/.syncinfo.snap
View file
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
View file
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
View file
Binary file not shown.
1 change: 1 addition & 0 deletions .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.userLibrary.Rules=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<userlibrary systemlibrary\="false" version\="2">\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/rules.package-1.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/rules.package-2.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/rules.package-3.jar"/>\r\n</userlibrary>\r\n
org.eclipse.jdt.core.userLibrary.Spring=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<userlibrary systemlibrary\="false" version\="2">\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/commons-logging-1.1.1.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.aop-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.asm-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.aspects-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.beans-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.context.support-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.context-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.core-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.expression-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.instrument-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.jdbc-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.jms-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.orm-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.oxm-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.test-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.transaction-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.web.portlet-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.web.servlet-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.web.struts-3.0.5.RELEASE.jar"/>\r\n\t<archive path\="E\:/Dropbox/UnB/4\u00B0 Semestre (1.2016)/Programa\u00E7\u00E3o Orientada a Objetos/Trabalhos/GameOfLife/libs/org.springframework.web-3.0.5.RELEASE.jar"/>\r\n</userlibrary>\r\n
Binary file modified .metadata/.plugins/org.eclipse.jdt.core/3438990737.index
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions .metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ INDEX VERSION 1.127+E:\Dropbox\UnB\4
1568382268.index
3504796767.index
2916644690.index
3396732044.index
460341412.index
1139262804.index
3304681068.index
4145425724.index
1000146671.index
1155594363.index
919905438.index
Expand All @@ -21,6 +23,7 @@ INDEX VERSION 1.127+E:\Dropbox\UnB\4
504399471.index
158865063.index
3317667954.index
2379644508.index
4051341462.index
2178152368.index
1597346485.index
Expand Down
2 changes: 2 additions & 0 deletions .metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
2016-05-03 21:55:20,201 [Worker-8] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache file is out-of-date. Remote download required.
2016-05-03 22:15:48,067 [Worker-2] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache file is not out-of-date. No remote download required.
2016-05-04 19:41:30,121 [Worker-29] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache file is not out-of-date. No remote download required.
2016-05-05 21:50:48,140 [main] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache file is out-of-date. Remote download required.
2016-05-11 18:21:05,223 [Worker-11] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache file is out-of-date. Remote download required.
2 changes: 1 addition & 1 deletion .metadata/version.ini
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Wed May 04 18:34:15 BRT 2016
#Wed May 11 18:19:29 BRT 2016
org.eclipse.core.runtime=2
org.eclipse.platform=4.5.2.v20160212-1500
Empty file removed .recommenders/index/http___download_eclipse_org_recommenders_models_mars_/write.lock
View file
Empty file.
1 change: 1 addition & 0 deletions GameOfLife/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/Spring"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Rules"/>
<classpathentry kind="output" path="bin"/>
</classpath>
29 changes: 0 additions & 29 deletions GameOfLife/bin/game (Avell-G1713MAX's conflicted copy 2016-05-03).xml
View file

This file was deleted.

18 changes: 9 additions & 9 deletions GameOfLife/bin/game.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<beans>
<!-- List of rules -->
<bean id="rules" class="br.unb.cic.poo.engine.Rules" scope="prototype">
<bean id="rules" class="br.unb.cic.poo.rules.Rules" scope="prototype">
<property name="strategies">
<list>
<ref bean="anneal"/>
Expand All @@ -19,13 +19,13 @@
</bean>

<!-- Rules -->
<bean id="anneal" class="br.unb.cic.poo.engine.Anneal" scope="prototype"/>
<bean id="conway" class="br.unb.cic.poo.engine.Conway" scope="prototype"/>
<bean id="dayandnight" class="br.unb.cic.poo.engine.DayAndNight" scope="prototype"/>
<bean id="highlife" class="br.unb.cic.poo.engine.HighLife" scope="prototype"/>
<bean id="lifewithoutdeath" class="br.unb.cic.poo.engine.LifeWithoutDeath" scope="prototype"/>
<bean id="morley" class="br.unb.cic.poo.engine.Morley" scope="prototype"/>
<bean id="replicator" class="br.unb.cic.poo.engine.Replicator" scope="prototype"/>
<bean id="seeds" class="br.unb.cic.poo.engine.Seeds" scope="prototype"/>
<bean id="anneal" class="br.unb.cic.poo.rules.Anneal" scope="prototype"/>
<bean id="conway" class="br.unb.cic.poo.rules.Conway" scope="prototype"/>
<bean id="dayandnight" class="br.unb.cic.poo.rules.DayAndNight" scope="prototype"/>
<bean id="highlife" class="br.unb.cic.poo.rules.HighLife" scope="prototype"/>
<bean id="lifewithoutdeath" class="br.unb.cic.poo.rules.LifeWithoutDeath" scope="prototype"/>
<bean id="morley" class="br.unb.cic.poo.rules.Morley" scope="prototype"/>
<bean id="replicator" class="br.unb.cic.poo.rules.Replicator" scope="prototype"/>
<bean id="seeds" class="br.unb.cic.poo.rules.Seeds" scope="prototype"/>

</beans>
47 changes: 0 additions & 47 deletions GameOfLife/bin/spring.xml
View file

This file was deleted.

67 changes: 0 additions & 67 deletions GameOfLife/src/br/unb/cic/poo/controller/GameController.java
View file

This file was deleted.

42 changes: 0 additions & 42 deletions GameOfLife/src/br/unb/cic/poo/engine/Anneal.java
View file

This file was deleted.

41 changes: 0 additions & 41 deletions GameOfLife/src/br/unb/cic/poo/engine/Conway.java
View file

This file was deleted.

42 changes: 0 additions & 42 deletions GameOfLife/src/br/unb/cic/poo/engine/DayAndNight.java
View file

This file was deleted.

42 changes: 0 additions & 42 deletions GameOfLife/src/br/unb/cic/poo/engine/Diamoeba.java
View file

This file was deleted.

Loading

0 comments on commit 10664de

Please sign in to comment.