mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
Update Maven plugins, checkstyle, Add namespace javadocs
This commit is contained in:
2
.gitattributes
vendored
2
.gitattributes
vendored
@@ -11044,6 +11044,7 @@ src/main/java/forge/control/ControlMatchUI.java -text
|
|||||||
src/main/java/forge/control/FControl.java -text
|
src/main/java/forge/control/FControl.java -text
|
||||||
src/main/java/forge/control/KeyboardShortcuts.java -text
|
src/main/java/forge/control/KeyboardShortcuts.java -text
|
||||||
src/main/java/forge/control/bazaar/ControlStall.java -text
|
src/main/java/forge/control/bazaar/ControlStall.java -text
|
||||||
|
src/main/java/forge/control/bazaar/package-info.java -text svneol=native#text/plain
|
||||||
src/main/java/forge/control/home/ControlConstructed.java -text
|
src/main/java/forge/control/home/ControlConstructed.java -text
|
||||||
src/main/java/forge/control/home/ControlDraft.java -text
|
src/main/java/forge/control/home/ControlDraft.java -text
|
||||||
src/main/java/forge/control/home/ControlQuest.java -text
|
src/main/java/forge/control/home/ControlQuest.java -text
|
||||||
@@ -11218,6 +11219,7 @@ src/main/java/forge/view/Main.java -text
|
|||||||
src/main/java/forge/view/bazaar/BazaarTopLevel.java -text
|
src/main/java/forge/view/bazaar/BazaarTopLevel.java -text
|
||||||
src/main/java/forge/view/bazaar/ViewItem.java -text
|
src/main/java/forge/view/bazaar/ViewItem.java -text
|
||||||
src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain
|
src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain
|
||||||
|
src/main/java/forge/view/bazaar/package-info.java svneol=native#text/plain
|
||||||
src/main/java/forge/view/editor/EditorTopLevel.java -text
|
src/main/java/forge/view/editor/EditorTopLevel.java -text
|
||||||
src/main/java/forge/view/editor/package-info.java svneol=native#text/plain
|
src/main/java/forge/view/editor/package-info.java svneol=native#text/plain
|
||||||
src/main/java/forge/view/home/HomeTopLevel.java -text
|
src/main/java/forge/view/home/HomeTopLevel.java -text
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@@ -467,7 +467,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-pmd-plugin</artifactId>
|
<artifactId>maven-pmd-plugin</artifactId>
|
||||||
<version>2.6</version>
|
<version>2.7</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
@@ -503,7 +503,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>versions-maven-plugin</artifactId>
|
<artifactId>versions-maven-plugin</artifactId>
|
||||||
<version>1.3</version>
|
<version>1.3.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
@@ -627,7 +627,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-pmd-plugin</artifactId>
|
<artifactId>maven-pmd-plugin</artifactId>
|
||||||
<version>2.6</version>
|
<version>2.7</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<linkXRef>true</linkXRef>
|
<linkXRef>true</linkXRef>
|
||||||
<sourceEncoding>utf-8</sourceEncoding>
|
<sourceEncoding>utf-8</sourceEncoding>
|
||||||
@@ -682,7 +682,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>versions-maven-plugin</artifactId>
|
<artifactId>versions-maven-plugin</artifactId>
|
||||||
<version>1.3</version>
|
<version>1.3.1</version>
|
||||||
<reportSets>
|
<reportSets>
|
||||||
<reportSet>
|
<reportSet>
|
||||||
<reports>
|
<reports>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ public final class Constant {
|
|||||||
public static final Deck[] COMPUTER_DECK = new Deck[1];
|
public static final Deck[] COMPUTER_DECK = new Deck[1];
|
||||||
|
|
||||||
/** The skin name. */
|
/** The skin name. */
|
||||||
public static String SKIN_NAME = "default";
|
private static String skinName = "default";
|
||||||
|
|
||||||
/** The game type. */
|
/** The game type. */
|
||||||
private static GameType gameType = GameType.Constructed;
|
private static GameType gameType = GameType.Constructed;
|
||||||
@@ -104,6 +104,24 @@ public final class Constant {
|
|||||||
public static void setGameType(final GameType gameType0) {
|
public static void setGameType(final GameType gameType0) {
|
||||||
Runtime.gameType = gameType0;
|
Runtime.gameType = gameType0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the skin name.
|
||||||
|
*
|
||||||
|
* @return the skin name
|
||||||
|
*/
|
||||||
|
public static String getSkinName() {
|
||||||
|
return Runtime.skinName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the skin name.
|
||||||
|
*
|
||||||
|
* @param skinName the new skin name
|
||||||
|
*/
|
||||||
|
public static void setSkinName(final String skinName) {
|
||||||
|
Runtime.skinName = skinName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
3
src/main/java/forge/control/bazaar/package-info.java
Normal file
3
src/main/java/forge/control/bazaar/package-info.java
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
/** Controller (as in model-view-controller) for Forge. */
|
||||||
|
package forge.control.bazaar;
|
||||||
|
|
||||||
@@ -105,10 +105,10 @@ public class FModel {
|
|||||||
// It's looking like all the settings at the same time, here only.
|
// It's looking like all the settings at the same time, here only.
|
||||||
// Doublestrike 06-02-12
|
// Doublestrike 06-02-12
|
||||||
Constant.Runtime.DEV_MODE[0] = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
|
Constant.Runtime.DEV_MODE[0] = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
|
||||||
Constant.Runtime.SKIN_NAME = preferences.getPref(FPref.UI_SKIN);
|
Constant.Runtime.setSkinName(preferences.getPref(FPref.UI_SKIN));
|
||||||
|
|
||||||
// Load splash image and preloader swatches for skin
|
// Load splash image and preloader swatches for skin
|
||||||
FSkin.loadLight(Constant.Runtime.SKIN_NAME);
|
FSkin.loadLight(Constant.Runtime.getSkinName());
|
||||||
|
|
||||||
// Instantiate AI
|
// Instantiate AI
|
||||||
AllZone.setInputControl(new InputControl(FModel.this));
|
AllZone.setInputControl(new InputControl(FModel.this));
|
||||||
|
|||||||
3
src/main/java/forge/view/bazaar/package-info.java
Normal file
3
src/main/java/forge/view/bazaar/package-info.java
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
/** Views (as in model-view-controller) for Forge. */
|
||||||
|
package forge.view.bazaar;
|
||||||
|
|
||||||
Reference in New Issue
Block a user