external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Maven plugins, checkstyle, Add namespace javadocs

Browse Source
This commit is contained in:
jendave
2012-02-06 18:32:37 +00:00
parent a03140f693
commit f81a3c590f
6 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -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/KeyboardShortcuts.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/ControlDraft.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/ViewItem.java -text
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/package-info.java svneol=native#text/plain
src/main/java/forge/view/home/HomeTopLevel.java -text

8
pom.xml
View File

@@ -467,7 +467,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>
</plugin>
<plugin>
@@ -503,7 +503,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>1.3</version>
<version>1.3.1</version>
</plugin>
</plugins>
@@ -627,7 +627,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>
<configuration>
<linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
@@ -682,7 +682,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>1.3</version>
<version>1.3.1</version>
<reportSets>
<reportSet>
<reports>

20
src/main/java/forge/Constant.java
View File

@@ -50,7 +50,7 @@ public final class Constant {
public static final Deck[] COMPUTER_DECK = new Deck[1];
/** The skin name. */
public static String SKIN_NAME = "default";
private static String skinName = "default";
/** The game type. */
private static GameType gameType = GameType.Constructed;
@@ -104,6 +104,24 @@ public final class Constant {
public static void setGameType(final 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
View File

@@ -0,0 +1,3 @@
/** Controller (as in model-view-controller) for Forge. */
package forge.control.bazaar;

4
src/main/java/forge/model/FModel.java
View File

@@ -105,10 +105,10 @@ public class FModel {
// It's looking like all the settings at the same time, here only.
// Doublestrike 06-02-12
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
FSkin.loadLight(Constant.Runtime.SKIN_NAME);
FSkin.loadLight(Constant.Runtime.getSkinName());
// Instantiate AI
AllZone.setInputControl(new InputControl(FModel.this));

3
src/main/java/forge/view/bazaar/package-info.java Normal file
View File

@@ -0,0 +1,3 @@
/** Views (as in model-view-controller) for Forge. */
package forge.view.bazaar;