Skip to content

Commit

Permalink
add google-java-format to gradle config and use it to format the java…
Browse files Browse the repository at this point in the history 
… files, doesn't work for the aspectj files up to now
  • Loading branch information
@stieglma
stieglma committed Apr 13, 2016
1 parent 2f19b3e commit 154a4ed
Show file tree
Hide file tree
Showing 13 changed files with 929 additions and 808 deletions.
7 changes: 6 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: 'java'
apply plugin: 'application'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'com.github.sherter.google-java-format'

mainClassName = 'me.stieglmaier.schafkopfAuswerter.main.Schafkopfauswerter'

Expand All @@ -17,10 +18,14 @@ buildscript {
maven {
url "https://maven.eveoh.nl/content/repositories/releases"
}
maven {
url "https://oss.sonatype.org/content/repositories/snapshots/"
}
}

dependencies {
classpath "nl.eveoh:gradle-aspectj:1.5"
classpath group: "nl.eveoh", name: "gradle-aspectj", version: "1.5"
classpath group: "com.github.sherter.googlejavaformatgradleplugin", name: "google-java-format-gradle-plugin", version: "0.3-SNAPSHOT"
}
}

Expand Down
46 changes: 23 additions & 23 deletions src/main/java/me/stieglmaier/schafkopfAuswerter/main/Schafkopfauswerter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@

public class Schafkopfauswerter {

/**
* @param args
*/
public static void main(String[] args) {
EventQueue.invokeLater(new Runnable() {
public void run() {
try {
try {
for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
UIManager.setLookAndFeel(info.getClassName());
break;
}
}
} catch (Exception e) {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
/**
* @param args
*/
public static void main(String[] args) {
EventQueue.invokeLater(
new Runnable() {
public void run() {
try {
try {
for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
UIManager.setLookAndFeel(info.getClassName());
break;
}

GUI frame = new GUI(new Schafkopfmodel());
frame.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
}

GUI frame = new GUI(new Schafkopfmodel());
frame.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
}
});
}

}
}
216 changes: 126 additions & 90 deletions src/main/java/me/stieglmaier/schafkopfAuswerter/model/Schafkopfmodel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,102 +11,138 @@

public class Schafkopfmodel {

GameData gameDB = new GameData();

public GameData getGameData() {
return gameDB;
}

public void addRufspiel(Players one, Players two, boolean won,
int laufende, Schneider schneider, Spritzen spritze, int gedoppelt) {

int price = (int) ((SystemValues.rufspiel + laufende
* SystemValues.schneider + schneider.ordinal()
* SystemValues.schneider) * Math.pow(2,
(spritze.ordinal() + gedoppelt)));

addRufspielHelp(price, one, two, won);
}

private void addRufspielHelp(int price, Players one, Players two,
boolean won) {

DataObject obj = gameDB.getLast();
int[] playerVals = { obj.getValP1(), obj.getValP2(), obj.getValP3(),
obj.getValP4() };

if (!won) {
price *= -1;
}

for (int i = 0; i < playerVals.length; i++) {
if (i == one.getNumber() || i == two.getNumber()) {
playerVals[i] += price;
} else {
playerVals[i] -= price;
}
}

WIN win = won ? WIN.PLAYER : WIN.ENEMY;

gameDB.addData(new DataObject(one.toString(), Games.RUFSPIEL, price,
playerVals[0], playerVals[1], playerVals[2], playerVals[3], win));
GameData gameDB = new GameData();

public GameData getGameData() {
return gameDB;
}

public void addRufspiel(
Players one,
Players two,
boolean won,
int laufende,
Schneider schneider,
Spritzen spritze,
int gedoppelt) {

int price =
(int)
((SystemValues.rufspiel
+ laufende * SystemValues.schneider
+ schneider.ordinal() * SystemValues.schneider)
* Math.pow(2, (spritze.ordinal() + gedoppelt)));

addRufspielHelp(price, one, two, won);
}

private void addRufspielHelp(int price, Players one, Players two, boolean won) {

DataObject obj = gameDB.getLast();
int[] playerVals = {obj.getValP1(), obj.getValP2(), obj.getValP3(), obj.getValP4()};

if (!won) {
price *= -1;
}

public void addSolo(Players one, boolean won, int laufende,
Schneider schneider, Spritzen spritze, int gedoppelt) {

int price = (int) ((SystemValues.solo + laufende
* SystemValues.schneider + schneider.ordinal()
* SystemValues.schneider) * Math.pow(2,
(spritze.ordinal() + gedoppelt)));

addSoloHelp(price, one, won, Games.SOLO);
}

public void addSoloTout(Players one, boolean won, int laufende,
Spritzen spritze, int gedoppelt) {

int price = (int) ((SystemValues.solo + laufende
* SystemValues.schneider) * Math.pow(2, (spritze.ordinal()
+ gedoppelt + 1)));

addSoloHelp(price, one, won, Games.TOUT);
for (int i = 0; i < playerVals.length; i++) {
if (i == one.getNumber() || i == two.getNumber()) {
playerVals[i] += price;
} else {
playerVals[i] -= price;
}
}

private void addSoloHelp(int price, Players one, boolean won, Games game) {
DataObject obj = gameDB.getLast();
int[] playerVals = { obj.getValP1(), obj.getValP2(), obj.getValP3(),
obj.getValP4() };

if (!won) {
price *= -1;
}

for (int i = 0; i < playerVals.length; i++) {
if (i == one.getNumber()) {
playerVals[i] += price * 3;
} else {
playerVals[i] -= price;
}
}

WIN win = won ? WIN.PLAYER : WIN.ENEMY;

gameDB.addData(new DataObject(one.toString(), game, price,
playerVals[0], playerVals[1], playerVals[2], playerVals[3], win));
WIN win = won ? WIN.PLAYER : WIN.ENEMY;

gameDB.addData(
new DataObject(
one.toString(),
Games.RUFSPIEL,
price,
playerVals[0],
playerVals[1],
playerVals[2],
playerVals[3],
win));
}

public void addSolo(
Players one,
boolean won,
int laufende,
Schneider schneider,
Spritzen spritze,
int gedoppelt) {

int price =
(int)
((SystemValues.solo
+ laufende * SystemValues.schneider
+ schneider.ordinal() * SystemValues.schneider)
* Math.pow(2, (spritze.ordinal() + gedoppelt)));

addSoloHelp(price, one, won, Games.SOLO);
}

public void addSoloTout(Players one, boolean won, int laufende, Spritzen spritze, int gedoppelt) {

int price =
(int)
((SystemValues.solo + laufende * SystemValues.schneider)
* Math.pow(2, (spritze.ordinal() + gedoppelt + 1)));

addSoloHelp(price, one, won, Games.TOUT);
}

private void addSoloHelp(int price, Players one, boolean won, Games game) {
DataObject obj = gameDB.getLast();
int[] playerVals = {obj.getValP1(), obj.getValP2(), obj.getValP3(), obj.getValP4()};

if (!won) {
price *= -1;
}

public void addSoloSie(Players one, int gedoppelt) {
int price = (int) ((SystemValues.solo + 8
* SystemValues.schneider) * Math.pow(2, gedoppelt + 1));

addSoloHelp(price, one, true, Games.SIE);
for (int i = 0; i < playerVals.length; i++) {
if (i == one.getNumber()) {
playerVals[i] += price * 3;
} else {
playerVals[i] -= price;
}
}

public void addWeiter() {
DataObject obj = gameDB.getLast();
gameDB.addData(new DataObject("/", Games.WEITER, 0, obj.getValP1(), obj
.getValP2(), obj.getValP3(), obj.getValP4(), WIN.NOONE));
}
WIN win = won ? WIN.PLAYER : WIN.ENEMY;

gameDB.addData(
new DataObject(
one.toString(),
game,
price,
playerVals[0],
playerVals[1],
playerVals[2],
playerVals[3],
win));
}

public void addSoloSie(Players one, int gedoppelt) {
int price =
(int) ((SystemValues.solo + 8 * SystemValues.schneider) * Math.pow(2, gedoppelt + 1));

addSoloHelp(price, one, true, Games.SIE);
}

public void addWeiter() {
DataObject obj = gameDB.getLast();
gameDB.addData(
new DataObject(
"/",
Games.WEITER,
0,
obj.getValP1(),
obj.getValP2(),
obj.getValP3(),
obj.getValP4(),
WIN.NOONE));
}
}
Loading

0 comments on commit 154a4ed

Please sign in to comment.