Move DeckHtmlSerializer.java to forge-gui-desktop from forge-gui and remove freemarker as a dependency of forge-gui.

This removes a couple thousand unused methods from the Android APK.
This commit is contained in:
Myrd
2014-12-30 21:03:57 +00:00
parent 32f52f6880
commit 1a8ab8dfd0
4 changed files with 3 additions and 9 deletions

2
.gitattributes vendored
View File

@@ -899,6 +899,7 @@ forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWins
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java -text
forge-gui-desktop/src/main/java/forge/screens/deckeditor/package-info.java -text forge-gui-desktop/src/main/java/forge/screens/deckeditor/package-info.java -text
@@ -17152,7 +17153,6 @@ forge-gui/src/main/java/forge/deck/DeckProxy.java -text
forge-gui/src/main/java/forge/deck/DeckType.java -text forge-gui/src/main/java/forge/deck/DeckType.java -text
forge-gui/src/main/java/forge/deck/DeckgenUtil.java -text forge-gui/src/main/java/forge/deck/DeckgenUtil.java -text
forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java -text forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java -text
forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java -text
forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text
forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text
forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java -text forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java -text

View File

@@ -4,7 +4,6 @@ import forge.UiCommand;
import forge.Singletons; import forge.Singletons;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckBase; import forge.deck.DeckBase;
import forge.deck.io.DeckHtmlSerializer;
import forge.deck.io.DeckSerializer; import forge.deck.io.DeckSerializer;
import forge.deck.io.DeckStorage; import forge.deck.io.DeckStorage;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;

View File

@@ -1,4 +1,4 @@
package forge.deck.io; package forge.screens.deckeditor.controllers;
import forge.deck.Deck; import forge.deck.Deck;
import forge.item.PaperCard; import forge.item.PaperCard;
@@ -48,7 +48,7 @@ public class DeckHtmlSerializer {
/* Create and adjust the configuration */ /* Create and adjust the configuration */
final Configuration cfg = new Configuration(); final Configuration cfg = new Configuration();
try { try {
cfg.setClassForTemplateLoading(d.getClass(), "/"); cfg.setClassForTemplateLoading(DeckHtmlSerializer.class, "/");
cfg.setObjectWrapper(new DefaultObjectWrapper()); cfg.setObjectWrapper(new DefaultObjectWrapper());
/* /*

View File

@@ -46,10 +46,5 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.3</version> <version>3.3</version>
</dependency> </dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.20</version>
</dependency>
</dependencies> </dependencies>
</project> </project>