Menu
▾
▴
cs-sdl-commits — SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
(40) |
Jun
(6) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(1) |
Feb
(48) |
Mar
(2) |
Apr
(15) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
|
Oct
|
Nov
(61) |
Dec
|
| 2010 |
Jan
|
Feb
(22) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(30) |
Dec
(4) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <je...@us...> - 2010-02-09 08:56:03
|
Revision: 1587
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1587&view=rev
Author: jendave
Date: 2010-02-09 08:55:48 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Fixed plugins
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
trunk/Arcane/pom.xml
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-08 22:21:27 UTC (rev 1586)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-09 08:55:48 UTC (rev 1587)
@@ -61,6 +61,13 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
@@ -104,13 +111,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.bluestemsoftware.open.maven.plugin</groupId>
<artifactId>launch4j-plugin</artifactId>
<version>1.5.0.0</version>
Modified: trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-08 22:21:27 UTC (rev 1586)
+++ trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-09 08:55:48 UTC (rev 1587)
@@ -1,4 +1,3 @@
-
package arcane;
import java.awt.Font;
@@ -82,226 +81,259 @@
static private Arcane instance;
static private String dataDir;
- private Arcane (boolean loadRuleData) {
+ private Arcane(boolean loadRuleData) {
this.loadRuleData = loadRuleData;
String os = System.getProperty("os.name");
if (os.contains("Windows")) {
dataDir = "";
} else if (os.contains("Mac")) {
- dataDir = System.getProperty("user.home") + "/Library/Application Support/Arcane/";
+ dataDir = System.getProperty("user.home")
+ + "/Library/Application Support/Arcane/";
System.setProperty("apple.laf.useScreenMenuBar", "true");
} else {
dataDir = System.getProperty("user.home") + ".arcane/";
}
System.out.println(dataDir);
}
-
+
static public String getHomeDirectory() {
return dataDir;
}
- static public void setup (String prefsFileName, String logFileName, boolean loadRuleData) {
- if (instance != null) return;
+ static public void setup(String prefsFileName, String logFileName,
+ boolean loadRuleData) {
+ if (instance != null)
+ return;
instance = new Arcane(loadRuleData);
File logDir = new File(Arcane.getHomeDirectory() + "logs");
logDir.mkdir();
File logFile = new File(logDir, logFileName);
logFile.delete();
try {
- OutputStream logFileStream = new BufferedOutputStream(new FileOutputStream(logFile));
- System.setOut(new PrintStream(new MultiplexOutputStream(System.out, logFileStream), true));
- System.setErr(new PrintStream(new MultiplexOutputStream(System.err, logFileStream), true));
+ OutputStream logFileStream = new BufferedOutputStream(
+ new FileOutputStream(logFile));
+ System.setOut(new PrintStream(new MultiplexOutputStream(System.out,
+ logFileStream), true));
+ System.setErr(new PrintStream(new MultiplexOutputStream(System.err,
+ logFileStream), true));
} catch (FileNotFoundException ex) {
throw new ArcaneException("Error setting up logging.", ex);
}
System.out.println("Arcane v" + version);
System.out.println();
+ // System.out.println(logDir);
UI.setSystemLookAndFeel();
- //UI.setDefaultFont(Font.decode("Tahoma-11"));
+ // UI.setDefaultFont(Font.decode("Tahoma-11"));
- //instance = new Arcane(loadRuleData);
- Loader loader = instance.new DataLoader("Arcane v" + Arcane.version, Arcane.getHomeDirectory() + prefsFileName);
+ // instance = new Arcane(loadRuleData);
+ Loader loader = instance.new DataLoader("Arcane v" + Arcane.version,
+ Arcane.getHomeDirectory() + prefsFileName);
loader.start("ArcaneLoader");
- if (loader.failed()) throw new ArcaneException("Arcane initialization aborted.");
+ if (loader.failed())
+ throw new ArcaneException("Arcane initialization aborted.");
}
- static public synchronized Arcane getInstance () {
- if (instance == null) throw new IllegalStateException("Arcane not setup.");
+ static public synchronized Arcane getInstance() {
+ if (instance == null)
+ throw new IllegalStateException("Arcane not setup.");
return instance;
}
/**
* Returns the standard set abbreviation (interned) for the specified set.
*/
- public String getMainSet (String set) {
- if (set == null) System.out.println();
+ public String getMainSet(String set) {
+ if (set == null)
+ System.out.println();
return setToMainSet.get(set.toLowerCase());
}
- public Set<String> getAlternateSets (String set) {
+ public Set<String> getAlternateSets(String set) {
set = getMainSet(set);
Set<String> alternateSets = new LinkedHashSet();
for (Entry<String, String> entry : setToMainSet.entrySet())
- if (entry.getValue() == set) alternateSets.add(entry.getKey());
+ if (entry.getValue() == set)
+ alternateSets.add(entry.getKey());
return alternateSets;
}
- public String getSetName (String set) {
+ public String getSetName(String set) {
return setToName.get(getMainSet(set));
}
- public Integer getSetOrdinal (String set) {
+ public Integer getSetOrdinal(String set) {
return setToOrdinal.get(getMainSet(set));
}
- public Set<String> getSets () {
+ public Set<String> getSets() {
return setToOrdinal.keySet();
}
- public Set<String> getSets (String cardName) {
+ public Set<String> getSets(String cardName) {
Set<String> sets = new LinkedHashSet();
for (Card card : getCards(cardName))
sets.add(card.set);
return sets;
}
- public Set<Integer> getPictureNumbers (String cardName, String set) {
+ public Set<Integer> getPictureNumbers(String cardName, String set) {
Set<Integer> pictureNumbers = new HashSet();
for (Card card : getCards(cardName, set))
pictureNumbers.add(card.pictureNumber);
return pictureNumbers;
}
- public Set<String> getFormatSets (Format format) {
+ public Set<String> getFormatSets(Format format) {
return formatToSets.get(format);
}
- public List<String> getLanguages () {
+ public List<String> getLanguages() {
return languages;
}
-
- public List<String> getUILanguages () {
+
+ public List<String> getUILanguages() {
return uiLanguages;
}
- public List<Card> getCards () {
+ public List<Card> getCards() {
return allCards;
}
- public List<Card> getCards (String name) {
- if (name == null) throw new IllegalArgumentException("name cannot be null.");
+ public List<Card> getCards(String name) {
+ if (name == null)
+ throw new IllegalArgumentException("name cannot be null.");
List<Card> cards = nameToCards.get(name.toLowerCase());
- if (cards == null) throw new ArcaneException("Card not found: " + name);
+ if (cards == null)
+ throw new ArcaneException("Card not found: " + name);
return cards;
}
- public List<Card> getCards (String name, String set) throws ArcaneException {
- if (set == null) return getCards(name);
+ public List<Card> getCards(String name, String set) throws ArcaneException {
+ if (set == null)
+ return getCards(name);
set = getMainSet(set);
List<Card> cards = new ArrayList();
for (Card card : getCards(name))
- if (card.set == set) cards.add(card);
- if (cards.isEmpty()) throw new ArcaneException("Card \"" + name + "\" not found with set: " + set);
+ if (card.set == set)
+ cards.add(card);
+ if (cards.isEmpty())
+ throw new ArcaneException("Card \"" + name
+ + "\" not found with set: " + set);
return cards;
}
- public Card getCard (int cardID) {
+ public Card getCard(int cardID) {
Card card = idToCard.get(cardID);
- if (card == null) throw new ArcaneException("Card ID not found: " + cardID);
+ if (card == null)
+ throw new ArcaneException("Card ID not found: " + cardID);
return card;
}
- public Card getCard (String name) {
+ public Card getCard(String name) {
return getCards(name).get(0);
}
- public Card getRandomCard () {
+ public Card getRandomCard() {
return allCards.get(new Random().nextInt(allCards.size()));
}
- public Card getCard (String name, String set) {
- if (set == null) return getCard(name);
+ public Card getCard(String name, String set) {
+ if (set == null)
+ return getCard(name);
set = getMainSet(set);
for (Card card : getCards(name))
- if (card.set == set) return card;
- throw new ArcaneException("Card \"" + name + "\" not found with set: " + set);
+ if (card.set == set)
+ return card;
+ throw new ArcaneException("Card \"" + name + "\" not found with set: "
+ + set);
}
- public Card getCard (String name, String set, int pictureNumber) {
- if (pictureNumber == -1) return getCard(name, set);
+ public Card getCard(String name, String set, int pictureNumber) {
+ if (pictureNumber == -1)
+ return getCard(name, set);
for (Card card : getCards(name, set))
- if (card.pictureNumber == pictureNumber) return card;
- throw new ArcaneException("Card \"" + name + "\" not found in set \"" + set + "\" with picture number: " + pictureNumber);
+ if (card.pictureNumber == pictureNumber)
+ return card;
+ throw new ArcaneException("Card \"" + name + "\" not found in set \""
+ + set + "\" with picture number: " + pictureNumber);
}
- public ArcanePreferences getPrefs () {
+ public ArcanePreferences getPrefs() {
return prefs;
}
-
- public ArcaneTranslation getTrans () {
+
+ public ArcaneTranslation getTrans() {
return trans;
}
- public CardDataStoreConnection getCardDataStoreConnection () throws SQLException {
+ public CardDataStoreConnection getCardDataStoreConnection()
+ throws SQLException {
return cardDataStore.getThreadConnection();
}
- public RulesDataStoreConnection getRulesDataStoreConnection () throws SQLException {
+ public RulesDataStoreConnection getRulesDataStoreConnection()
+ throws SQLException {
return rulesDatastore.getThreadConnection();
}
- public RulingsDataStoreConnection getRulingsDataStoreConnection () throws SQLException {
+ public RulingsDataStoreConnection getRulingsDataStoreConnection()
+ throws SQLException {
return rulingsDatastore.getThreadConnection();
}
- public MessageFrame getLogFrame () {
+ public MessageFrame getLogFrame() {
return logFrame;
}
- public void log (String message) {
+ public void log(String message) {
System.out.println(message);
}
- public void log (Exception ex) {
+ public void log(Exception ex) {
ex.printStackTrace();
}
- public void log (String message, Exception ex) {
+ public void log(String message, Exception ex) {
System.out.println(message);
ex.printStackTrace();
}
- public void logError (Exception ex) {
+ public void logError(Exception ex) {
exceptionHandler.uncaughtException(Thread.currentThread(), ex);
}
- public void logError (String message) {
+ public void logError(String message) {
logError(new ArcaneException(message));
}
- public void logError (String message, Exception ex) {
+ public void logError(String message, Exception ex) {
logError(new ArcaneException(message, ex));
}
- public void showLogFrame () {
- if (logFrame != null) logFrame.setVisible(true);
+ public void showLogFrame() {
+ if (logFrame != null)
+ logFrame.setVisible(true);
}
- public boolean isBanned (String englishCardName, Format format) {
- Set<Format> bannedFormats = cardNameToBannedFormats.get(englishCardName.toLowerCase());
- if (bannedFormats == null) return false;
+ public boolean isBanned(String englishCardName, Format format) {
+ Set<Format> bannedFormats = cardNameToBannedFormats.get(englishCardName
+ .toLowerCase());
+ if (bannedFormats == null)
+ return false;
return bannedFormats.contains(format);
}
- public boolean isRestricted (String englishCardName, Format format) {
- Set<Format> restrictedFormats = cardNameToRestrictedFormats.get(englishCardName.toLowerCase());
- if (restrictedFormats == null) return false;
+ public boolean isRestricted(String englishCardName, Format format) {
+ Set<Format> restrictedFormats = cardNameToRestrictedFormats
+ .get(englishCardName.toLowerCase());
+ if (restrictedFormats == null)
+ return false;
return restrictedFormats.contains(format);
}
- public void saveUserData () throws IOException {
+ public void saveUserData() throws IOException {
boolean wroteEntries = false;
CSVWriter writer = new CSVWriter(new FileWriter("userData.csv"));
writer.writeField("Name");
@@ -344,58 +376,67 @@
}
}
writer.close();
- if (!wroteEntries) new File("userData.csv").delete();
+ if (!wroteEntries)
+ new File("userData.csv").delete();
}
- public int getTotalOwnedQty (String cardName) {
+ public int getTotalOwnedQty(String cardName) {
int qty = 0;
for (Card card : getCards(cardName))
qty += card.ownedQty;
return qty;
}
- public List<Plugin> getPluginsList(){
+ public List<Plugin> getPluginsList() {
return plugins;
}
-
+
/**
* Looks up a class that might be defined in a plugin JAR.
*/
- public Class getPluginClass (String pluginClassName) throws ClassNotFoundException {
+ public Class getPluginClass(String pluginClassName)
+ throws ClassNotFoundException {
return Class.forName(pluginClassName, true, pluginClassLoader);
}
private class DataLoader extends Loader {
private String prefsFileName;
private String transFileName;
- //private String dataDir;
- public DataLoader (String title, String prefsFileName) {
+ // private String dataDir;
+
+ public DataLoader(String title, String prefsFileName) {
super(title);
- this.prefsFileName = prefsFileName;
+ this.prefsFileName = prefsFileName;
}
-
- public void load () throws Exception {
- //System.console().writer().write("dataDir: " + dataDir);
+
+ public void load() throws Exception {
+ // System.console().writer().write("dataDir: " + dataDir);
// Check if we are running from the right directory.
if (!new File(Arcane.getHomeDirectory()).exists()) {
MessageFrame errorFrame = getErrorFrame();
- errorFrame.appendText("This application must be started from its own directory.\n");
+ errorFrame
+ .appendText("This application must be started from its own directory.\n");
errorFrame.appendText("\n");
errorFrame.appendText("Current directory:\n");
errorFrame.appendText(new File("").getAbsolutePath());
errorFrame.appendText("\n\n");
- URL url = Arcane.class.getProtectionDomain().getCodeSource().getLocation();
+ URL url = Arcane.class.getProtectionDomain().getCodeSource()
+ .getLocation();
errorFrame.appendText("Required directory:\n");
File dir = new File(url.toURI());
- if (dir.isFile()) dir = dir.getParentFile();
+ if (dir.isFile())
+ dir = dir.getParentFile();
dir = dir.getParentFile();
errorFrame.appendText(dir.getAbsolutePath());
errorFrame.appendText("\n\n");
- errorFrame.appendText("To fix the problem, try running this application from the command line.\n");
- errorFrame.appendText("Open a command line, change to the required directory, then execute:\n");
+ errorFrame
+ .appendText("To fix the problem, try running this application from the command line.\n");
+ errorFrame
+ .appendText("Open a command line, change to the required directory, then execute:\n");
errorFrame.appendText("java -jar Xxx.jar\n");
- errorFrame.appendText("Replace Xxx.jar with the JAR file you want to run.\n\n\n");
+ errorFrame
+ .appendText("Replace Xxx.jar with the JAR file you want to run.\n\n\n");
errorFrame.setVisible(true);
cancel();
return;
@@ -406,65 +447,81 @@
FlagRenderer.loadImages();
prefs = new ArcanePreferences(prefsFileName);
-
+
// Reset some data when versions change.
if (!prefs.version.equals(version)) {
dialog.setMessage("Updating version...");
new File("arcane.properties").delete();
- FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory() + "data/rulesdb"));
+ FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory()
+ + "data/rulesdb"));
}
-
+
transFileName = dataDir + prefs.uiLanguage.toLowerCase() + ".lang";
trans = new ArcaneTranslation(transFileName);
-
+
// Reset rule data if it changed.
- long rulesStamp = new File(Arcane.getHomeDirectory() + "data/rule-cards.txt").lastModified();
- long rulingsStamp = new File(Arcane.getHomeDirectory() + "data/rule-general.txt").lastModified();
- if (rulesStamp != prefs.rulesTimestamp || rulingsStamp != prefs.rulingsTimestamp)
- FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory() + "data/rulesdb"));
+ long rulesStamp = new File(Arcane.getHomeDirectory()
+ + "data/rule-cards.txt").lastModified();
+ long rulingsStamp = new File(Arcane.getHomeDirectory()
+ + "data/rule-general.txt").lastModified();
+ if (rulesStamp != prefs.rulesTimestamp
+ || rulingsStamp != prefs.rulingsTimestamp)
+ FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory()
+ + "data/rulesdb"));
prefs.rulesTimestamp = rulesStamp;
prefs.rulingsTimestamp = rulingsStamp;
- if (isCancelled()) return;
+ if (isCancelled())
+ return;
if (loadRuleData) {
// Load rule data.
dialog.setMessage("Initializing rules datastore...");
rulesDatastore = new RulesDataStore();
- rulesDatastore.populate(dialog, Arcane.getHomeDirectory() + "data/");
- if (isCancelled()) return;
+ rulesDatastore.populate(dialog, Arcane.getHomeDirectory()
+ + "data/");
+ if (isCancelled())
+ return;
dialog.setMessage("Initializing rulings datastore...");
rulingsDatastore = new RulingsDataStore();
- rulingsDatastore.populate(dialog, Arcane.getHomeDirectory() + "data/");
- if (isCancelled()) return;
+ rulingsDatastore.populate(dialog, Arcane.getHomeDirectory()
+ + "data/");
+ if (isCancelled())
+ return;
}
// Load card data.
loadCardData(dialog);
- if (isCancelled()) return;
+ if (isCancelled())
+ return;
// Load plugins.
loadPlugins();
- if (isCancelled()) return;
+ if (isCancelled())
+ return;
// Displays errors logged after initialization.
- logFrame = new MessageFrame("Log Viewer - Arcane v" + Arcane.version);
+ logFrame = new MessageFrame("Log Viewer - Arcane v"
+ + Arcane.version);
logFrame.addButton("Clear").addActionListener(new ActionListener() {
- public void actionPerformed (ActionEvent evt) {
+ public void actionPerformed(ActionEvent evt) {
logFrame.editorPane.setText("");
}
});
logFrame.addButton("Close");
logFrame.editorPane.setContentType("text/plain");
- TextComponentOutputStream logStream = new TextComponentOutputStream(logFrame.editorPane);
- System.setOut(new PrintStream(new MultiplexOutputStream(System.out, logStream), true));
- System.setErr(new PrintStream(new MultiplexOutputStream(System.err, logStream), true));
+ TextComponentOutputStream logStream = new TextComponentOutputStream(
+ logFrame.editorPane);
+ System.setOut(new PrintStream(new MultiplexOutputStream(System.out,
+ logStream), true));
+ System.setErr(new PrintStream(new MultiplexOutputStream(System.err,
+ logStream), true));
exceptionHandler = new UncaughtExceptionHandler() {
- public void uncaughtException (Thread thread, Throwable ex) {
+ public void uncaughtException(Thread thread, Throwable ex) {
ex.printStackTrace();
if (logFrame != null && prefs.showLogOnError) {
logFrame.setVisible(true);
@@ -475,53 +532,88 @@
Thread.setDefaultUncaughtExceptionHandler(exceptionHandler);
}
- private void loadPlugins () throws IOException {
+ private void loadPlugins() throws IOException {
File pluginsDir = new File(Arcane.getHomeDirectory() + "plugins");
- if (!pluginsDir.exists() || !pluginsDir.isDirectory()) return;
+ if (!pluginsDir.exists() || !pluginsDir.isDirectory())
+ return;
dialog.setMessage("Initializing plugins...");
+ // System.out.println(pluginsDir);
+ // System.out.println("Initializing plugins...");
FilenameFilter jarFilter = new FilenameFilter() {
- public boolean accept (File dir, String filename) {
+ public boolean accept(File dir, String filename) {
return filename.toLowerCase().endsWith(".jar");
}
};
+
+ // for (File pluginDir : pluginsDir.listFiles()) {
+ // System.out.println(pluginDir.toString());
+ // }
+ // for (File pluginJar : pluginsDir.listFiles(jarFilter)) {
+ // System.out.println(pluginJar.toString());
+ // }
+
for (File pluginDir : pluginsDir.listFiles()) {
- if (!pluginDir.isDirectory()) continue;
+ if (!pluginDir.isDirectory())
+ continue;
for (File pluginJar : pluginDir.listFiles(jarFilter)) {
- ZipInputStream input = new ZipInputStream(new FileInputStream(pluginJar));
- while (true) {
- ZipEntry entry = input.getNextEntry();
- if (entry == null) break;
- pluginClassLoader.addURL(pluginJar.toURI().toURL());
- if (!entry.isDirectory() && entry.getName().equalsIgnoreCase("plugin.txt")) {
- try {
- String pluginClassName = new BufferedReader(new InputStreamReader(input)).readLine();
+ // System.out.println(pluginJar.getName());
+ ZipInputStream input = new ZipInputStream(
+ new FileInputStream(pluginJar));
+ ZipEntry entry;
+ boolean pluginTxtFound = false;
+ do {
+ entry = input.getNextEntry();
+ try {
+
+ // System.out.println(entry.getName());
+ if (entry == null)
+ break;
+ pluginClassLoader.addURL(pluginJar.toURI().toURL());
+ // System.out.println(entry.getName());
+ if (!entry.isDirectory()
+ && entry.getName().equalsIgnoreCase(
+ "plugin.txt")) {
+
+ String pluginClassName = new BufferedReader(
+ new InputStreamReader(input))
+ .readLine();
Class pluginClass = getPluginClass(pluginClassName);
- Plugin plugin = (Plugin)pluginClass.newInstance();
- dialog.setMessage("Initializing plugin: " + plugin.getName());
+ Plugin plugin = (Plugin) pluginClass
+ .newInstance();
+ dialog.setMessage("Initializing plugin: "
+ + plugin.getName());
+ // System.out.println(plugin.getName());
plugin.install(dialog);
plugins.add(plugin);
- } catch (Exception ex) {
- logError("Error loading plugin file: " + pluginJar.getAbsolutePath(), ex);
+ pluginTxtFound = true;
}
+ } catch (Exception ex) {
+ logError("Error loading plugin file: "
+ + pluginJar.getAbsolutePath(), ex);
}
- }
+
+ // }
+ } while (entry != null && pluginTxtFound == false);
}
}
for (Plugin plugin : plugins)
plugin.loadPreferences();
}
-
- private void loadCardData (ProgressDialog dialog) throws IOException, SQLException {
+
+ private void loadCardData(ProgressDialog dialog) throws IOException,
+ SQLException {
dialog.setMessage("Loading card data...");
loadSets();
cardDataStore = new CardDataStore();
- allCards = cardDataStore.populate(dialog, Arcane.getHomeDirectory() + "data/");
+ allCards = cardDataStore.populate(dialog, Arcane.getHomeDirectory()
+ + "data/");
- if (isCancelled()) return;
+ if (isCancelled())
+ return;
dialog.setValue(-1);
for (Card card : allCards) {
@@ -536,11 +628,12 @@
// Sort the cards by set and picture number.
Comparator<Card> cardSetComparator = new Comparator<Card>() {
- public int compare (Card card1, Card card2) {
+ public int compare(Card card1, Card card2) {
int ordinal1 = setToOrdinal.get(card1.set);
int ordinal2 = setToOrdinal.get(card2.set);
int diff = ordinal1 - ordinal2;
- if (diff != 0) return diff;
+ if (diff != 0)
+ return diff;
return card1.pictureNumber - card2.pictureNumber;
}
};
@@ -549,31 +642,43 @@
loadUserData();
- loadManaProduced(Arcane.getHomeDirectory() + "data/titleToLandColors.csv");
- loadManaProduced(Arcane.getHomeDirectory() + "data/titleToCardColors.csv");
+ loadManaProduced(Arcane.getHomeDirectory()
+ + "data/titleToLandColors.csv");
+ loadManaProduced(Arcane.getHomeDirectory()
+ + "data/titleToCardColors.csv");
loadFormats();
loadLanguage(dialog);
}
- private void loadSets () throws IOException, SQLException {
+ private void loadSets() throws IOException, SQLException {
int ordinal = 0;
- BufferedReader reader = new BufferedReader(new UnicodeReader(new FileInputStream(Arcane.getHomeDirectory() + "data/sets.txt"), "UTF-8"));
+ BufferedReader reader = new BufferedReader(new UnicodeReader(
+ new FileInputStream(Arcane.getHomeDirectory()
+ + "data/sets.txt"), "UTF-8"));
while (true) {
String line = reader.readLine();
- if (line == null) break;
+ if (line == null)
+ break;
line = line.trim();
- if (line.length() == 0) continue;
- if (line.charAt(0) == '#') continue;
+ if (line.length() == 0)
+ continue;
+ if (line.charAt(0) == '#')
+ continue;
int spaceIndex = line.indexOf(' ');
- if (spaceIndex == 0) throw new ArcaneException("Error parsing " + Arcane.getHomeDirectory() + "data/sets.txt\". Invalid entry: " + line);
+ if (spaceIndex == 0)
+ throw new ArcaneException("Error parsing "
+ + Arcane.getHomeDirectory()
+ + "data/sets.txt\". Invalid entry: " + line);
- String[] abbreviations = line.substring(0, spaceIndex).split(",");
+ String[] abbreviations = line.substring(0, spaceIndex).split(
+ ",");
String mainSet = "";
for (String set : abbreviations)
- if (mainSet.length() < set.length() && set.length()<=3) mainSet = set;
+ if (mainSet.length() < set.length() && set.length() <= 3)
+ mainSet = set;
mainSet = mainSet.toLowerCase().intern();
setToOrdinal.put(mainSet, ordinal++);
@@ -587,58 +692,77 @@
reader.close();
}
- private void loadLanguage (ProgressDialog dialog) {
+ private void loadLanguage(ProgressDialog dialog) {
FilenameFilter cardsFilter = new FilenameFilter() {
- public boolean accept (File dir, String filename) {
- return filename.toLowerCase().startsWith("cards-") && filename.toLowerCase().endsWith(".csv")
- && filename.length() > 10;
+ public boolean accept(File dir, String filename) {
+ return filename.toLowerCase().startsWith("cards-")
+ && filename.toLowerCase().endsWith(".csv")
+ && filename.length() > 10;
}
};
languages.add("English");
- for (File cardsFile : new File(Arcane.getHomeDirectory() + "data/").listFiles(cardsFilter)) {
+ for (File cardsFile : new File(Arcane.getHomeDirectory() + "data/")
+ .listFiles(cardsFilter)) {
languages.add(cardsFile.getName().substring(6, 7).toUpperCase()
- + cardsFile.getName().substring(7, cardsFile.getName().length() - 4));
+ + cardsFile.getName().substring(7,
+ cardsFile.getName().length() - 4));
}
-
+
FilenameFilter uiLanguagesFilter = new FilenameFilter() {
- public boolean accept (File dir, String filename) {
- return filename.toLowerCase().endsWith(".lang") && !filename.toLowerCase().startsWith("english");
+ public boolean accept(File dir, String filename) {
+ return filename.toLowerCase().endsWith(".lang")
+ && !filename.toLowerCase().startsWith("english");
}
};
uiLanguages.add("English");
- for (File uiLangFile : new File(Arcane.getHomeDirectory() + "data/").listFiles(uiLanguagesFilter)) {
- uiLanguages.add(uiLangFile.getName().substring(0, 1).toUpperCase()
- + uiLangFile.getName().substring(1, uiLangFile.getName().length() - 5));
+ for (File uiLangFile : new File(Arcane.getHomeDirectory() + "data/")
+ .listFiles(uiLanguagesFilter)) {
+ uiLanguages.add(uiLangFile.getName().substring(0, 1)
+ .toUpperCase()
+ + uiLangFile.getName().substring(1,
+ uiLangFile.getName().length() - 5));
}
- if (prefs.isEnglishLanguage()) return;
+ if (prefs.isEnglishLanguage())
+ return;
dialog.setMessage("Loading language: " + prefs.language);
- File languageFile = new File(Arcane.getHomeDirectory() + "data/cards-" + prefs.language.toLowerCase() + ".csv");
+ File languageFile = new File(Arcane.getHomeDirectory()
+ + "data/cards-" + prefs.language.toLowerCase() + ".csv");
if (!languageFile.exists()) {
- logError("Missing language file: " + languageFile.getAbsolutePath());
+ logError("Missing language file: "
+ + languageFile.getAbsolutePath());
return;
}
try {
- CardDataStoreConnection conn = cardDataStore.getThreadConnection();
- CSVReader reader = new CSVReader(new UnicodeReader(new FileInputStream(languageFile), "UTF-8"), ",", "\"", true, true);
+ CardDataStoreConnection conn = cardDataStore
+ .getThreadConnection();
+ CSVReader reader = new CSVReader(new UnicodeReader(
+ new FileInputStream(languageFile), "UTF-8"), ",", "\"",
+ true, true);
while (true) {
List<String> fields = reader.getFields();
- if (fields == null) break;
+ if (fields == null)
+ break;
if (fields.size() < 4) {
- //logError("Invalid row for language \"" + prefs.language + "\": " + fields);
- log("Invalid row for language \"" + prefs.language + "\": " + fields);
+ // logError("Invalid row for language \"" +
+ // prefs.language + "\": " + fields);
+ log("Invalid row for language \"" + prefs.language
+ + "\": " + fields);
continue;
}
String name = fields.get(0);
String newName = fields.get(1);
- if (name.toLowerCase().equals("name") && newName.toLowerCase().equals("native name")) continue;
- if (newName.length() == 0) newName = name;
+ if (name.toLowerCase().equals("name")
+ && newName.toLowerCase().equals("native name"))
+ continue;
+ if (newName.length() == 0)
+ newName = name;
String newType = fields.get(2);
String newLegal = fields.get(3);
conn.updateCardLanguage(name, newName, newType, newLegal);
- try{
+ try {
List<Card> cards = getCards(name);
for (Card card : cards) {
card.name = newName;
@@ -646,10 +770,11 @@
card.legal = newLegal;
}
List<Card> tmp = nameToCards.get(newName.toLowerCase());
- if(tmp != null && !tmp.get(0).englishName.equals(name))
- log("Duplicate localized name for card: " + name + "\t" + tmp.get(0).englishName);
+ if (tmp != null && !tmp.get(0).englishName.equals(name))
+ log("Duplicate localized name for card: " + name
+ + "\t" + tmp.get(0).englishName);
nameToCards.put(newName.toLowerCase(), cards);
- } catch (ArcaneException e){
+ } catch (ArcaneException e) {
log("Localized data for missing card: " + name);
}
}
@@ -660,53 +785,69 @@
}
}
- private void loadUserData () throws IOException {
- if (!new File("userData.csv").exists()) return;
- CSVReader csvReader = new CSVReader(new FileReader("userData.csv"), ",", "\"", true, false);
+ private void loadUserData() throws IOException {
+ if (!new File("userData.csv").exists())
+ return;
+ CSVReader csvReader = new CSVReader(new FileReader("userData.csv"),
+ ",", "\"", true, false);
csvReader.getFields();
while (true) {
List<String> fields = csvReader.getFields();
- if (fields == null) break;
- if (fields.size() < 4) continue;
+ if (fields == null)
+ break;
+ if (fields.size() < 4)
+ continue;
String cardName = fields.get(0);
String set = fields.get(1);
-
+
int rating = -1;
String flags = null;
int pictureNumber = -1, qty = 0;
if (set.length() == 0) {
- if (fields.get(4).length() > 0) rating = Integer.parseInt(fields.get(4));
+ if (fields.get(4).length() > 0)
+ rating = Integer.parseInt(fields.get(4));
flags = fields.get(5);
} else {
pictureNumber = 0;
- if (fields.get(2).length() > 0) pictureNumber = Integer.parseInt(fields.get(2));
+ if (fields.get(2).length() > 0)
+ pictureNumber = Integer.parseInt(fields.get(2));
qty = Integer.parseInt(fields.get(3));
}
-
+
for (Card card : getCards(cardName)) {
- if (rating != -1) card.rating = rating;
- if (flags != null) card.flags = flags;
- if (card.set.equals(set) && card.pictureNumber == pictureNumber) card.ownedQty = qty;
+ if (rating != -1)
+ card.rating = rating;
+ if (flags != null)
+ card.flags = flags;
+ if (card.set.equals(set)
+ && card.pictureNumber == pictureNumber)
+ card.ownedQty = qty;
}
}
csvReader.close();
}
- private void loadManaProduced (String fileName) throws IOException, SQLException {
+ private void loadManaProduced(String fileName) throws IOException,
+ SQLException {
CardDataStoreConnection conn = cardDataStore.newConnection();
- CSVReader reader = new CSVReader(new UnicodeReader(new FileInputStream(fileName), "UTF-8"), ",", "\"", true, true);
+ CSVReader reader = new CSVReader(new UnicodeReader(
+ new FileInputStream(fileName), "UTF-8"), ",", "\"", true,
+ true);
while (true) {
List<String> fields = reader.getFields();
- if (fields == null) break;
- if (fields.size() < 2) continue;
+ if (fields == null)
+ break;
+ if (fields.size() < 2)
+ continue;
String cardName = fields.get(0);
String colors = fields.get(1);
List<Card> cards = getCards(cardName);
for (Card card : cards) {
StringBuffer buffer = new StringBuffer(16);
for (int i = 0, n = colors.length(); i < n; i++) {
- if (colors.charAt(i) == 'A') continue;
+ if (colors.charAt(i) == 'A')
+ continue;
buffer.append('{');
buffer.append(colors.charAt(i));
buffer.append('}');
@@ -719,46 +860,63 @@
conn.close();
}
- private void loadFormats () throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(Arcane.getHomeDirectory() + "data/formats.txt"));
+ private void loadFormats() throws IOException {
+ BufferedReader reader = new BufferedReader(new FileReader(Arcane
+ .getHomeDirectory()
+ + "data/formats.txt"));
try {
while (true) {
Format currentFormat = Format.getByText(reader.readLine());
- if (currentFormat == null) return;
+ if (currentFormat == null)
+ return;
String line;
String state = null;
while (true) {
line = reader.readLine();
- if (line == null) return;
+ if (line == null)
+ return;
line = line.trim();
- if (line.length() == 0) break;
- if (line.equals("BANNED") || line.equals("RESTRICTED") || line.equals("SETS")) {
+ if (line.length() == 0)
+ break;
+ if (line.equals("BANNED") || line.equals("RESTRICTED")
+ || line.equals("SETS")) {
state = line;
continue;
}
- if (state == null) throw new ArcaneException("Error parsing " + Arcane.getHomeDirectory() + "data/formats.txt\". Invalid section: " + line);
+ if (state == null)
+ throw new ArcaneException("Error parsing "
+ + Arcane.getHomeDirectory()
+ + "data/formats.txt\". Invalid section: "
+ + line);
if (state.equals("BANNED")) {
String cardName = line.toLowerCase();
getCards(line);
- Set<Format> bannedFormats = cardNameToBannedFormats.get(cardName);
+ Set<Format> bannedFormats = cardNameToBannedFormats
+ .get(cardName);
if (bannedFormats == null) {
bannedFormats = new HashSet();
- cardNameToBannedFormats.put(cardName, bannedFormats);
+ cardNameToBannedFormats.put(cardName,
+ bannedFormats);
}
bannedFormats.add(currentFormat);
} else if (state.equals("RESTRICTED")) {
String cardName = line.toLowerCase();
getCards(cardName);
- Set<Format> restrictedFormats = cardNameToRestrictedFormats.get(cardName);
+ Set<Format> restrictedFormats = cardNameToRestrictedFormats
+ .get(cardName);
if (restrictedFormats == null) {
restrictedFormats = new HashSet();
- cardNameToRestrictedFormats.put(cardName, restrictedFormats);
+ cardNameToRestrictedFormats.put(cardName,
+ restrictedFormats);
}
restrictedFormats.add(currentFormat);
} else if (state.equals("SETS")) {
String set = setToMainSet.get(line.toLowerCase());
if (!setToOrdinal.containsKey(set))
- throw new ArcaneException("Error parsing" + Arcane.getHomeDirectory() + "data/formats.txt\". Invalid set: " + line);
+ throw new ArcaneException("Error parsing"
+ + Arcane.getHomeDirectory()
+ + "data/formats.txt\". Invalid set: "
+ + line);
Set<String> sets = getFormatSets(currentFormat);
if (sets == null) {
sets = new HashSet();
@@ -775,11 +933,11 @@
}
static private class PluginClassLoader extends URLClassLoader {
- public PluginClassLoader () {
+ public PluginClassLoader() {
super(new URL[0], Arcane.class.getClassLoader());
}
- public void addURL (URL url) {
+ public void addURL(URL url) {
super.addURL(url);
}
}
Modified: trunk/Arcane/pom.xml
===================================================================
--- trunk/Arcane/pom.xml 2010-02-08 22:21:27 UTC (rev 1586)
+++ trunk/Arcane/pom.xml 2010-02-09 08:55:48 UTC (rev 1587)
@@ -67,7 +67,6 @@
<url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/</url>
</scm>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-08 21:37:22
|
Revision: 1585
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1585&view=rev
Author: jendave
Date: 2010-02-08 21:37:15 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
update osx menu prop
Modified Paths:
--------------
trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
Modified: trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-08 20:39:43 UTC (rev 1584)
+++ trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-08 21:37:15 UTC (rev 1585)
@@ -89,7 +89,7 @@
dataDir = "";
} else if (os.contains("Mac")) {
dataDir = System.getProperty("user.home") + "/Library/Application Support/Arcane/";
- System.setProperty("com.apple.macos.useScreenMenuBar","true");
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
} else {
dataDir = System.getProperty("user.home") + ".arcane/";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-08 20:39:51
|
Revision: 1584
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1584&view=rev
Author: jendave
Date: 2010-02-08 20:39:43 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
remove obselete manifest
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
Removed Paths:
-------------
trunk/Arcane/Arcane/src/main/resources/META-INF/
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-06 09:36:54 UTC (rev 1583)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-08 20:39:43 UTC (rev 1584)
@@ -111,15 +111,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.bluestemsoftware.open.maven.plugin</groupId>
<artifactId>launch4j-plugin</artifactId>
<version>1.5.0.0</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-06 09:37:01
|
Revision: 1583
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1583&view=rev
Author: jendave
Date: 2010-02-06 09:36:54 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Fixed directories on Windows, Mac and Linux. Mac menus appear on menu bar now.
Modified Paths:
--------------
trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
trunk/Arcane/Arcane/src/main/java/arcane/RulesDataStore.java
trunk/Arcane/Arcane/src/main/java/arcane/RulingsDataStore.java
trunk/Arcane/Arcane/src/main/java/arcane/deckbuilder/ui/DeckBuilder.java
Modified: trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-05 19:32:13 UTC (rev 1582)
+++ trunk/Arcane/Arcane/src/main/java/arcane/Arcane.java 2010-02-06 09:36:54 UTC (rev 1583)
@@ -80,14 +80,30 @@
private boolean loadRuleData;
static private Arcane instance;
+ static private String dataDir;
private Arcane (boolean loadRuleData) {
this.loadRuleData = loadRuleData;
+ String os = System.getProperty("os.name");
+ if (os.contains("Windows")) {
+ dataDir = "";
+ } else if (os.contains("Mac")) {
+ dataDir = System.getProperty("user.home") + "/Library/Application Support/Arcane/";
+ System.setProperty("com.apple.macos.useScreenMenuBar","true");
+ } else {
+ dataDir = System.getProperty("user.home") + ".arcane/";
+ }
+ System.out.println(dataDir);
}
+
+ static public String getHomeDirectory() {
+ return dataDir;
+ }
static public void setup (String prefsFileName, String logFileName, boolean loadRuleData) {
if (instance != null) return;
- File logDir = new File("logs");
+ instance = new Arcane(loadRuleData);
+ File logDir = new File(Arcane.getHomeDirectory() + "logs");
logDir.mkdir();
File logFile = new File(logDir, logFileName);
logFile.delete();
@@ -105,8 +121,8 @@
UI.setSystemLookAndFeel();
//UI.setDefaultFont(Font.decode("Tahoma-11"));
- instance = new Arcane(loadRuleData);
- Loader loader = instance.new DataLoader("Arcane v" + Arcane.version, prefsFileName);
+ //instance = new Arcane(loadRuleData);
+ Loader loader = instance.new DataLoader("Arcane v" + Arcane.version, Arcane.getHomeDirectory() + prefsFileName);
loader.start("ArcaneLoader");
if (loader.failed()) throw new ArcaneException("Arcane initialization aborted.");
}
@@ -352,17 +368,17 @@
private class DataLoader extends Loader {
private String prefsFileName;
private String transFileName;
- private String dataDir;
+ //private String dataDir;
public DataLoader (String title, String prefsFileName) {
super(title);
- this.prefsFileName = prefsFileName;
- dataDir = new File("data-test").exists() ? "data-test/" : "data/";
+ this.prefsFileName = prefsFileName;
}
public void load () throws Exception {
+ //System.console().writer().write("dataDir: " + dataDir);
// Check if we are running from the right directory.
- if (!new File("data").exists()) {
+ if (!new File(Arcane.getHomeDirectory()).exists()) {
MessageFrame errorFrame = getErrorFrame();
errorFrame.appendText("This application must be started from its own directory.\n");
errorFrame.appendText("\n");
@@ -395,17 +411,17 @@
if (!prefs.version.equals(version)) {
dialog.setMessage("Updating version...");
new File("arcane.properties").delete();
- FileUtil.deleteDirectory(new File(dataDir + "rulesdb"));
+ FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory() + "data/rulesdb"));
}
- transFileName = "data/" + prefs.uiLanguage.toLowerCase() + ".lang";
+ transFileName = dataDir + prefs.uiLanguage.toLowerCase() + ".lang";
trans = new ArcaneTranslation(transFileName);
// Reset rule data if it changed.
- long rulesStamp = new File(dataDir + "rule-cards.txt").lastModified();
- long rulingsStamp = new File(dataDir + "rule-general.txt").lastModified();
+ long rulesStamp = new File(Arcane.getHomeDirectory() + "data/rule-cards.txt").lastModified();
+ long rulingsStamp = new File(Arcane.getHomeDirectory() + "data/rule-general.txt").lastModified();
if (rulesStamp != prefs.rulesTimestamp || rulingsStamp != prefs.rulingsTimestamp)
- FileUtil.deleteDirectory(new File(dataDir + "rulesdb"));
+ FileUtil.deleteDirectory(new File(Arcane.getHomeDirectory() + "data/rulesdb"));
prefs.rulesTimestamp = rulesStamp;
prefs.rulingsTimestamp = rulingsStamp;
@@ -415,12 +431,12 @@
// Load rule data.
dialog.setMessage("Initializing rules datastore...");
rulesDatastore = new RulesDataStore();
- rulesDatastore.populate(dialog, dataDir);
+ rulesDatastore.populate(dialog, Arcane.getHomeDirectory() + "data/");
if (isCancelled()) return;
dialog.setMessage("Initializing rulings datastore...");
rulingsDatastore = new RulingsDataStore();
- rulingsDatastore.populate(dialog, dataDir);
+ rulingsDatastore.populate(dialog, Arcane.getHomeDirectory() + "data/");
if (isCancelled()) return;
}
@@ -460,7 +476,7 @@
}
private void loadPlugins () throws IOException {
- File pluginsDir = new File("plugins");
+ File pluginsDir = new File(Arcane.getHomeDirectory() + "plugins");
if (!pluginsDir.exists() || !pluginsDir.isDirectory()) return;
dialog.setMessage("Initializing plugins...");
@@ -503,7 +519,7 @@
loadSets();
cardDataStore = new CardDataStore();
- allCards = cardDataStore.populate(dialog, dataDir);
+ allCards = cardDataStore.populate(dialog, Arcane.getHomeDirectory() + "data/");
if (isCancelled()) return;
dialog.setValue(-1);
@@ -533,8 +549,8 @@
loadUserData();
- loadManaProduced(dataDir + "titleToLandColors.csv");
- loadManaProduced(dataDir + "titleToCardColors.csv");
+ loadManaProduced(Arcane.getHomeDirectory() + "data/titleToLandColors.csv");
+ loadManaProduced(Arcane.getHomeDirectory() + "data/titleToCardColors.csv");
loadFormats();
@@ -543,7 +559,7 @@
private void loadSets () throws IOException, SQLException {
int ordinal = 0;
- BufferedReader reader = new BufferedReader(new UnicodeReader(new FileInputStream(dataDir + "sets.txt"), "UTF-8"));
+ BufferedReader reader = new BufferedReader(new UnicodeReader(new FileInputStream(Arcane.getHomeDirectory() + "data/sets.txt"), "UTF-8"));
while (true) {
String line = reader.readLine();
if (line == null) break;
@@ -551,7 +567,7 @@
if (line.length() == 0) continue;
if (line.charAt(0) == '#') continue;
int spaceIndex = line.indexOf(' ');
- if (spaceIndex == 0) throw new ArcaneException("Error parsing \"data/sets.txt\". Invalid entry: " + line);
+ if (spaceIndex == 0) throw new ArcaneException("Error parsing " + Arcane.getHomeDirectory() + "data/sets.txt\". Invalid entry: " + line);
String[] abbreviations = line.substring(0, spaceIndex).split(",");
@@ -579,7 +595,7 @@
}
};
languages.add("English");
- for (File cardsFile : new File("data").listFiles(cardsFilter)) {
+ for (File cardsFile : new File(Arcane.getHomeDirectory() + "data/").listFiles(cardsFilter)) {
languages.add(cardsFile.getName().substring(6, 7).toUpperCase()
+ cardsFile.getName().substring(7, cardsFile.getName().length() - 4));
}
@@ -590,7 +606,7 @@
}
};
uiLanguages.add("English");
- for (File uiLangFile : new File("data").listFiles(uiLanguagesFilter)) {
+ for (File uiLangFile : new File(Arcane.getHomeDirectory() + "data/").listFiles(uiLanguagesFilter)) {
uiLanguages.add(uiLangFile.getName().substring(0, 1).toUpperCase()
+ uiLangFile.getName().substring(1, uiLangFile.getName().length() - 5));
}
@@ -599,7 +615,7 @@
dialog.setMessage("Loading language: " + prefs.language);
- File languageFile = new File(dataDir + "cards-" + prefs.language.toLowerCase() + ".csv");
+ File languageFile = new File(Arcane.getHomeDirectory() + "data/cards-" + prefs.language.toLowerCase() + ".csv");
if (!languageFile.exists()) {
logError("Missing language file: " + languageFile.getAbsolutePath());
return;
@@ -704,7 +720,7 @@
}
private void loadFormats () throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(dataDir + "formats.txt"));
+ BufferedReader reader = new BufferedReader(new FileReader(Arcane.getHomeDirectory() + "data/formats.txt"));
try {
while (true) {
Format currentFormat = Format.getByText(reader.readLine());
@@ -720,7 +736,7 @@
state = line;
continue;
}
- if (state == null) throw new ArcaneException("Error parsing \"data/formats.txt\". Invalid section: " + line);
+ if (state == null) throw new ArcaneException("Error parsing " + Arcane.getHomeDirectory() + "data/formats.txt\". Invalid section: " + line);
if (state.equals("BANNED")) {
String cardName = line.toLowerCase();
getCards(line);
@@ -742,7 +758,7 @@
} else if (state.equals("SETS")) {
String set = setToMainSet.get(line.toLowerCase());
if (!setToOrdinal.containsKey(set))
- throw new ArcaneException("Error parsing \"data/formats.txt\". Invalid set: " + line);
+ throw new ArcaneException("Error parsing" + Arcane.getHomeDirectory() + "data/formats.txt\". Invalid set: " + line);
Set<String> sets = getFormatSets(currentFormat);
if (sets == null) {
sets = new HashSet();
Modified: trunk/Arcane/Arcane/src/main/java/arcane/RulesDataStore.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/RulesDataStore.java 2010-02-05 19:32:13 UTC (rev 1582)
+++ trunk/Arcane/Arcane/src/main/java/arcane/RulesDataStore.java 2010-02-06 09:36:54 UTC (rev 1583)
@@ -2,6 +2,7 @@
package arcane;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -17,8 +18,9 @@
import arcane.util.InputStreamMonitor;
public class RulesDataStore extends DataStore<RulesDataStore.RulesDataStoreConnection> {
+
public RulesDataStore () throws SQLException {
- super("data/rulesdb/rules", "rules", false);
+ super(Arcane.getHomeDirectory() + "data/rulesdb/rules", "rules", false);
addColumn("rule VARCHAR (32)");
addColumn("subrule VARCHAR (32)");
addColumn("text VARCHAR (4096)");
Modified: trunk/Arcane/Arcane/src/main/java/arcane/RulingsDataStore.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/RulingsDataStore.java 2010-02-05 19:32:13 UTC (rev 1582)
+++ trunk/Arcane/Arcane/src/main/java/arcane/RulingsDataStore.java 2010-02-06 09:36:54 UTC (rev 1583)
@@ -2,6 +2,7 @@
package arcane;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -18,7 +19,7 @@
public class RulingsDataStore extends DataStore<RulingsDataStore.RulingsDataStoreConnection> {
public RulingsDataStore () throws SQLException {
- super("data/rulesdb/rules", "rulings", false);
+ super(Arcane.getHomeDirectory() + "data/rulesdb/rules", "rulings", false);
addColumn("name VARCHAR (256)");
addColumn("ruling VARCHAR (2048)");
open();
Modified: trunk/Arcane/Arcane/src/main/java/arcane/deckbuilder/ui/DeckBuilder.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/deckbuilder/ui/DeckBuilder.java 2010-02-05 19:32:13 UTC (rev 1582)
+++ trunk/Arcane/Arcane/src/main/java/arcane/deckbuilder/ui/DeckBuilder.java 2010-02-06 09:36:54 UTC (rev 1583)
@@ -160,10 +160,10 @@
updateCardImageType();
updateButtons();
- saveFileChooser = new JFileChooser("decks");
+ saveFileChooser = new JFileChooser(Arcane.getHomeDirectory() + "decks");
saveFileChooser.setAcceptAllFileFilterUsed(false);
Pattern pattern = Pattern.compile("(.+)\\((.+)\\)\\.st$");
- for (File file : new File("templates").listFiles(FileUtil.filenameEndsWith(".st"))) {
+ for (File file : new File(Arcane.getHomeDirectory() + "templates").listFiles(FileUtil.filenameEndsWith(".st"))) {
Matcher matcher = pattern.matcher(file.getName());
if (!matcher.matches()) continue;
String name = matcher.group(1).trim();
@@ -2686,6 +2686,7 @@
}
public static void main (String[] args) throws Exception {
+ Arcane.getHomeDirectory();
Arcane.setup("data/arcane.properties", "arcane.log", true);
new DeckBuilder().setVisible(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:32:19
|
Revision: 1582
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1582&view=rev
Author: jendave
Date: 2010-02-05 19:32:13 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
remove jardesc file. no longer needed
Removed Paths:
-------------
trunk/Arcane/Arcane/jar-arcane.jardesc
Deleted: trunk/Arcane/Arcane/jar-arcane.jardesc
===================================================================
--- trunk/Arcane/Arcane/jar-arcane.jardesc 2010-02-05 19:30:27 UTC (rev 1581)
+++ trunk/Arcane/Arcane/jar-arcane.jardesc 2010-02-05 19:32:13 UTC (rev 1582)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="MacRoman"?>
-<jardesc>
-<jar path="/Users/dhudson/Documents/workspace-arcane/arcane.jar"/>
-<options buildIfNeeded="true" compress="true" descriptionLocation="/arcane/jar-arcane.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-<selectedProjects/>
-<manifest generateManifest="false" manifestLocation="/arcane/manifest.arcane" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-<sealing sealJar="false">
-<packagesToSeal/>
-<packagesToUnSeal/>
-</sealing>
-</manifest>
-<selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
-<javaElement handleIdentifier="=arcane/resources"/>
-<javaElement handleIdentifier="=arcane/src"/>
-</selectedElements>
-</jardesc>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:30:33
|
Revision: 1581
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1581&view=rev
Author: jendave
Date: 2010-02-05 19:30:27 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
pom file fix: project is gpl 3
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-05 19:22:22 UTC (rev 1580)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-05 19:30:27 UTC (rev 1581)
@@ -51,8 +51,8 @@
</developers>
<licenses>
<license>
- <name>GPL</name>
- <url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
+ <name>GPL 3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
</license>
</licenses>
<scm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:22:28
|
Revision: 1580
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1580&view=rev
Author: jendave
Date: 2010-02-05 19:22:22 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
delete manifest. It is now auto-generated
Removed Paths:
-------------
trunk/Arcane/Arcane/manifest.arcane
Deleted: trunk/Arcane/Arcane/manifest.arcane
===================================================================
--- trunk/Arcane/Arcane/manifest.arcane 2010-02-05 19:19:48 UTC (rev 1579)
+++ trunk/Arcane/Arcane/manifest.arcane 2010-02-05 19:22:22 UTC (rev 1580)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: arcane.deckbuilder.ui.DeckBuilder
-Class-Path: . arcane.jar lib/antlr-2.7.7.jar lib/h2.jar lib/stringtemplate.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:19:54
|
Revision: 1579
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1579&view=rev
Author: jendave
Date: 2010-02-05 19:19:48 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
remove logs file. It is generated by the app when run
Removed Paths:
-------------
trunk/Arcane/Arcane/logs/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:18:13
|
Revision: 1578
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1578&view=rev
Author: jendave
Date: 2010-02-05 19:18:05 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
move images dir into resources
Modified Paths:
--------------
trunk/Arcane/Arcane/src/main/java/arcane/ui/CardInfoPane.java
trunk/Arcane/Arcane/src/main/java/arcane/ui/ManaSymbols.java
trunk/Arcane/Arcane/src/main/java/arcane/ui/table/FlagRenderer.java
trunk/Arcane/Arcane/src/main/java/arcane/ui/table/RatingRenderer.java
trunk/Arcane/Arcane/src/main/resources/help-deckbuilder.html
Added Paths:
-----------
trunk/Arcane/Arcane/src/main/resources/images/
Removed Paths:
-------------
trunk/Arcane/Arcane/images/
Modified: trunk/Arcane/Arcane/src/main/java/arcane/ui/CardInfoPane.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/ui/CardInfoPane.java 2010-02-05 19:02:43 UTC (rev 1577)
+++ trunk/Arcane/Arcane/src/main/java/arcane/ui/CardInfoPane.java 2010-02-05 19:18:05 UTC (rev 1578)
@@ -162,10 +162,10 @@
if (card.rating > 0 || card.flags.length() > 0) {
buffer.append("<table cellspacing=0 cellpadding=0 border=0 width='100%'><tr><td>");
for (int ii = 0, nn = card.rating; ii < nn; ii++)
- buffer.append("<img src='file:images/star.png' width=14 height=14>");
+ buffer.append("<img src='file:/images/star.png' width=14 height=14>");
buffer.append("</td><td align='right'>");
for (int ii = 0, nn = card.flags.length(); ii < nn; ii++) {
- buffer.append("<img src='file:images/flag_");
+ buffer.append("<img src='file:/images/flag_");
buffer.append(card.flags.charAt(ii));
buffer.append(".png' width=14 height=14>");
}
Modified: trunk/Arcane/Arcane/src/main/java/arcane/ui/ManaSymbols.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/ui/ManaSymbols.java 2010-02-05 19:02:43 UTC (rev 1577)
+++ trunk/Arcane/Arcane/src/main/java/arcane/ui/ManaSymbols.java 2010-02-05 19:18:05 UTC (rev 1578)
@@ -20,7 +20,7 @@
"4", "5", "6", "7", "8", "9", "B", "BG", "BR", "G", "GU", "GW", "R", "RG", "RW", "S", "T", "U", "UB",
"UR", "W", "WB", "WU", "X", "Y", "Z", "slash"};
for (String symbol : symbols)
- manaImages.put(symbol, UI.getImageIcon("images/symbols-13/" + symbol + ".png").getImage());
+ manaImages.put(symbol, UI.getImageIcon("/images/symbols-13/" + symbol + ".png").getImage());
}
static public void draw (Graphics g, String manaCost, int x, int y) {
@@ -51,13 +51,13 @@
static public synchronized String replaceSymbolsWithHTML (String value, boolean small) {
if (small){
- value = value.replace("{C}", "<img src='file:images/symbols-11/C.png' width=13 height=11>");
- return replaceSymbolsPattern.matcher(value).replaceAll("<img src='file:images/symbols-11/$1$2.png' width=11 height=11>");
+ value = value.replace("{C}", "<img src='file:/images/symbols-11/C.png' width=13 height=11>");
+ return replaceSymbolsPattern.matcher(value).replaceAll("<img src='file:/images/symbols-11/$1$2.png' width=11 height=11>");
}
else {
- value = value.replace("{slash}", "<img src='file:images/symbols-13/slash.png' width=10 height=13>");
- value = value.replace("{C}", "<img src='file:images/symbols-13/C.png' width=16 height=13>");
- return replaceSymbolsPattern.matcher(value).replaceAll("<img src='file:images/symbols-13/$1$2.png' width=13 height=13>");
+ value = value.replace("{slash}", "<img src='file:/images/symbols-13/slash.png' width=10 height=13>");
+ value = value.replace("{C}", "<img src='file:/images/symbols-13/C.png' width=16 height=13>");
+ return replaceSymbolsPattern.matcher(value).replaceAll("<img src='file:/images/symbols-13/$1$2.png' width=13 height=13>");
}
}
}
Modified: trunk/Arcane/Arcane/src/main/java/arcane/ui/table/FlagRenderer.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/ui/table/FlagRenderer.java 2010-02-05 19:02:43 UTC (rev 1577)
+++ trunk/Arcane/Arcane/src/main/java/arcane/ui/table/FlagRenderer.java 2010-02-05 19:18:05 UTC (rev 1578)
@@ -129,12 +129,12 @@
}
static public void loadImages () {
- greyFlagImage = UI.getImageIcon("images/flag_grey.png").getImage();
- indexToFlag.put(0, new Flag("Blue", UI.getImageIcon("images/flag_b.png").getImage()));
- indexToFlag.put(1, new Flag("Green", UI.getImageIcon("images/flag_g.png").getImage()));
- indexToFlag.put(2, new Flag("Yellow", UI.getImageIcon("images/flag_y.png").getImage()));
- indexToFlag.put(3, new Flag("Orange", UI.getImageIcon("images/flag_o.png").getImage()));
- indexToFlag.put(4, new Flag("Red", UI.getImageIcon("images/flag_r.png").getImage()));
+ greyFlagImage = UI.getImageIcon("/images/flag_grey.png").getImage();
+ indexToFlag.put(0, new Flag("Blue", UI.getImageIcon("/images/flag_b.png").getImage()));
+ indexToFlag.put(1, new Flag("Green", UI.getImageIcon("/images/flag_g.png").getImage()));
+ indexToFlag.put(2, new Flag("Yellow", UI.getImageIcon("/images/flag_y.png").getImage()));
+ indexToFlag.put(3, new Flag("Orange", UI.getImageIcon("/images/flag_o.png").getImage()));
+ indexToFlag.put(4, new Flag("Red", UI.getImageIcon("/images/flag_r.png").getImage()));
}
static public class Flag {
Modified: trunk/Arcane/Arcane/src/main/java/arcane/ui/table/RatingRenderer.java
===================================================================
--- trunk/Arcane/Arcane/src/main/java/arcane/ui/table/RatingRenderer.java 2010-02-05 19:02:43 UTC (rev 1577)
+++ trunk/Arcane/Arcane/src/main/java/arcane/ui/table/RatingRenderer.java 2010-02-05 19:18:05 UTC (rev 1578)
@@ -130,8 +130,8 @@
}
static public void loadImages () {
- starImage = UI.getImageIcon("images/star.png").getImage();
- greyStarImage = UI.getImageIcon("images/star_grey.png").getImage();
- overStarImage = UI.getImageIcon("images/star_over.png").getImage();
+ starImage = UI.getImageIcon("/images/star.png").getImage();
+ greyStarImage = UI.getImageIcon("/images/star_grey.png").getImage();
+ overStarImage = UI.getImageIcon("/images/star_over.png").getImage();
}
}
Modified: trunk/Arcane/Arcane/src/main/resources/help-deckbuilder.html
===================================================================
--- trunk/Arcane/Arcane/src/main/resources/help-deckbuilder.html 2010-02-05 19:02:43 UTC (rev 1577)
+++ trunk/Arcane/Arcane/src/main/resources/help-deckbuilder.html 2010-02-05 19:18:05 UTC (rev 1578)
@@ -38,15 +38,15 @@
<b>toughness=4</b> - Finds all cards with a toughness of 4. "toughness" and "t" are identical.<br>
<br>
<i>Cost search:</i><br>
-<b>c={1}{U}{B}</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/1.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11><img src='file:images/symbols-11/B.png' width=11 height=11>.<br>
-<b>c=1UB</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/1.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11><img src='file:images/symbols-11/B.png' width=11 height=11>. The curly braces are added automatically.<br>
-<b>c={UB}{UB}</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/UB.png' width=11 height=11><img src='file:images/symbols-11/UB.png' width=11 height=11>.<br>
-<b>c={16}</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/16.png' width=11 height=11>.<br>
-<b>cost=1UB</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/1.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11><img src='file:images/symbols-11/B.png' width=11 height=11>. "cost" and "c" are identical.<br>
-<b>castingcost=1UB</b> - Finds all cards with the exact casting cost of <img src='file:images/symbols-11/1.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11><img src='file:images/symbols-11/B.png' width=11 height=11>. "castingcost" and "c" are identical.<br>
-<b>c=1U*</b> - Finds all cards with a casting cost starting with <img src='file:images/symbols-11/1.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
-<b>c=1*B</b> - Finds all cards with a casting cost starting with <img src='file:images/symbols-11/1.png' width=11 height=11>, then one or more of any symbol, then ending with <img src='file:images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
-<b>c=*UB</b> - Finds all cards with a casting cost ending with <img src='file:images/symbols-11/U.png' width=11 height=11><img src='file:images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
+<b>c={1}{U}{B}</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/1.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11><img src='file:/images/symbols-11/B.png' width=11 height=11>.<br>
+<b>c=1UB</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/1.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11><img src='file:/images/symbols-11/B.png' width=11 height=11>. The curly braces are added automatically.<br>
+<b>c={UB}{UB}</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/UB.png' width=11 height=11><img src='file:/images/symbols-11/UB.png' width=11 height=11>.<br>
+<b>c={16}</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/16.png' width=11 height=11>.<br>
+<b>cost=1UB</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/1.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11><img src='file:/images/symbols-11/B.png' width=11 height=11>. "cost" and "c" are identical.<br>
+<b>castingcost=1UB</b> - Finds all cards with the exact casting cost of <img src='file:/images/symbols-11/1.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11><img src='file:/images/symbols-11/B.png' width=11 height=11>. "castingcost" and "c" are identical.<br>
+<b>c=1U*</b> - Finds all cards with a casting cost starting with <img src='file:/images/symbols-11/1.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
+<b>c=1*B</b> - Finds all cards with a casting cost starting with <img src='file:/images/symbols-11/1.png' width=11 height=11>, then one or more of any symbol, then ending with <img src='file:/images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
+<b>c=*UB</b> - Finds all cards with a casting cost ending with <img src='file:/images/symbols-11/U.png' width=11 height=11><img src='file:/images/symbols-11/U.png' width=11 height=11>. The curly braces are added automatically.<br>
<br>
<i>Converted cost search:</i><br>
<b>cc=4</b> - Finds all cards with the converted mana cost of 4.<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-05 19:02:49
|
Revision: 1577
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1577&view=rev
Author: jendave
Date: 2010-02-05 19:02:43 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
removed libs. updated pom file to create jar-with-deps assembly
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
Removed Paths:
-------------
trunk/Arcane/Arcane/Arcane.xml
trunk/Arcane/Arcane/build.xml
trunk/Arcane/Arcane/lib/
Deleted: trunk/Arcane/Arcane/Arcane.xml
===================================================================
--- trunk/Arcane/Arcane/Arcane.xml 2010-02-04 23:51:13 UTC (rev 1576)
+++ trunk/Arcane/Arcane/Arcane.xml 2010-02-05 19:02:43 UTC (rev 1577)
@@ -1,22 +0,0 @@
-<launch4jConfig>
- <dontWrapJar>true</dontWrapJar>
- <headerType>gui</headerType>
- <jar>arcane.jar</jar>
- <outfile>arcane.exe</outfile>
- <errTitle>Arcane</errTitle>
- <cmdLine></cmdLine>
- <chdir></chdir>
- <priority>normal</priority>
- <downloadUrl>http://java.com/download</downloadUrl>
- <supportUrl></supportUrl>
- <customProcName>true</customProcName>
- <stayAlive>false</stayAlive>
- <manifest></manifest>
- <icon>resources/deckbuilder.ico</icon>
- <jre>
- <path></path>
- <minVersion>1.5.0</minVersion>
- <maxVersion></maxVersion>
- <jdkPreference>preferJre</jdkPreference>
- </jre>
-</launch4jConfig>
\ No newline at end of file
Deleted: trunk/Arcane/Arcane/build.xml
===================================================================
--- trunk/Arcane/Arcane/build.xml 2010-02-04 23:51:13 UTC (rev 1576)
+++ trunk/Arcane/Arcane/build.xml 2010-02-05 19:02:43 UTC (rev 1577)
@@ -1,11 +0,0 @@
-<project name="Arcane" default="exe" basedir=".">
- <property name="launch4j.dir" location="lib/launch4j" />
- <target name="exe">
- <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="${launch4j.dir}/launch4j.jar
- :${launch4j.dir}/lib/xstream.jar" />
- <launch4j configFile="./Arcane.xml" />
- </target>
- <target name="clean" description="clean up">
- <delete file="./Arcane.exe" />
- </target>
-</project>
\ No newline at end of file
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-04 23:51:13 UTC (rev 1576)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-05 19:02:43 UTC (rev 1577)
@@ -16,13 +16,13 @@
UTF-8
</project.reporting.outputEncoding>
</properties>
- <distributionManagement>
- <repository>
- <id>arcane-repository</id>
- <name>Arcane Repository</name>
- <url>file://${basedir}/target/deploy</url>
- </repository>
- </distributionManagement>
+ <distributionManagement>
+ <repository>
+ <id>arcane-repository</id>
+ <name>Arcane Repository</name>
+ <url>file://${basedir}/target/deploy</url>
+ </repository>
+ </distributionManagement>
<developers>
<developer>
<id>jendave</id>
@@ -61,24 +61,49 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>osxappbundle-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <configuration>
- <mainClass>arcane.deckbuilder.ui.DeckBuilder</mainClass>
- <iconFile>src/main/resources/deckbuilder.icns</iconFile>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>create-executable-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>arcane.deckbuilder.ui.DeckBuilder</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>osxappbundle-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <mainClass>arcane.deckbuilder.ui.DeckBuilder</mainClass>
+ <iconFile>src/main/resources/deckbuilder.icns</iconFile>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -95,38 +120,37 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
- <artifactId>launch4j-plugin</artifactId>
- <version>1.5.0.0</version>
- <executions>
- <execution>
- <id>launch4j</id>
- <phase>package</phase>
- <goals>
- <goal>launch4j</goal>
- </goals>
- <configuration>
- <dontWrapJar>true</dontWrapJar>
- <headerType>gui</headerType>
- <outfile>target/arcane.exe</outfile>
- <jar>target/arcane.jar</jar>
- <errTitle>Arcane</errTitle>
- <jre>
- <minVersion>1.5.0</minVersion>
- </jre>
-<!-- <splash>
- <file>${basedir}/src/main/installer/images/splash.bmp</file>
- <waitForWindow>true</waitForWindow>
- <timeout>60</timeout>
- <timeoutErr>false</timeoutErr>
- </splash>
- -->
- <!-- <icon>resources/deckbuilder.ico</icon>-->
- </configuration>
- </execution>
- </executions>
- </plugin>
-
+ <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
+ <artifactId>launch4j-plugin</artifactId>
+ <version>1.5.0.0</version>
+ <executions>
+ <execution>
+ <id>launch4j</id>
+ <phase>package</phase>
+ <goals>
+ <goal>launch4j</goal>
+ </goals>
+ <configuration>
+ <dontWrapJar>true</dontWrapJar>
+ <headerType>gui</headerType>
+ <outfile>target/arcane.exe</outfile>
+ <jar>target/arcane.jar</jar>
+ <errTitle>Arcane</errTitle>
+ <jre>
+ <minVersion>1.5.0</minVersion>
+ </jre>
+ <!--
+ <splash>
+ <file>${basedir}/src/main/installer/images/splash.bmp</file>
+ <waitForWindow>true</waitForWindow> <timeout>60</timeout>
+ <timeoutErr>false</timeoutErr> </splash>
+ -->
+ <!-- <icon>resources/deckbuilder.ico</icon>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-04 23:51:25
|
Revision: 1576
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1576&view=rev
Author: jendave
Date: 2010-02-04 23:51:13 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
add Launch4j to pom file
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-04 23:30:55 UTC (rev 1575)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-04 23:51:13 UTC (rev 1576)
@@ -94,13 +94,46 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
+ <artifactId>launch4j-plugin</artifactId>
+ <version>1.5.0.0</version>
+ <executions>
+ <execution>
+ <id>launch4j</id>
+ <phase>package</phase>
+ <goals>
+ <goal>launch4j</goal>
+ </goals>
+ <configuration>
+ <dontWrapJar>true</dontWrapJar>
+ <headerType>gui</headerType>
+ <outfile>target/arcane.exe</outfile>
+ <jar>target/arcane.jar</jar>
+ <errTitle>Arcane</errTitle>
+ <jre>
+ <minVersion>1.5.0</minVersion>
+ </jre>
+<!-- <splash>
+ <file>${basedir}/src/main/installer/images/splash.bmp</file>
+ <waitForWindow>true</waitForWindow>
+ <timeout>60</timeout>
+ <timeoutErr>false</timeoutErr>
+ </splash>
+ -->
+ <!-- <icon>resources/deckbuilder.ico</icon>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.bluestemsoftware.open.maven.plugin</groupId>
<artifactId>launch4j-plugin</artifactId>
- <version>1.0.0.3</version>
+ <version>1.5.0.0</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-04 23:31:01
|
Revision: 1575
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1575&view=rev
Author: jendave
Date: 2010-02-04 23:30:55 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
add google collections to pom file
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2010-02-04 23:16:42 UTC (rev 1574)
+++ trunk/Arcane/Arcane/pom.xml 2010-02-04 23:30:55 UTC (rev 1575)
@@ -126,5 +126,11 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.code.google-collections</groupId>
+ <artifactId>google-collect</artifactId>
+ <version>snapshot-20080530</version>
+ <optional>false</optional>
+ </dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2010-02-04 23:16:50
|
Revision: 1574
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1574&view=rev
Author: jendave
Date: 2010-02-04 23:16:42 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
add google jar file
Added Paths:
-----------
trunk/Arcane/Arcane/lib/google-collections-1.0.jar
Property Changed:
----------------
trunk/Arcane/Arcane/
Property changes on: trunk/Arcane/Arcane
___________________________________________________________________
Modified: svn:ignore
- plugins
arcane.jar
target
+ plugins
arcane.jar
target
arcane-1.0-SNAPSHOT.jar
Added: trunk/Arcane/Arcane/lib/google-collections-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Arcane/Arcane/lib/google-collections-1.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-30 23:03:55
|
Revision: 1572
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1572&view=rev
Author: jendave
Date: 2009-11-30 23:03:43 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
fix a module issue
Modified Paths:
--------------
trunk/Arcane/pom.xml
Property Changed:
----------------
trunk/Arcane/
Property changes on: trunk/Arcane
___________________________________________________________________
Modified: svn:ignore
- *.exe
arcane.jar
+ *.exe
target
arcane.jar
Modified: trunk/Arcane/pom.xml
===================================================================
--- trunk/Arcane/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
+++ trunk/Arcane/pom.xml 2009-11-30 23:03:43 UTC (rev 1572)
@@ -9,12 +9,12 @@
<description>Deckbuilder for Magic: The Gathering</description>
<url>http://www.slightlymagic.net/</url>
<modules>
- <module>Arcane</module>
- <module>CardGenerator</module>
- <module>CrystalKeepRulings</module>
- <module>MagicTraders</module>
- <module>MTGVault</module>
- <module>MWSPlay</module>
+ <module>Arcane</module>
+ <module>CardGenerator</module>
+ <module>CrystalKeepRulings</module>
+ <module>MagicTraders</module>
+ <module>MTGVault</module>
+ <module>MWSPlay</module>
</modules>
<properties>
<project.build.sourceEncoding>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-30 22:44:26
|
Revision: 1571
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1571&view=rev
Author: jendave
Date: 2009-11-30 22:44:15 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
add svn info to pom
Modified Paths:
--------------
trunk/Arcane/.classpath
trunk/Arcane/Arcane/pom.xml
trunk/Arcane/CardGenerator/pom.xml
trunk/Arcane/CrystalKeepRulings/pom.xml
trunk/Arcane/MTGVault/pom.xml
trunk/Arcane/MWSPlay/pom.xml
trunk/Arcane/MagicTraders/pom.xml
trunk/Arcane/pom.xml
Modified: trunk/Arcane/.classpath
===================================================================
--- trunk/Arcane/.classpath 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/.classpath 2009-11-30 22:44:15 UTC (rev 1571)
@@ -3,6 +3,6 @@
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry including="**/*.java" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/Arcane/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/Arcane/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/CardGenerator/pom.xml
===================================================================
--- trunk/Arcane/CardGenerator/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/CardGenerator/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/CardGenerator/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/CrystalKeepRulings/pom.xml
===================================================================
--- trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/CrystalKeepRulings/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/MTGVault/pom.xml
===================================================================
--- trunk/Arcane/MTGVault/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/MTGVault/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/MTGVault/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/MWSPlay/pom.xml
===================================================================
--- trunk/Arcane/MWSPlay/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/MWSPlay/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/MWSPlay/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/MagicTraders/pom.xml
===================================================================
--- trunk/Arcane/MagicTraders/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/MagicTraders/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -55,6 +55,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/MagicTraders/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
Modified: trunk/Arcane/pom.xml
===================================================================
--- trunk/Arcane/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
+++ trunk/Arcane/pom.xml 2009-11-30 22:44:15 UTC (rev 1571)
@@ -9,6 +9,7 @@
<description>Deckbuilder for Magic: The Gathering</description>
<url>http://www.slightlymagic.net/</url>
<modules>
+ <module>Arcane</module>
<module>CardGenerator</module>
<module>CrystalKeepRulings</module>
<module>MagicTraders</module>
@@ -62,6 +63,9 @@
<url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</url>
</license>
</licenses>
+ <scm>
+ <url>https://cs-sdl.svn.sourceforge.net/svnroot/cs-sdl/trunk/Arcane/</url>
+ </scm>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:24:30
|
Revision: 1570
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1570&view=rev
Author: jendave
Date: 2009-11-25 20:24:23 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
fix jar issue
Modified Paths:
--------------
trunk/Arcane/MagicTraders/pom.xml
trunk/Arcane/pom.xml
Added Paths:
-----------
trunk/Arcane/src/
trunk/Arcane/src/test/
trunk/Arcane/src/test/java/
Modified: trunk/Arcane/MagicTraders/pom.xml
===================================================================
--- trunk/Arcane/MagicTraders/pom.xml 2009-11-25 20:20:11 UTC (rev 1569)
+++ trunk/Arcane/MagicTraders/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
@@ -70,7 +70,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: trunk/Arcane/pom.xml
===================================================================
--- trunk/Arcane/pom.xml 2009-11-25 20:20:11 UTC (rev 1569)
+++ trunk/Arcane/pom.xml 2009-11-25 20:24:23 UTC (rev 1570)
@@ -65,6 +65,22 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>osxappbundle-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <mainClass>com.example.Main</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -72,15 +88,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:20:17
|
Revision: 1569
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1569&view=rev
Author: jendave
Date: 2009-11-25 20:20:11 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Added Paths:
-----------
trunk/Arcane/CardGenerator/src/main/resources/META-INF/
trunk/Arcane/CardGenerator/src/main/resources/META-INF/application.properties
Added: trunk/Arcane/CardGenerator/src/main/resources/META-INF/application.properties
===================================================================
--- trunk/Arcane/CardGenerator/src/main/resources/META-INF/application.properties (rev 0)
+++ trunk/Arcane/CardGenerator/src/main/resources/META-INF/application.properties 2009-11-25 20:20:11 UTC (rev 1569)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Property changes on: trunk/Arcane/CardGenerator/src/main/resources/META-INF/application.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:18:20
|
Revision: 1568
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1568&view=rev
Author: jendave
Date: 2009-11-25 20:17:55 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Modified Paths:
--------------
trunk/Arcane/Arcane/pom.xml
trunk/Arcane/CardGenerator/pom.xml
trunk/Arcane/CrystalKeepRulings/pom.xml
trunk/Arcane/MTGVault/pom.xml
trunk/Arcane/pom.xml
Added Paths:
-----------
trunk/Arcane/CardGenerator/src/main/resources/plugin.txt
trunk/Arcane/CrystalKeepRulings/src/main/resources/plugin.txt
Removed Paths:
-------------
trunk/Arcane/CardGenerator/resources/
trunk/Arcane/CrystalKeepRulings/resources/
Property Changed:
----------------
trunk/Arcane/Arcane/
Property changes on: trunk/Arcane/Arcane
___________________________________________________________________
Modified: svn:ignore
- plugins
arcane.jar
+ plugins
arcane.jar
target
Modified: trunk/Arcane/Arcane/pom.xml
===================================================================
--- trunk/Arcane/Arcane/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
+++ trunk/Arcane/Arcane/pom.xml 2009-11-25 20:17:55 UTC (rev 1568)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
+ <groupId>net.slightlymagic</groupId>
<artifactId>arcane</artifactId>
<packaging>jar</packaging>
<name>Arcane</name>
@@ -58,6 +58,22 @@
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>osxappbundle-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <mainClass>arcane.deckbuilder.ui.DeckBuilder</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: trunk/Arcane/CardGenerator/pom.xml
===================================================================
--- trunk/Arcane/CardGenerator/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
+++ trunk/Arcane/CardGenerator/pom.xml 2009-11-25 20:17:55 UTC (rev 1568)
@@ -70,7 +70,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Copied: trunk/Arcane/CardGenerator/src/main/resources/plugin.txt (from rev 1563, trunk/Arcane/CardGenerator/resources/plugin.txt)
===================================================================
--- trunk/Arcane/CardGenerator/src/main/resources/plugin.txt (rev 0)
+++ trunk/Arcane/CardGenerator/src/main/resources/plugin.txt 2009-11-25 20:17:55 UTC (rev 1568)
@@ -0,0 +1 @@
+arcane.deckbuilder.cardgenerator.CardGeneratorPlugin
Property changes on: trunk/Arcane/CardGenerator/src/main/resources/plugin.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/Arcane/CrystalKeepRulings/pom.xml
===================================================================
--- trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
+++ trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-25 20:17:55 UTC (rev 1568)
@@ -70,7 +70,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Copied: trunk/Arcane/CrystalKeepRulings/src/main/resources/plugin.txt (from rev 1563, trunk/Arcane/CrystalKeepRulings/resources/plugin.txt)
===================================================================
--- trunk/Arcane/CrystalKeepRulings/src/main/resources/plugin.txt (rev 0)
+++ trunk/Arcane/CrystalKeepRulings/src/main/resources/plugin.txt 2009-11-25 20:17:55 UTC (rev 1568)
@@ -0,0 +1 @@
+arcane.deckbuilder.crystalkeeprulings.CrystalKeepRulingsPlugin
Property changes on: trunk/Arcane/CrystalKeepRulings/src/main/resources/plugin.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/Arcane/MTGVault/pom.xml
===================================================================
--- trunk/Arcane/MTGVault/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
+++ trunk/Arcane/MTGVault/pom.xml 2009-11-25 20:17:55 UTC (rev 1568)
@@ -70,7 +70,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: trunk/Arcane/pom.xml
===================================================================
--- trunk/Arcane/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
+++ trunk/Arcane/pom.xml 2009-11-25 20:17:55 UTC (rev 1568)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
- <artifactId>arcane</artifactId>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>arcane-deckbuilder</artifactId>
<packaging>pom</packaging>
<name>Arcane</name>
<version>1.0-SNAPSHOT</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:14:54
|
Revision: 1567
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1567&view=rev
Author: jendave
Date: 2009-11-25 20:14:47 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Modified Paths:
--------------
trunk/Arcane/MWSPlay/pom.xml
Added Paths:
-----------
trunk/Arcane/MWSPlay/src/main/
trunk/Arcane/MWSPlay/src/main/java/
trunk/Arcane/MWSPlay/src/main/java/arcane/
trunk/Arcane/MWSPlay/src/main/resources/
trunk/Arcane/MWSPlay/src/main/resources/META-INF/
trunk/Arcane/MWSPlay/src/main/resources/META-INF/application.properties
trunk/Arcane/MWSPlay/src/test/
Removed Paths:
-------------
trunk/Arcane/MWSPlay/resources/
trunk/Arcane/MWSPlay/src/arcane/
Property Changed:
----------------
trunk/Arcane/MWSPlay/
Property changes on: trunk/Arcane/MWSPlay
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/Arcane/MWSPlay/pom.xml
===================================================================
--- trunk/Arcane/MWSPlay/pom.xml 2009-11-25 20:13:14 UTC (rev 1566)
+++ trunk/Arcane/MWSPlay/pom.xml 2009-11-25 20:14:47 UTC (rev 1567)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
- <artifactId>MWSPlay</artifactId>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>mwsplay</artifactId>
<packaging>jar</packaging>
<name>MWSPlay</name>
<version>1.0-SNAPSHOT</version>
@@ -70,7 +70,6 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
@@ -106,5 +105,11 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>arcane</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>false</optional>
+ </dependency>
</dependencies>
</project>
Added: trunk/Arcane/MWSPlay/src/main/resources/META-INF/application.properties
===================================================================
--- trunk/Arcane/MWSPlay/src/main/resources/META-INF/application.properties (rev 0)
+++ trunk/Arcane/MWSPlay/src/main/resources/META-INF/application.properties 2009-11-25 20:14:47 UTC (rev 1567)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Property changes on: trunk/Arcane/MWSPlay/src/main/resources/META-INF/application.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:13:20
|
Revision: 1566
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1566&view=rev
Author: jendave
Date: 2009-11-25 20:13:14 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Modified Paths:
--------------
trunk/Arcane/MTGVault/pom.xml
Added Paths:
-----------
trunk/Arcane/MTGVault/src/main/
trunk/Arcane/MTGVault/src/main/java/
trunk/Arcane/MTGVault/src/main/java/arcane/
trunk/Arcane/MTGVault/src/main/resources/
trunk/Arcane/MTGVault/src/main/resources/META-INF/
trunk/Arcane/MTGVault/src/main/resources/META-INF/application.properties
trunk/Arcane/MTGVault/src/test/
Removed Paths:
-------------
trunk/Arcane/MTGVault/resources/
trunk/Arcane/MTGVault/src/arcane/
Property Changed:
----------------
trunk/Arcane/MTGVault/
Property changes on: trunk/Arcane/MTGVault
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/Arcane/MTGVault/pom.xml
===================================================================
--- trunk/Arcane/MTGVault/pom.xml 2009-11-25 20:07:59 UTC (rev 1565)
+++ trunk/Arcane/MTGVault/pom.xml 2009-11-25 20:13:14 UTC (rev 1566)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
+ <groupId>net.slightlymagic</groupId>
<artifactId>mtgvault</artifactId>
<packaging>jar</packaging>
<name>MTGVault</name>
@@ -106,5 +106,11 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>arcane</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>false</optional>
+ </dependency>
</dependencies>
</project>
Added: trunk/Arcane/MTGVault/src/main/resources/META-INF/application.properties
===================================================================
--- trunk/Arcane/MTGVault/src/main/resources/META-INF/application.properties (rev 0)
+++ trunk/Arcane/MTGVault/src/main/resources/META-INF/application.properties 2009-11-25 20:13:14 UTC (rev 1566)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Property changes on: trunk/Arcane/MTGVault/src/main/resources/META-INF/application.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:08:09
|
Revision: 1565
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1565&view=rev
Author: jendave
Date: 2009-11-25 20:07:59 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Modified Paths:
--------------
trunk/Arcane/MagicTraders/pom.xml
Added Paths:
-----------
trunk/Arcane/MagicTraders/src/main/
trunk/Arcane/MagicTraders/src/main/java/
trunk/Arcane/MagicTraders/src/main/java/arcane/
trunk/Arcane/MagicTraders/src/main/resources/
trunk/Arcane/MagicTraders/src/main/resources/META-INF/
trunk/Arcane/MagicTraders/src/main/resources/META-INF/application.properties
trunk/Arcane/MagicTraders/src/test/
Removed Paths:
-------------
trunk/Arcane/MagicTraders/resources/
trunk/Arcane/MagicTraders/src/arcane/
Property Changed:
----------------
trunk/Arcane/MagicTraders/
Property changes on: trunk/Arcane/MagicTraders
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/Arcane/MagicTraders/pom.xml
===================================================================
--- trunk/Arcane/MagicTraders/pom.xml 2009-11-25 20:00:14 UTC (rev 1564)
+++ trunk/Arcane/MagicTraders/pom.xml 2009-11-25 20:07:59 UTC (rev 1565)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
+ <groupId>net.slightlymagic</groupId>
<artifactId>magictraders</artifactId>
<packaging>jar</packaging>
<name>MagicTraders</name>
@@ -106,5 +106,11 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>arcane</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>false</optional>
+ </dependency>
</dependencies>
</project>
Added: trunk/Arcane/MagicTraders/src/main/resources/META-INF/application.properties
===================================================================
--- trunk/Arcane/MagicTraders/src/main/resources/META-INF/application.properties (rev 0)
+++ trunk/Arcane/MagicTraders/src/main/resources/META-INF/application.properties 2009-11-25 20:07:59 UTC (rev 1565)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Property changes on: trunk/Arcane/MagicTraders/src/main/resources/META-INF/application.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 20:00:21
|
Revision: 1564
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1564&view=rev
Author: jendave
Date: 2009-11-25 20:00:14 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
Add jar elements
Added Paths:
-----------
trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/
trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/application.properties
Property Changed:
----------------
trunk/Arcane/CrystalKeepRulings/
Property changes on: trunk/Arcane/CrystalKeepRulings
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/application.properties
===================================================================
--- trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/application.properties (rev 0)
+++ trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/application.properties 2009-11-25 20:00:14 UTC (rev 1564)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Property changes on: trunk/Arcane/CrystalKeepRulings/src/main/resources/META-INF/application.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 19:56:31
|
Revision: 1563
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1563&view=rev
Author: jendave
Date: 2009-11-25 19:56:19 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Added Paths:
-----------
trunk/Arcane/CrystalKeepRulings/src/main/java/arcane/
Removed Paths:
-------------
trunk/Arcane/CrystalKeepRulings/src/arcane/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 19:55:45
|
Revision: 1562
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1562&view=rev
Author: jendave
Date: 2009-11-25 19:55:36 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Modified Paths:
--------------
trunk/Arcane/CrystalKeepRulings/pom.xml
Added Paths:
-----------
trunk/Arcane/CrystalKeepRulings/src/main/
trunk/Arcane/CrystalKeepRulings/src/main/java/
trunk/Arcane/CrystalKeepRulings/src/main/resources/
trunk/Arcane/CrystalKeepRulings/src/test/
Modified: trunk/Arcane/CrystalKeepRulings/pom.xml
===================================================================
--- trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-25 19:47:53 UTC (rev 1561)
+++ trunk/Arcane/CrystalKeepRulings/pom.xml 2009-11-25 19:55:36 UTC (rev 1562)
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>slightlymagic</groupId>
- <artifactId>CrystalKeepRulings</artifactId>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>crystalkeeprulings</artifactId>
<packaging>jar</packaging>
<name>CrystalKeepRulings</name>
<version>1.0-SNAPSHOT</version>
@@ -106,5 +106,11 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.slightlymagic</groupId>
+ <artifactId>arcane</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>false</optional>
+ </dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2009-11-25 19:48:01
|
Revision: 1561
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1561&view=rev
Author: jendave
Date: 2009-11-25 19:47:53 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
create maven standard dir structure
Added Paths:
-----------
trunk/Arcane/CardGenerator/src/main/resources/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
