Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9a06031
Added dice tests
DustinsCode Nov 29, 2017
f31877b
fixed some checkstyle issues in DiceTest
DustinsCode Nov 30, 2017
6460677
Merge remote-tracking branch 'refs/remotes/origin/master' into Testing
DustinsCode Nov 30, 2017
62fe81b
Fixed some checkstyle in FarkleDiceLogic
DustinsCode Nov 30, 2017
d917588
Use JDK 9
huttonb Nov 30, 2017
0c699d9
NEW UI LOOK!
harriswe Nov 30, 2017
c5033f2
Merge remote-tracking branch 'origin/Testing' into Testing
harriswe Nov 30, 2017
81315e5
IDK why this is not working.
harriswe Nov 30, 2017
9389634
Updated Controller Test.
harriswe Dec 1, 2017
ebcbfb6
LogicDiceTesting updates
huttonb Dec 1, 2017
1677353
Merge branch 'Testing' of https://github.com/xStaticVoid/Farkle into …
huttonb Dec 1, 2017
436b30b
whoops
huttonb Dec 1, 2017
41a4d5d
LogicTests
huttonb Dec 1, 2017
1dba6ca
Logic Testing Checkstyle update
huttonb Dec 1, 2017
93c3b2b
Added some things
DustinsCode Dec 1, 2017
b9872f9
Controller Test finished to extent of what can be Unit Tested.
harriswe Dec 1, 2017
4b9329d
Merge remote-tracking branch 'origin/Testing' into Testing
harriswe Dec 1, 2017
6ecda0d
bank spam fix
huttonb Dec 1, 2017
77158a3
Completed Checkstyle and fixed broken tests in ModelTest.
harriswe Dec 2, 2017
8fd7792
Completed Checkstyle and fixed broken tests in ModelTest.
harriswe Dec 4, 2017
d5b6f5b
Just changed APP title to reflect current release.
harriswe Dec 7, 2017
e899b19
Added new UML Diagram
harriswe Dec 7, 2017
2c1b5c8
Added most recent checkstyle
harriswe Dec 8, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8"><meta name="author" content="JetBrains"><script type="text/javascript" src="script.js"></script><link rel="stylesheet" type="text/css" href="styles.css"/><title>IntelliJ IDEA inspection report</title></head><body><h3>IntelliJ IDEA inspection report:</h3><div style="width:100%;"><div style="float:left; width:50%;"><h4>Inspection tree:</h4><li><label for="1876919145"><b>'Project&nbsp;&#39;C:\Users\Wes&nbsp;Harrison\IdeaProjects\Farkle&#39;&nbsp;Farkle' project</b>&nbsp;<span class="grayout">&nbsp;&nbsp;2&nbsp;warnings&nbsp;</span></label><input type="checkbox" checked onclick="navigate(1876919145)" id="1876919145" /><ol class="tree"><li><label for="1043762438"><b>Checkstyle</b>&nbsp;group&nbsp;<span class="grayout">&nbsp;&nbsp;2&nbsp;warnings&nbsp;</span></label><input type="checkbox" onclick="navigate(1043762438)" id="1043762438" /><ol class="tree"><li><label for="875568447"><b>Checkstyle&nbsp;real&#8209;time&nbsp;scan</b>&nbsp;inspection&nbsp;<span class="grayout">&nbsp;&nbsp;2&nbsp;warnings&nbsp;</span></label><input type="checkbox" onclick="navigate(875568447)" id="875568447" /><ol class="tree"><li><label for="149790027">file&nbsp;<b>ControllerTest.java</b>&nbsp;<span class="grayout">&nbsp;&nbsp;1&nbsp;warning&nbsp;</span></label><input type="checkbox" onclick="navigate(149790027)" id="149790027" /><div id="d149790027" style="display:none"><p class="problem-description-group">Location</p><div class="location"><b>ControllerTest.java</b><br>in package&nbsp;<code>testing</code>file&nbsp;<code><a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/testing/ControllerTest.java#0">ControllerTest.java</a></code></div><br><br><p class="problem-description-group">Problem synopsis</p><div class="problem-description"><div class="problem-description"><ul><li>Checkstyle: Using the '.*' form of import should be avoided - org.mockito.Mockito.*. (at line <a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/testing/ControllerTest.java#519">20</a>)<br><br></li></ul><table cellpadding="0" border="0" cellspacing="0"><tr><td>&nbsp;</td></tr></table></div></div></div><ol class="tree"><li><label for="1067090020"><span style="margin:1px;background:#f2f794">WARNING</span>&nbsp;Checkstyle:&nbsp;Using&nbsp;the&nbsp;&#39;.*&#39;&nbsp;form&nbsp;of&nbsp;import&nbsp;should&nbsp;be&nbsp;avoided&nbsp;&#8209;&nbsp;org.mockito.Mockito.*.&nbsp;<span class="grayout">&nbsp;&nbsp;&nbsp;&nbsp;</span></label><input type="checkbox" onclick="navigate(1067090020)" id="1067090020" /><div id="d1067090020" style="display:none"><p class="problem-description-group">Location</p><div class="location"><b>ControllerTest.java</b><br>in package&nbsp;<code>testing</code>file&nbsp;<code><a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/testing/ControllerTest.java#0">ControllerTest.java</a></code></div><br><br><p class="problem-description-group">Problem synopsis</p><div class="problem-description"><div class="problem-description"><ul><li>Checkstyle: Using the '.*' form of import should be avoided - org.mockito.Mockito.*. (at line <a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/testing/ControllerTest.java#519">20</a>)<br><br></li></ul><table cellpadding="0" border="0" cellspacing="0"><tr><td>&nbsp;</td></tr></table></div></div></div><ol class="tree"></ol></li></ol></li><li><label for="441410399">file&nbsp;<b>Model.java</b>&nbsp;<span class="grayout">&nbsp;&nbsp;1&nbsp;warning&nbsp;</span></label><input type="checkbox" onclick="navigate(441410399)" id="441410399" /><div id="d441410399" style="display:none"><p class="problem-description-group">Location</p><div class="location"><b>Model.java</b><br>in package&nbsp;<code>farkleapp</code>file&nbsp;<code><a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/farkleapp/Model.java#0">Model.java</a></code></div><br><br><p class="problem-description-group">Problem synopsis</p><div class="problem-description"><div class="problem-description"><ul><li>Checkstyle: Using the '.*' form of import should be avoided - java.util.*. (at line <a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/farkleapp/Model.java#358">13</a>)<br><br></li></ul><table cellpadding="0" border="0" cellspacing="0"><tr><td>&nbsp;</td></tr></table></div></div></div><ol class="tree"><li><label for="2114763730"><span style="margin:1px;background:#f2f794">WARNING</span>&nbsp;Checkstyle:&nbsp;Using&nbsp;the&nbsp;&#39;.*&#39;&nbsp;form&nbsp;of&nbsp;import&nbsp;should&nbsp;be&nbsp;avoided&nbsp;&#8209;&nbsp;java.util.*.&nbsp;<span class="grayout">&nbsp;&nbsp;&nbsp;&nbsp;</span></label><input type="checkbox" onclick="navigate(2114763730)" id="2114763730" /><div id="d2114763730" style="display:none"><p class="problem-description-group">Location</p><div class="location"><b>Model.java</b><br>in package&nbsp;<code>farkleapp</code>file&nbsp;<code><a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/farkleapp/Model.java#0">Model.java</a></code></div><br><br><p class="problem-description-group">Problem synopsis</p><div class="problem-description"><div class="problem-description"><ul><li>Checkstyle: Using the '.*' form of import should be avoided - java.util.*. (at line <a HREF="file://C:/Users/Wes Harrison/IdeaProjects/Farkle/src/farkleapp/Model.java#358">13</a>)<br><br></li></ul><table cellpadding="0" border="0" cellspacing="0"><tr><td>&nbsp;</td></tr></table></div></div></div><ol class="tree"></ol></li></ol></li></ol></li></ol></li></ol></li></div><div style="float:left; width:50%;"><h4>Problem description:</h4><div id="preview">Select a problem element in tree</div></div><div></body></html>
23 changes: 23 additions & 0 deletions Checkstyle/Checkstyle Scan Results/Version 2.0 Release 2/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @author: Dmitry Batkovich
*/
function navigate(an_id) {
problem_div = document.getElementById("d" + an_id);
preview_div = document.getElementById("preview");
preview_div.innerHTML = problem_div != null ? problem_div.innerHTML : "Select a problem element in tree";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
html {
font-family: \Helvetica Neue\, Helvetica, Arial, \Lucida Grande\, sans-serif;
}

body {
color: #4C4C4C;
margin: 60px 60px 0 60px;
}

p {
font-size: 1em;
margin: 0 0 1em 0;
}

.grayout {
opacity: 0.6;
}

body, input, select, textarea, th, td {
font-size: 1em;
}

li {
position: relative;
list-style: none;
}

label:hover {
color: #0C479D;
text-decoration: underline;
}

li::before {
content: "\23FA";
margin: 0;
}

li input {
position: absolute;
left: 0;
margin-left: 0;
background: none;
opacity: 0;
z-index: 2;
cursor: pointer;
height: 1em;
width: 1em;
top: 0;
}

li input + ol {
margin: -15px 0 0 -44px;
height: 1em;
}

li input + ol > li {
display: none;
margin-left: -14px !important;
padding-left: 1px;
}

li label {
padding-left: 5px;
}

li input:checked + ol {
margin: -20px 0 0 -44px;
padding: 25px 0 0 80px;
height: auto;
}

li input:checked + ol > li {
display: block;
margin: 0 0 2px;
}

li input:checked + ol > li:last-child {
margin: 0 0 1px;
}

div.location {
margin-left: 40px;
}
38 changes: 38 additions & 0 deletions JavaDoc/Version 2.0/allclasses-frame.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9) on Mon Dec 04 14:03:04 EST 2017 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2017-12-04">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="farkleapp/Controller.html" title="class in farkleapp" target="classFrame">Controller</a></li>
<li><a href="testing/ControllerTest.html" title="class in testing" target="classFrame">ControllerTest</a></li>
<li><a href="farklegame/Dice.html" title="class in farklegame" target="classFrame">Dice</a></li>
<li><a href="farkleapp/DiceImages.html" title="class in farkleapp" target="classFrame">DiceImages</a></li>
<li><a href="testing/FakeController.html" title="class in testing" target="classFrame">FakeController</a></li>
<li><a href="farkleapp/FarkleApp.html" title="class in farkleapp" target="classFrame">FarkleApp</a></li>
<li><a href="farkleapp/FarkleControllerInterface.html" title="interface in farkleapp" target="classFrame"><span class="interfaceName">FarkleControllerInterface</span></a></li>
<li><a href="farklegame/FarkleDiceLogic.html" title="class in farklegame" target="classFrame">FarkleDiceLogic</a></li>
<li><a href="testing/FarkleModelTest.html" title="class in testing" target="classFrame">FarkleModelTest</a></li>
<li><a href="farkleapp/GameAlerts.html" title="class in farkleapp" target="classFrame">GameAlerts</a></li>
<li><a href="farkleapp/Model.html" title="class in farkleapp" target="classFrame">Model</a></li>
</ul>
</div>
</body>
</html>
38 changes: 38 additions & 0 deletions JavaDoc/Version 2.0/allclasses-noframe.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9) on Mon Dec 04 14:03:04 EST 2017 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2017-12-04">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="farkleapp/Controller.html" title="class in farkleapp">Controller</a></li>
<li><a href="testing/ControllerTest.html" title="class in testing">ControllerTest</a></li>
<li><a href="farklegame/Dice.html" title="class in farklegame">Dice</a></li>
<li><a href="farkleapp/DiceImages.html" title="class in farkleapp">DiceImages</a></li>
<li><a href="testing/FakeController.html" title="class in testing">FakeController</a></li>
<li><a href="farkleapp/FarkleApp.html" title="class in farkleapp">FarkleApp</a></li>
<li><a href="farkleapp/FarkleControllerInterface.html" title="interface in farkleapp"><span class="interfaceName">FarkleControllerInterface</span></a></li>
<li><a href="farklegame/FarkleDiceLogic.html" title="class in farklegame">FarkleDiceLogic</a></li>
<li><a href="testing/FarkleModelTest.html" title="class in testing">FarkleModelTest</a></li>
<li><a href="farkleapp/GameAlerts.html" title="class in farkleapp">GameAlerts</a></li>
<li><a href="farkleapp/Model.html" title="class in farkleapp">Model</a></li>
</ul>
</div>
</body>
</html>
150 changes: 150 additions & 0 deletions JavaDoc/Version 2.0/constant-values.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9) on Mon Dec 04 14:03:03 EST 2017 -->
<title>Constant Field Values</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2017-12-04">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Constant Field Values";
}
}
catch(err) {
}
//-->
var pathtoroot = "./";loadScripts(document, 'script');</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<div class="fixedNav">
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a name="navbar.top">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.top.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="overview-summary.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="deprecated-list.html">Deprecated</a></li>
<li><a href="index-files/index-1.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
</div>
<div class="subNav">
<ul class="navList">
<li>Prev</li>
<li>Next</li>
</ul>
<ul class="navList">
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<ul class="navListSearch">
<li><span>SEARCH:&nbsp;</span>
<input type="text" id="search" value=" " disabled="disabled">
<input type="reset" id="reset" value=" " disabled="disabled">
</li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_top");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
</div>
<div class="navPadding">&nbsp;</div>
<script type="text/javascript"><!--
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
//-->
</script>
<div class="header">
<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
<h2 title="Contents">Contents</h2>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar.bottom">
<!-- -->
</a>
<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.bottom.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
<li><a href="overview-summary.html">Overview</a></li>
<li>Package</li>
<li>Class</li>
<li><a href="overview-tree.html">Tree</a></li>
<li><a href="deprecated-list.html">Deprecated</a></li>
<li><a href="index-files/index-1.html">Index</a></li>
<li><a href="help-doc.html">Help</a></li>
</ul>
</div>
<div class="subNav">
<ul class="navList">
<li>Prev</li>
<li>Next</li>
</ul>
<ul class="navList">
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_bottom">
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_bottom");
if(window==top) {
allClassesLink.style.display = "block";
}
else {
allClassesLink.style.display = "none";
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.bottom">
<!-- -->
</a></div>
<!-- ======== END OF BOTTOM NAVBAR ======= -->
</body>
</html>
Loading