Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Winter Break 2021-2022 Master Push #69

Merged
merged 25 commits into from
Jan 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7814d97
Prototype
charlestian23 Dec 26, 2021
c5184ef
Standardized contradiction messages; only Nurikabe messages adjusted …
charlestian23 Dec 29, 2021
0172745
Generalized error message
charlestian23 Jan 2, 2022
b59d96c
Invalid use of case rule error message
charlestian23 Jan 2, 2022
8ebead7
checkRuleRaw fixed
charlestian23 Jan 2, 2022
32b3d43
Case rule invalid use error message
charlestian23 Jan 3, 2022
858e9e1
Number of Cases Greater than 1
charlestian23 Jan 3, 2022
4820f66
Update CaseRule.java
charlestian23 Jan 3, 2022
4fceb23
Nurikabe error messages
charlestian23 Jan 3, 2022
c57d2c3
Light Up error messages
charlestian23 Jan 3, 2022
6c444b4
Merge branch 'truth-table_issue57_and-elim-bug-restructuring' of http…
charlestian23 Jan 3, 2022
fb9e99e
Fillapix error messages
charlestian23 Jan 3, 2022
4088919
Short Truth Table error messages fix
charlestian23 Jan 3, 2022
5f7d711
Skyscrapers error messages
charlestian23 Jan 3, 2022
8788d92
Sudoku error messages
charlestian23 Jan 3, 2022
cbfec2d
Tree Tent error messages
charlestian23 Jan 3, 2022
b1e8049
Finished Nurikabe error messages
charlestian23 Jan 3, 2022
4144936
Update UnreachableBasicRule.java
charlestian23 Jan 3, 2022
42655c4
Merge branch 'dev' into truth-table_issue57_and-elim-bug-restructuring
charlestian23 Jan 3, 2022
1f83b39
Merge pull request #65 from Bram-Hub/light-up_issue45_case-rule-bug
Chase-Grajeda Jan 4, 2022
b6b603a
Merge pull request #66 from Bram-Hub/truth-table_issue54_case-rule-bug
Chase-Grajeda Jan 4, 2022
131e153
Issue 38 Fix
Chase-Grajeda Jan 4, 2022
ab322d0
Merge pull request #68 from Bram-Hub/shortcuts_issue38_macOS-commands
Chase-Grajeda Jan 4, 2022
abae849
Merge branch 'dev' into truth-table_issue57_and-elim-bug-restructuring
charlestian23 Jan 4, 2022
89cf87b
Merge pull request #67 from Bram-Hub/truth-table_issue57_and-elim-bug…
charlestian23 Jan 4, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions bin/main/edu/.idea/.gitignore

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

3 changes: 3 additions & 0 deletions bin/main/edu/.idea/.gitignore 2

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

9 changes: 9 additions & 0 deletions bin/main/edu/.idea/edu.iml

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

6 changes: 6 additions & 0 deletions bin/main/edu/.idea/misc.xml

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

8 changes: 8 additions & 0 deletions bin/main/edu/.idea/modules.xml

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

6 changes: 6 additions & 0 deletions bin/main/edu/.idea/vcs.xml

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

62 changes: 62 additions & 0 deletions bin/main/edu/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
version '2.0.0'

apply plugin: 'java'
apply plugin: 'application'

sourceCompatibility = 1.8

dependencies {
compile project(':legup-update')
compile 'com.google.firebase:firebase-admin:6.3.0'
compile 'org.apache.httpcomponents:httpclient:4.5.1'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'

// compile 'com.google.code.gson:gson:2.8.2'
// compile 'commons-cli:commons-cli:1.4'
// compile 'commons-io:commons-io:2.6'
compile 'org.apache.commons:commons-lang3:3.7'
compile 'org.apache.logging.log4j:log4j-api:2.10.0'
compile 'org.apache.logging.log4j:log4j-core:2.10.0'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile 'junit:junit:4.+'
}

task customFatJar(type: Jar) {
manifest {
attributes('Implementation-Title': 'Legup',
'Implementation-Version': version,
'Main-Class': 'edu.rpi.legup.Legup',
'SplashScreen-Image': 'edu/rpi/legup/images/Legup/LegupSplash.png')
}
archiveName = 'Legup.jar'
from {
configurations.compile.collect {
it.isDirectory() ? it : zipTree(it)
}
}
with jar
}

jar {
from {
configurations.compile.collect {
it.isDirectory() ? it : zipTree(it)
}
configurations.runtime.collect {
it.isDirectory() ? it : zipTree(it)
}
}
manifest {
attributes('Implementation-Title': 'Legup',
'Implementation-Version': version,
'Main-Class': 'edu.rpi.legup.Legup',
'SplashScreen-Image': 'edu/rpi/legup/images/Legup/LegupSplash.png')
}
archiveName = 'Legup.jar'
}

repositories {
mavenCentral()
}
Empty file.
Empty file.
91 changes: 91 additions & 0 deletions bin/main/edu/rpi/.metadata/.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
!SESSION 2019-10-29 22:18:59.756 -----------------------------------------------
eclipse.buildId=4.5.2.M20160212-1500
java.version=1.8.0_131
java.vendor=Oracle Corporation
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments: -product org.eclipse.epp.package.java.product -product org.eclipse.epp.package.java.product -keyring /Users/James/.eclipse_keyring -showlocation
Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product -data /Users/James/Documents/RPI/Research/LEGUP/Legup/src/main/java/edu/rpi -product org.eclipse.epp.package.java.product -keyring /Users/James/.eclipse_keyring -showlocation

!ENTRY org.eclipse.recommenders.snipmatch.rcp 4 0 2019-10-29 22:19:00.381
!MESSAGE FrameworkEvent ERROR
!STACK 0
org.osgi.framework.BundleException: Could not resolve module: org.eclipse.recommenders.snipmatch.rcp [392]
Bundle was not resolved because of a uses contraint violation.
org.osgi.service.resolver.ResolutionException: Uses constraint violation. Unable to resolve resource org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"] because it is exposed to package 'org.eclipse.jgit.dircache' from resources org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="5.2.0.201812061821-r"] and org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"] via two dependency chains.

Chain 1:
org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"]
require: (osgi.wiring.bundle=org.eclipse.jgit)
|
provide: osgi.wiring.bundle: org.eclipse.jgit
org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="5.2.0.201812061821-r"]

Chain 2:
org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"]
require: (&(osgi.wiring.bundle=org.eclipse.egit.core)(bundle-version>=3.2.0))
|
provide: osgi.wiring.bundle; bundle-version:Version="4.0.3.201509231615-r"; osgi.wiring.bundle="org.eclipse.egit.core"; singleton:="true"
org.eclipse.egit.core [osgi.identity; osgi.identity="org.eclipse.egit.core"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"; singleton:="true"]
import: (&(osgi.wiring.package=org.eclipse.jgit.lib)(&(version>=4.0.3)(!(version>=4.1.0))))
|
export: osgi.wiring.package: org.eclipse.jgit.lib; uses:=org.eclipse.jgit.dircache
export: osgi.wiring.package=org.eclipse.jgit.dircache
org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"]
at org.eclipse.osgi.container.Module.start(Module.java:434)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1582)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1561)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1533)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1476)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1)
at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230)
at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340)

!ENTRY org.eclipse.core.net 1 0 2019-10-29 22:19:03.398
!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences

!ENTRY org.eclipse.core.jobs 2 2 2019-10-29 22:19:19.382
!MESSAGE Job found still running after platform shutdown. Jobs should be canceled by the plugin that scheduled them during shutdown: org.eclipse.epp.internal.logging.aeri.ui.log.CheckServerAvailabilityJob
!SESSION 2019-11-06 12:29:45.873 -----------------------------------------------
eclipse.buildId=4.5.2.M20160212-1500
java.version=1.8.0_131
java.vendor=Oracle Corporation
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments: -product org.eclipse.epp.package.java.product -keyring /Users/James/.eclipse_keyring -showlocation
Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product -keyring /Users/James/.eclipse_keyring -showlocation

!ENTRY org.eclipse.recommenders.snipmatch.rcp 4 0 2019-11-06 12:29:46.606
!MESSAGE FrameworkEvent ERROR
!STACK 0
org.osgi.framework.BundleException: Could not resolve module: org.eclipse.recommenders.snipmatch.rcp [392]
Bundle was not resolved because of a uses contraint violation.
org.osgi.service.resolver.ResolutionException: Uses constraint violation. Unable to resolve resource org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"] because it is exposed to package 'org.eclipse.jgit.dircache' from resources org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="5.2.0.201812061821-r"] and org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"] via two dependency chains.

Chain 1:
org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"]
require: (osgi.wiring.bundle=org.eclipse.jgit)
|
provide: osgi.wiring.bundle: org.eclipse.jgit
org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="5.2.0.201812061821-r"]

Chain 2:
org.eclipse.recommenders.snipmatch.rcp [osgi.identity; osgi.identity="org.eclipse.recommenders.snipmatch.rcp"; type="osgi.bundle"; version:Version="2.2.0.v20150609-1848"; singleton:="true"]
require: (&(osgi.wiring.bundle=org.eclipse.egit.core)(bundle-version>=3.2.0))
|
provide: osgi.wiring.bundle; bundle-version:Version="4.0.3.201509231615-r"; osgi.wiring.bundle="org.eclipse.egit.core"; singleton:="true"
org.eclipse.egit.core [osgi.identity; osgi.identity="org.eclipse.egit.core"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"; singleton:="true"]
import: (&(osgi.wiring.package=org.eclipse.jgit.lib)(&(version>=4.0.3)(!(version>=4.1.0))))
|
export: osgi.wiring.package: org.eclipse.jgit.lib; uses:=org.eclipse.jgit.dircache
export: osgi.wiring.package=org.eclipse.jgit.dircache
org.eclipse.jgit [osgi.identity; osgi.identity="org.eclipse.jgit"; type="osgi.bundle"; version:Version="4.0.3.201509231615-r"]
at org.eclipse.osgi.container.Module.start(Module.java:434)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1582)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1561)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1533)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1476)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1)
at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230)
at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340)

!ENTRY org.eclipse.core.net 1 0 2019-11-06 12:29:49.825
!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/edu/rpi/.metadata/.mylyn/tasks.xml.zip
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.m2e.discovery.pref.projects=
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
mylyn.attention.migrated=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
migrated.task.repositories.secure.store=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
org.eclipse.mylyn.tasks.ui.welcome.message=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1554955212164
quickStart=false
tipsAndTricks=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
showIntro=false
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
eclipse.preferences.version=1
Loading