-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into FinishRoomCaseRuleAttempt
- Loading branch information
Showing
116 changed files
with
2,694 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,10 @@ name: Java Code Auto Format | |
| on: pull_request | ||
|
|
||
| jobs: | ||
| format: | ||
| if: github.event.pull_request.head.repo.full_name == github.repository | ||
| format_dev: | ||
| if: | | ||
| github.event.pull_request.head.ref == 'dev' && | ||
| github.event.pull_request.head.repo.full_name == github.repository | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout code | ||
|
|
@@ -15,7 +17,6 @@ jobs: | |
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 21 | ||
| distribution: temurin | ||
|
|
||
| - name: Grant execute permission for gradlew | ||
| run: chmod +x gradlew | ||
|
|
@@ -28,7 +29,58 @@ jobs: | |
|
|
||
| - name: Check for modified files | ||
| id: git-check | ||
| run: echo "modified=$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT | ||
| run: echo "modified=$(if [[ -n $(git status -s) ]]; then echo "true"; else echo "false"; fi)" >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Create temporary branch and pull request | ||
| if: steps.git-check.outputs.modified == 'true' | ||
| run: | | ||
| git config --global user.name 'Bram van Heuveln' | ||
| git config --global user.email '[email protected]' | ||
| git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} | ||
| branch_name="auto-format-code-$(date +%s)" | ||
| git checkout -b $branch_name | ||
| ./gradlew :spotlessApply | ||
| git add . | ||
| git commit -am "Automated Java code formatting changes" | ||
| git push --set-upstream origin $branch_name | ||
| gh pr create -B dev -H $branch_name --title 'Automated Java code formatting changes' --body 'This pull request contains automated code formatting changes.' --reviewer ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Must approve auto-format pull request | ||
| if: steps.git-check.outputs.modified == 'true' | ||
| run: | | ||
| echo "Please review and approve the appropriate auto-format-code pull request." | ||
| exit 1 | ||
| format_pull_request_to_dev: | ||
| if: | | ||
| github.event.pull_request.base.ref == 'dev' && | ||
| github.event.pull_request.head.repo.full_name == github.repository | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v1 | ||
| with: | ||
| ref: ${{ github.head_ref }} | ||
|
|
||
| - name: Set up JDK 21 | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 21 | ||
|
|
||
| - name: Grant execute permission for gradlew | ||
| run: chmod +x gradlew | ||
|
|
||
| - name: Build with Gradle | ||
| run: ./gradlew build -x test | ||
|
|
||
| - name: Run spotless | ||
| run: ./gradlew :spotlessApply | ||
|
|
||
| - name: Check for modified files | ||
| id: git-check | ||
| run: echo "modified=$(if [[ -n $(git status -s) ]]; then echo "true"; else echo "false"; fi)" >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Push changes | ||
| if: steps.git-check.outputs.modified == 'true' | ||
|
|
@@ -37,4 +89,5 @@ jobs: | |
| git config --global user.email '[email protected]' | ||
| git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} | ||
| git add . | ||
| git diff --cached --exit-code || git commit -am "Automated Java code formatting changes" && git push | ||
| git commit -am "Automated Java code formatting changes" | ||
| git push | ||
108 changes: 55 additions & 53 deletions
108
src/main/java/edu/rpi/legup/model/gameboard/GridRegion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,55 @@ | ||
| package edu.rpi.legup.model.gameboard; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public abstract class GridRegion<T> { | ||
|
|
||
| protected List<T> regionCells; | ||
|
|
||
| /** | ||
| * Region Constructor | ||
| */ | ||
| public GridRegion() { | ||
| this.regionCells = new ArrayList<>(); | ||
| } | ||
|
|
||
| /** | ||
| * Adds the cell to the region | ||
| * @param cell cell to be added to the region | ||
| */ | ||
| public void addCell(T cell) { | ||
| regionCells.add(cell); | ||
| } | ||
|
|
||
| /** | ||
| * Removes the cell from the region | ||
| * @param cell cell to be remove from the region | ||
| */ | ||
| public void removeCell(T cell) { | ||
| regionCells.remove(cell); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the list of cells in the region | ||
| * @return list of cells in region | ||
| */ | ||
| public List<T> getCells() { | ||
| return regionCells; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the number of cells in the region | ||
| * @return number of cells in the region | ||
| */ | ||
| public int getSize(){ | ||
| return regionCells.size(); | ||
| } | ||
|
|
||
| /* | ||
| public void colorRegion(){} | ||
| */ | ||
|
|
||
| } | ||
| package edu.rpi.legup.model.gameboard; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public abstract class GridRegion<T> { | ||
|
|
||
| protected List<T> regionCells; | ||
|
|
||
| /** Region Constructor */ | ||
| public GridRegion() { | ||
| this.regionCells = new ArrayList<>(); | ||
| } | ||
|
|
||
| /** | ||
| * Adds the cell to the region | ||
| * | ||
| * @param cell cell to be added to the region | ||
| */ | ||
| public void addCell(T cell) { | ||
| regionCells.add(cell); | ||
| } | ||
|
|
||
| /** | ||
| * Removes the cell from the region | ||
| * | ||
| * @param cell cell to be remove from the region | ||
| */ | ||
| public void removeCell(T cell) { | ||
| regionCells.remove(cell); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the list of cells in the region | ||
| * | ||
| * @return list of cells in region | ||
| */ | ||
| public List<T> getCells() { | ||
| return regionCells; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the number of cells in the region | ||
| * | ||
| * @return number of cells in the region | ||
| */ | ||
| public int getSize() { | ||
| return regionCells.size(); | ||
| } | ||
|
|
||
| /* | ||
| public void colorRegion(){} | ||
| */ | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.