Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2013-07-13 13:36:31
|
Revision: 9328
http://sourceforge.net/p/gridarta/code/9328
Author: akirschbaum
Date: 2013-07-13 13:36:25 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
Rename annotations.jar to annotations-0.0.jar.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
Added Paths:
-----------
trunk/lib/annotations-0.0.jar
Removed Paths:
-------------
trunk/lib/annotations.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-07-13 13:30:45 UTC (rev 9327)
+++ trunk/build.xml 2013-07-13 13:36:25 UTC (rev 9328)
@@ -130,7 +130,7 @@
<pathelement location="${build.dir}/utils/test"/>
</path>
- <path id="path.lib.annotations" location="lib/annotations.jar"/>
+ <path id="path.lib.annotations" location="lib/annotations-0.0.jar"/>
<path id="path.lib.bsh-core" location="lib/bsh-core-2.0b4.jar"/>
<path id="path.lib.bsh-util" location="lib/bsh-util-2.0b4.jar"/>
<path id="path.lib.getopt" location="lib/java-getopt-1.0.13.jar"/>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-07-13 13:30:45 UTC (rev 9327)
+++ trunk/gridarta.ipr 2013-07-13 13:36:25 UTC (rev 9328)
@@ -2290,7 +2290,7 @@
<component name="libraryTable">
<library name="annotations">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/annotations.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/annotations-0-0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Copied: trunk/lib/annotations-0.0.jar (from rev 9327, trunk/lib/annotations.jar)
===================================================================
(Binary files differ)
Deleted: trunk/lib/annotations.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-07-14 08:07:48
|
Revision: 9330
http://sourceforge.net/p/gridarta/code/9330
Author: akirschbaum
Date: 2013-07-14 08:07:35 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
Add Gradle build files.
Modified Paths:
--------------
trunk/README
trunk/build-jenkins.sh
trunk/src/atrinik/atrinik.iml
trunk/src/crossfire/crossfire.iml
trunk/src/daimonin/daimonin.iml
trunk/src/gridarta/gridarta.iml
trunk/src/model/model.iml
trunk/src/plugin/plugin.iml
trunk/src/preferences/preferences.iml
trunk/src/textedit/textedit.iml
trunk/src/utils/utils.iml
Added Paths:
-----------
trunk/build.gradle
trunk/settings.gradle
trunk/src/atrinik/build.gradle
trunk/src/crossfire/build.gradle
trunk/src/daimonin/build.gradle
trunk/src/gridarta/build.gradle
trunk/src/model/build.gradle
trunk/src/plugin/build.gradle
trunk/src/preferences/build.gradle
trunk/src/resources/
trunk/src/resources/build.gradle
trunk/src/resources/src/
trunk/src/resources/src/main/
trunk/src/resources/src/main/java/
trunk/src/resources/src/main/resources/
trunk/src/resources/src/main/resources/build.properties
trunk/src/resources/src/test/
trunk/src/resources/src/test/java/
trunk/src/resources/src/test/resources/
trunk/src/textedit/build.gradle
trunk/src/utils/build.gradle
trunk/test-mapvalidator/build.gradle
Property Changed:
----------------
trunk/
trunk/src/atrinik/
trunk/src/crossfire/
trunk/src/daimonin/
trunk/src/gridarta/
trunk/src/model/
trunk/src/plugin/
trunk/src/preferences/
trunk/src/textedit/
trunk/src/utils/
trunk/test-mapvalidator/
Index: trunk
===================================================================
--- trunk 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -1,10 +1,11 ##
-classes
+.gradle
+AtrinikEditor.jar
+build
+build.developer
+CrossfireEditor.jar
+DaimoninEditor.jar
dest
developer.properties
-dist
docs
gridarta.iws
out
-AtrinikEditor.jar
-CrossfireEditor.jar
-DaimoninEditor.jar
Modified: trunk/README
===================================================================
--- trunk/README 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/README 2013-07-14 08:07:35 UTC (rev 9330)
@@ -64,6 +64,15 @@
atrinik/
Directory containing the Atrinik Map Editor / Atrinik specific code.
+build/ (generated)
+**/build/ (generated)
+ These directories contain generated files.
+
+build.developer (optional)
+ Optional file for changing default settings of the Gradle build. You won't
+ need to tweak this file for normal building. But if you want to set or
+ override properties for build.gradle, this is the place to put them.
+
crossfire/
Directory containing the Crossfire Map Editor / Crossfire specific code.
Modified: trunk/build-jenkins.sh
===================================================================
--- trunk/build-jenkins.sh 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/build-jenkins.sh 2013-07-14 08:07:35 UTC (rev 9330)
@@ -5,3 +5,6 @@
cd trunk
debuild -uc -us
ant clean jar test checkstyle javadoc
+gradle clean
+rm -rf .gradle
+gradle installApp check preparePublish :javadoc
Added: trunk/build.gradle
===================================================================
--- trunk/build.gradle (rev 0)
+++ trunk/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,166 @@
+import java.text.SimpleDateFormat
+import org.gradle.process.internal.ExecException
+
+defaultTasks 'createEditorJar', 'installApp', 'check'
+
+// Add lib directory as repository for .jar files.
+allprojects {
+ repositories {
+ flatDir {
+ dirs rootProject.file('lib')
+ }
+ }
+}
+
+// Enforce consistent javac options in all projects.
+allprojects {
+ afterEvaluate { project ->
+ if (project.plugins.findPlugin('java') != null) {
+ project.sourceCompatibility = 1.6
+ project.compileJava.options.encoding = 'UTF-8'
+ project.compileTestJava.options.encoding = 'UTF-8'
+ project.compileJava.options.deprecation = false
+ project.compileTestJava.options.deprecation = false
+ project.compileJava.options.compilerArgs += '-Xlint:all,-path,-unchecked,-fallthrough,-serial,-deprecation'
+ project.compileTestJava.options.compilerArgs += '-Xlint:all,-path,-unchecked,-fallthrough,-serial,-deprecation'
+ }
+ }
+}
+
+File createJavadocOptions(Project project) {
+ // Write -tag options to an option file as MinimalJavadocOptions neither
+ // supports -tag directly nor through addStringOption(). The latter
+ // function ignores all options except for the last one.
+ File optionFile = new File(buildDir, 'javadoc-options')
+ mkdir buildDir
+ new FileOutputStream(optionFile).withWriter('UTF-8') { w ->
+ w.write('-tag todo:a:Todo:\n')
+ w.write('-tag fixme:a:Fixme:\n')
+ w.write('-tag xxx:a:XXX:\n')
+ w.write('-tag note:a:Note:\n')
+ w.write('-tag warning:a:Warning:\n')
+ w.write('-tag "retval:a:Return Value:"\n')
+ w.write('-tag val:a:Value:\n')
+ w.write('-tag "default:a:Default Value:"\n')
+ w.write('-tag invariant:a:Invariant:\n')
+ w.write('-tag pre:a:Precondition:\n')
+ w.write('-tag "noinspection:a:No Inspection:"\n')
+ }
+ return optionFile
+}
+
+allprojects {
+ afterEvaluate { project ->
+ if (project.plugins.findPlugin('java') != null) {
+ configure(javadoc.options) {
+ optionFiles createJavadocOptions(project)
+ quiet()
+ }
+ }
+ }
+}
+
+// Create combined Javadoc for all projects.
+task javadoc(type: Javadoc) {
+ description = 'Runs Javadoc on all Java source files.'
+ failOnError = true
+ title = 'Gridarta — API Documentation'
+ configure(options) {
+ addBooleanOption('private')
+ author false
+ encoding = 'UTF-8'
+ noDeprecated
+ noHelp
+ noIndex
+ noNavBar
+ noTree
+ splitIndex false
+ use
+ version false
+ windowTitle 'Gridarta'
+ overview 'src/gridarta/src/main/java/overview.html'
+ optionFiles createJavadocOptions(project)
+ quiet()
+ }
+ allprojects {
+ afterEvaluate { project ->
+ if (project.plugins.findPlugin('java') != null) {
+ source project.sourceSets.main.allJava
+ javadoc.dependsOn project.getTasksByName('classes', false)
+ }
+ }
+ }
+ destinationDir = file('build/javadoc')
+ doFirst {
+ classpath = files(allprojects.collect { project ->
+ if (project.plugins.findPlugin('java') != null) {
+ project.sourceSets.main.compileClasspath
+ } else {
+ []
+ }
+ })
+ }
+}
+
+// Delete all generated files.
+task clean {
+ description = 'Deletes generated files.'
+ doLast {
+ delete 'build'
+ }
+}
+
+// Run checkstyle on Java sources in all projects.
+allprojects {
+ afterEvaluate { project ->
+ if (plugins.findPlugin('java') != null) {
+ project.apply plugin: 'checkstyle'
+ project.checkstyle.configFile = file('config/checkstyle/checkstyle.xml')
+ project.dependencies {
+ checkstyle name: 'checkstyle-all', version: '5.0'
+ }
+ }
+ }
+}
+
+// Defaults for global options. Overridable with build.developer.
+ext.buildDeveloper = 'unknown'
+ext.updateUrlAtrinik =
+ext.updateUrlCrossfire =
+ext.updateUrlDaimonin =
+
+ext.buildDeveloperFile = file('build.developer')
+if (buildDeveloperFile.exists()) {
+ afterEvaluate { project ->
+ project.apply from: buildDeveloperFile
+ }
+}
+
+// Information about the current project version.
+ext.projectVersionMajor = 0
+ext.projectVersionMinor = 10
+ext.projectVersionPatch = 0
+ext.projectVersion = "${projectVersionMajor}.${projectVersionMinor}.${projectVersionPatch}"
+
+ext.buildTimestamp = {
+ new SimpleDateFormat('yyyy-MM-dd HH:mm:ss z').format(new Date())
+}.memoize()
+
+ext.buildNumber = {
+ String buildNumber
+ try {
+ ByteArrayOutputStream execStandardOutput = new ByteArrayOutputStream()
+ exec {
+ commandLine 'svnversion'
+ workingDir rootProject.projectDir
+ standardOutput = execStandardOutput
+ }
+ buildNumber = execStandardOutput.toString().replaceAll('^[0-9]+:', '').replaceAll('[^0-9]', '')
+ if (buildNumber.isEmpty()) {
+ buildNumber = 'unknown'
+ }
+ } catch (ExecException ex) {
+ buildNumber = 'unknown'
+ }
+ buildNumber
+}.memoize()
Property changes on: trunk/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/settings.gradle
===================================================================
--- trunk/settings.gradle (rev 0)
+++ trunk/settings.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,13 @@
+rootProject.name = 'gridarta'
+
+include 'src:atrinik'
+include 'src:crossfire'
+include 'src:daimonin'
+include 'src:gridarta'
+include 'src:model'
+include 'src:plugin'
+include 'src:preferences'
+include 'src:resources'
+include 'src:textedit'
+include 'src:utils'
+include 'test-mapvalidator'
Property changes on: trunk/settings.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Index: trunk/src/atrinik
===================================================================
--- trunk/src/atrinik 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/atrinik 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/atrinik
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Modified: trunk/src/atrinik/atrinik.iml
===================================================================
--- trunk/src/atrinik/atrinik.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/atrinik/atrinik.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Added: trunk/src/atrinik/build.gradle
===================================================================
--- trunk/src/atrinik/build.gradle (rev 0)
+++ trunk/src/atrinik/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,60 @@
+defaultTasks 'installApp', 'check', 'createEditorJar'
+
+apply plugin: 'application'
+apply plugin: 'java'
+
+evaluationDependsOn ':src:model'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:gridarta')
+ compile project(':src:model')
+ compile project(':src:resources')
+ runtime name: 'bsh-classgen', version: '2.0b4'
+ runtime name: 'bsh-commands', version: '2.0b4'
+ testCompile name: 'junit', version: '4.2'
+ testCompile project(':src:model').sourceSets.test.output
+}
+
+mainClassName = 'net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor'
+applicationName = 'AtrinikEditor'
+
+task createEditorJar(type: Jar, dependsOn: assemble) {
+ description = 'Creates the AtrinikEditor.jar archive.'
+ baseName = applicationName
+ manifest.attributes 'Main-Class': mainClassName
+ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
+ from sourceSets.main.output
+ doFirst {
+ // The following must be executed in doFirst since the configuration
+ // has not been initialized at configuration time.
+ from(configurations.runtime.resolve().collect {
+ it.isDirectory() ? it : zipTree(it)
+ }) {
+ exclude 'META-INF/**'
+ exclude 'org/apache/log4j/jdbc/**'
+ exclude 'org/apache/log4j/net/SMTPAppender*.class'
+ exclude 'org/apache/log4j/nt/**'
+ exclude 'org/jetbrains/**'
+ }
+ }
+}
+
+task preparePublish {
+ description = 'Prepare files to publish AtrinikEditor.jar.'
+ def outputFile = new File(buildDir, 'libs/update.properties')
+ dependsOn createEditorJar
+ inputs.property 'build.number', { "${rootProject.buildNumber()}" }
+ inputs.property 'update.developer', { "${rootProject.buildDeveloper}" }
+ inputs.property 'update.url', { "${rootProject.updateUrlAtrinik}" }
+ outputs.file outputFile
+ doLast {
+ mkdir outputFile.parentFile
+ ant.echo file: outputFile, message:
+ "update.number=${rootProject.buildNumber()}\n" +
+ "update.tstamp=${rootProject.buildTimestamp()}\n" +
+ "update.developer=${rootProject.buildDeveloper}\n" +
+ "update.url=${rootProject.updateUrlAtrinik}\n"
+ }
+}
Property changes on: trunk/src/atrinik/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Index: trunk/src/crossfire
===================================================================
--- trunk/src/crossfire 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/crossfire 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/crossfire
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/crossfire/build.gradle
===================================================================
--- trunk/src/crossfire/build.gradle (rev 0)
+++ trunk/src/crossfire/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,60 @@
+defaultTasks 'installApp', 'check', 'createEditorJar'
+
+apply plugin: 'application'
+apply plugin: 'java'
+
+evaluationDependsOn ':src:model'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:gridarta')
+ compile project(':src:model')
+ compile project(':src:resources')
+ runtime name: 'bsh-classgen', version: '2.0b4'
+ runtime name: 'bsh-commands', version: '2.0b4'
+ testCompile name: 'junit', version: '4.2'
+ testCompile project(':src:model').sourceSets.test.output
+}
+
+mainClassName = 'net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor'
+applicationName = 'CrossfireEditor'
+
+task createEditorJar(type: Jar, dependsOn: assemble) {
+ description = 'Creates the CrossfireEditor.jar archive.'
+ baseName = applicationName
+ manifest.attributes 'Main-Class': mainClassName
+ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
+ from sourceSets.main.output
+ doFirst {
+ // The following must be executed in doFirst since the configuration
+ // has not been initialized at configuration time.
+ from(configurations.runtime.resolve().collect {
+ it.isDirectory() ? it : zipTree(it)
+ }) {
+ exclude 'META-INF/**'
+ exclude 'org/apache/log4j/jdbc/**'
+ exclude 'org/apache/log4j/net/SMTPAppender*.class'
+ exclude 'org/apache/log4j/nt/**'
+ exclude 'org/jetbrains/**'
+ }
+ }
+}
+
+task preparePublish {
+ description = 'Prepare files to publish CrossfireEditor.jar.'
+ def outputFile = new File(buildDir, 'libs/update.properties')
+ dependsOn createEditorJar
+ inputs.property 'build.number', { "${rootProject.buildNumber()}" }
+ inputs.property 'update.developer', { "${rootProject.buildDeveloper}" }
+ inputs.property 'update.url', { "${rootProject.updateUrlCrossfire}" }
+ outputs.file outputFile
+ doLast {
+ mkdir outputFile.parentFile
+ ant.echo file: outputFile, message:
+ "update.number=${rootProject.buildNumber()}\n" +
+ "update.tstamp=${rootProject.buildTimestamp()}\n" +
+ "update.developer=${rootProject.buildDeveloper}\n" +
+ "update.url=${rootProject.updateUrlCrossfire}\n"
+ }
+}
Property changes on: trunk/src/crossfire/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/crossfire/crossfire.iml
===================================================================
--- trunk/src/crossfire/crossfire.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/crossfire/crossfire.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/daimonin
===================================================================
--- trunk/src/daimonin 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/daimonin 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/daimonin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/daimonin/build.gradle
===================================================================
--- trunk/src/daimonin/build.gradle (rev 0)
+++ trunk/src/daimonin/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,60 @@
+defaultTasks 'installApp', 'check', 'createEditorJar'
+
+apply plugin: 'application'
+apply plugin: 'java'
+
+evaluationDependsOn ':src:model'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:gridarta')
+ compile project(':src:model')
+ compile project(':src:resources')
+ runtime name: 'bsh-classgen', version: '2.0b4'
+ runtime name: 'bsh-commands', version: '2.0b4'
+ testCompile name: 'junit', version: '4.2'
+ testCompile project(':src:model').sourceSets.test.output
+}
+
+mainClassName = 'net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor'
+applicationName = 'DaimoninEditor'
+
+task createEditorJar(type: Jar, dependsOn: assemble) {
+ description = 'Creates the DaimoninEditor.jar archive.'
+ baseName = applicationName
+ manifest.attributes 'Main-Class': mainClassName
+ manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
+ from sourceSets.main.output
+ doFirst {
+ // The following must be executed in doFirst since the configuration
+ // has not been initialized at configuration time.
+ from(configurations.runtime.resolve().collect {
+ it.isDirectory() ? it : zipTree(it)
+ }) {
+ exclude 'META-INF/**'
+ exclude 'org/apache/log4j/jdbc/**'
+ exclude 'org/apache/log4j/net/SMTPAppender*.class'
+ exclude 'org/apache/log4j/nt/**'
+ exclude 'org/jetbrains/**'
+ }
+ }
+}
+
+task preparePublish {
+ description = 'Prepare files to publish DaimoninEditor.jar.'
+ def outputFile = new File(buildDir, 'libs/update.properties')
+ dependsOn createEditorJar
+ inputs.property 'build.number', { "${rootProject.buildNumber()}" }
+ inputs.property 'update.developer', { "${rootProject.buildDeveloper}" }
+ inputs.property 'update.url', { "${rootProject.updateUrlDaimonin}" }
+ outputs.file outputFile
+ doLast {
+ mkdir outputFile.parentFile
+ ant.echo file: outputFile, message:
+ "update.number=${rootProject.buildNumber()}\n" +
+ "update.tstamp=${rootProject.buildTimestamp()}\n" +
+ "update.developer=${rootProject.buildDeveloper}\n" +
+ "update.url=${rootProject.updateUrlDaimonin}\n"
+ }
+}
Property changes on: trunk/src/daimonin/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/daimonin/daimonin.iml
===================================================================
--- trunk/src/daimonin/daimonin.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/daimonin/daimonin.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/gridarta
===================================================================
--- trunk/src/gridarta 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/gridarta 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/gridarta
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/gridarta/build.gradle
===================================================================
--- trunk/src/gridarta/build.gradle (rev 0)
+++ trunk/src/gridarta/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,23 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+evaluationDependsOn ':src:model'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'japi-lib-swing-about', version: '0.1.0'
+ compile name: 'japi-lib-swing-action', version: '0.1.0'
+ compile name: 'japi-lib-swing-prefs', version: '0.1.0'
+ compile name: 'japi-lib-swing-tod', version: '0.1.0'
+ compile name: 'java-getopt', version: '1.0.13'
+ compile name: 'log4j', version: '1.2.13'
+ compile name: 'rsyntaxtextarea', version: '1.5.1'
+ compile project(':src:model')
+ compile project(':src:plugin')
+ compile project(':src:preferences')
+ compile project(':src:textedit')
+ compile project(':src:utils')
+ testCompile name: 'junit', version: '4.2'
+ testCompile project(':src:model').sourceSets.test.output
+}
Property changes on: trunk/src/gridarta/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/gridarta/gridarta.iml
===================================================================
--- trunk/src/gridarta/gridarta.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/gridarta/gridarta.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/src/screenshots" />
</content>
<orderEntry type="inheritedJdk" />
Index: trunk/src/model
===================================================================
--- trunk/src/model 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/model 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/model
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/model/build.gradle
===================================================================
--- trunk/src/model/build.gradle (rev 0)
+++ trunk/src/model/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,15 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+evaluationDependsOn ':src:utils'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'japi-lib-swing-misc', version: 'trunk-1398'
+ compile name: 'jdom', version: '0.0'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:utils')
+ testCompile name: 'junit', version: '4.2'
+ testCompile project(':src:utils').sourceSets.test.output
+}
Property changes on: trunk/src/model/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/model/model.iml
===================================================================
--- trunk/src/model/model.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/model/model.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/plugin
===================================================================
--- trunk/src/plugin 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/plugin 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/plugin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/plugin/build.gradle
===================================================================
--- trunk/src/plugin/build.gradle (rev 0)
+++ trunk/src/plugin/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,12 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'bsh-core', version: '2.0b4'
+ compile name: 'bsh-util', version: '2.0b4'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:model')
+ testCompile name: 'junit', version: '4.2'
+}
Property changes on: trunk/src/plugin/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/plugin/plugin.iml
===================================================================
--- trunk/src/plugin/plugin.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/plugin/plugin.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -7,6 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/preferences
===================================================================
--- trunk/src/preferences 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/preferences 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/preferences
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/preferences/build.gradle
===================================================================
--- trunk/src/preferences/build.gradle (rev 0)
+++ trunk/src/preferences/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,10 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'japi-lib-swing-action', version: '0.1.0'
+ compile name: 'log4j', version: '1.2.13'
+ testCompile name: 'junit', version: '4.2'
+}
Property changes on: trunk/src/preferences/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/preferences/preferences.iml
===================================================================
--- trunk/src/preferences/preferences.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/preferences/preferences.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/resources
===================================================================
--- trunk/src/resources 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/resources 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/resources
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/resources/build.gradle
===================================================================
--- trunk/src/resources/build.gradle (rev 0)
+++ trunk/src/resources/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,19 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+configure(tasks[sourceSets.main.processResourcesTaskName]) {
+ inputs.property 'build.developer', rootProject.buildDeveloper
+ inputs.property 'build.number', { rootProject.buildNumber() }
+ filter { line ->
+ if (line.equals('build.developer=unknown')) {
+ 'build.developer=' + rootProject.buildDeveloper
+ } else if (line.equals('build.number=unknown')) {
+ 'build.number=' + rootProject.buildNumber()
+ } else if (line.equals('build.tstamp=unknown')) {
+ 'build.tstamp=' + rootProject.buildTimestamp()
+ } else {
+ line
+ }
+ }
+}
Property changes on: trunk/src/resources/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/src/resources/src/main/resources/build.properties
===================================================================
--- trunk/src/resources/src/main/resources/build.properties (rev 0)
+++ trunk/src/resources/src/main/resources/build.properties 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,3 @@
+build.developer=unknown
+build.number=unknown
+build.tstamp=unknown
Property changes on: trunk/src/resources/src/main/resources/build.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Index: trunk/src/textedit
===================================================================
--- trunk/src/textedit 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/textedit 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/textedit
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/textedit/build.gradle
===================================================================
--- trunk/src/textedit/build.gradle (rev 0)
+++ trunk/src/textedit/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,10 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'log4j', version: '1.2.13'
+ compile project(':src:utils')
+ testCompile name: 'junit', version: '4.2'
+}
Property changes on: trunk/src/textedit/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/textedit/textedit.iml
===================================================================
--- trunk/src/textedit/textedit.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/textedit/textedit.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/src/utils
===================================================================
--- trunk/src/utils 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/utils 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/src/utils
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/src/utils/build.gradle
===================================================================
--- trunk/src/utils/build.gradle (rev 0)
+++ trunk/src/utils/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,12 @@
+defaultTasks 'jar', 'check'
+
+apply plugin: 'java'
+
+dependencies {
+ compile name: 'annotations', version: '0.0'
+ compile name: 'japi-lib-swing-action', version: '0.1.0'
+ compile name: 'japi-lib-util', version: 'trunk-1410'
+ compile name: 'japi-lib-xml', version: '0.1.0'
+ compile name: 'log4j', version: '1.2.13'
+ testCompile name: 'junit', version: '4.2'
+}
Property changes on: trunk/src/utils/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/utils/utils.iml
===================================================================
--- trunk/src/utils/utils.iml 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/src/utils/utils.iml 2013-07-14 08:07:35 UTC (rev 9330)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Index: trunk/test-mapvalidator
===================================================================
--- trunk/test-mapvalidator 2013-07-13 13:40:38 UTC (rev 9329)
+++ trunk/test-mapvalidator 2013-07-14 08:07:35 UTC (rev 9330)
Property changes on: trunk/test-mapvalidator
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Added: trunk/test-mapvalidator/build.gradle
===================================================================
--- trunk/test-mapvalidator/build.gradle (rev 0)
+++ trunk/test-mapvalidator/build.gradle 2013-07-14 08:07:35 UTC (rev 9330)
@@ -0,0 +1,64 @@
+import org.gradle.process.internal.ExecException
+
+defaultTasks 'check'
+
+task check {
+ description = 'Runs all map-validator tests.'
+}
+
+public static String loadFile(File file) {
+ ByteArrayOutputStream data = new ByteArrayOutputStream()
+ new FileInputStream(file).withStream { FileInputStream is ->
+ byte[] tmp = new byte[1024]
+ while (true) {
+ int len = is.read(tmp)
+ if (len <= 0) {
+ break
+ }
+ data.write(tmp, 0, len)
+ }
+ }
+ return new String(data.toByteArray())
+}
+
+tasks.addRule("Pattern: check_<type>") { String taskName ->
+ if (taskName.startsWith("check_")) {
+ String type = taskName - 'check_'
+ File outputFile = new File(buildDir, type + '.txt')
+ File inputDir = file(type)
+ Project typeProject = project(':src:' + type)
+ evaluationDependsOn typeProject.path
+ task(taskName) {
+ inputs.files inputDir
+ outputs.files outputFile
+ dependsOn typeProject.tasks.getByName('classes')
+ doLast {
+ mkdir outputFile.parentFile
+ String applicationName = typeProject.applicationName
+ try {
+ javaexec {
+ classpath typeProject.sourceSets.main.runtimeClasspath
+ main = typeProject.mainClassName
+ args '--config='+new File(inputDir, 'regtest.conf')
+ args '--plugin=MapValidator'
+ workingDir rootDir
+ standardOutput = new FileOutputStream(outputFile)
+ }
+ } catch (ExecException ex) {
+ println loadFile(outputFile)
+ throw ex;
+ }
+ }
+ }
+ }
+}
+
+check.dependsOn check_atrinik
+check.dependsOn check_crossfire
+check.dependsOn check_daimonin
+
+task clean {
+ doLast {
+ delete buildDir
+ }
+}
Property changes on: trunk/test-mapvalidator/build.gradle
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-10-05 07:07:55
|
Revision: 9376
http://sourceforge.net/p/gridarta/code/9376
Author: akirschbaum
Date: 2013-10-05 07:07:52 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Fix error message when running the editor from within the IDE.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/atrinik/atrinik.iml
trunk/src/crossfire/crossfire.iml
trunk/src/daimonin/daimonin.iml
Added Paths:
-----------
trunk/src/resources/resources.iml
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-10-05 06:53:04 UTC (rev 9375)
+++ trunk/gridarta.ipr 2013-10-05 07:07:52 UTC (rev 9376)
@@ -2175,6 +2175,7 @@
<module fileurl="file://$PROJECT_DIR$/src/model/model.iml" filepath="$PROJECT_DIR$/src/model/model.iml" />
<module fileurl="file://$PROJECT_DIR$/src/plugin/plugin.iml" filepath="$PROJECT_DIR$/src/plugin/plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/src/preferences/preferences.iml" filepath="$PROJECT_DIR$/src/preferences/preferences.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/resources/resources.iml" filepath="$PROJECT_DIR$/src/resources/resources.iml" />
<module fileurl="file://$PROJECT_DIR$/src/textedit/textedit.iml" filepath="$PROJECT_DIR$/src/textedit/textedit.iml" />
<module fileurl="file://$PROJECT_DIR$/src/utils/utils.iml" filepath="$PROJECT_DIR$/src/utils/utils.iml" />
</modules>
Modified: trunk/src/atrinik/atrinik.iml
===================================================================
--- trunk/src/atrinik/atrinik.iml 2013-10-05 06:53:04 UTC (rev 9375)
+++ trunk/src/atrinik/atrinik.iml 2013-10-05 07:07:52 UTC (rev 9376)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="bsh-commands" level="project" />
Modified: trunk/src/crossfire/crossfire.iml
===================================================================
--- trunk/src/crossfire/crossfire.iml 2013-10-05 06:53:04 UTC (rev 9375)
+++ trunk/src/crossfire/crossfire.iml 2013-10-05 07:07:52 UTC (rev 9376)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="bsh-commands" level="project" />
Modified: trunk/src/daimonin/daimonin.iml
===================================================================
--- trunk/src/daimonin/daimonin.iml 2013-10-05 06:53:04 UTC (rev 9375)
+++ trunk/src/daimonin/daimonin.iml 2013-10-05 07:07:52 UTC (rev 9376)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="bsh-commands" level="project" />
Added: trunk/src/resources/resources.iml
===================================================================
--- trunk/src/resources/resources.iml (rev 0)
+++ trunk/src/resources/resources.iml 2013-10-05 07:07:52 UTC (rev 9376)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Property changes on: trunk/src/resources/resources.iml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2013-10-05 13:35:04
|
Revision: 9378
http://sourceforge.net/p/gridarta/code/9378
Author: akirschbaum
Date: 2013-10-05 13:34:55 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Split GlobalSettings into {Editor,Project,Volatile}Settings.
Modified Paths:
--------------
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/resource/DefaultResources.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/mapcontrol/DefaultMapControlFactory.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/settings/CollectedConfigSource.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/settings/FilesConfigSource.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/resource/DefaultResources.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/mapcontrol/DefaultMapControlFactory.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/settings/CollectedConfigSource.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/settings/FilesConfigSource.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/resource/DefaultResources.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectArchesAction.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectSpellsAction.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/action/OptionsAction.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/commands/CollectArchesCommand.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/AttributesPaneBuilder.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/prefs/ResPreferences.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/misc/DefaultFileControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/misc/MainToolbar.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/ImageCreatorFactory.java
trunk/src/gridarta/src/test/java/net/sf/gridarta/actions/ExitConnectorActionsTest.java
trunk/src/model/src/main/java/net/sf/gridarta/model/configsource/AbstractConfigSource.java
trunk/src/model/src/main/java/net/sf/gridarta/model/configsource/ConfigSource.java
trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java
trunk/src/model/src/main/java/net/sf/gridarta/model/io/PathManager.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapmanager/AbstractMapManager.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapmanager/DefaultMapManager.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapmanager/DefaultPickmapManager.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mappathnormalizer/MapPathNormalizer.java
trunk/src/model/src/main/java/net/sf/gridarta/model/resource/AbstractResources.java
trunk/src/model/src/main/java/net/sf/gridarta/model/treasurelist/TreasureLoader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/ExitChecker.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/TilePathsChecker.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/ValidatorFactory.java
trunk/src/model/src/test/java/net/sf/gridarta/model/index/MapsIndexerTest.java
trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java
trunk/src/model/src/test/java/net/sf/gridarta/model/mapcontrol/TestMapControlFactory.java
trunk/src/model/src/test/java/net/sf/gridarta/model/validation/ValidationUtils.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
trunk/test-mapvalidator/atrinik/maps/dev/editor/scripts/MapValidator
trunk/test-mapvalidator/crossfire/maps/editor/scripts/MapValidator
trunk/test-mapvalidator/daimonin/maps/dev/editor/scripts/MapValidator
Added Paths:
-----------
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/AtrinikDefaultProjectSettings.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/settings/CrossfireDefaultProjectSettings.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/settings/DaimoninDefaultProjectSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/AbstractDefaultProjectSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/AbstractEditorSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/AbstractProjectSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/DefaultEditorSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/DefaultVolatileSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/EditorSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/EditorSettingsListener.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/ProjectSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/ProjectSettingsListener.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/VolatileSettings.java
trunk/src/model/src/test/java/net/sf/gridarta/model/settings/TestProjectSettings.java
Removed Paths:
-------------
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/DefaultGlobalSettings.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/model/settings/DefaultGlobalSettings.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/model/settings/DefaultGlobalSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/AbstractGlobalSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/GlobalSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/GlobalSettingsListener.java
trunk/src/model/src/test/java/net/sf/gridarta/model/settings/TestGlobalSettings.java
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -26,7 +26,7 @@
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
@@ -46,10 +46,10 @@
private final MapManager<GameObject, MapArchObject, Archetype> mapManager;
/**
- * The {@link GlobalSettings} to use.
+ * The {@link ProjectSettings} to use.
*/
@NotNull
- private final GlobalSettings globalSettings;
+ private final ProjectSettings projectSettings;
/**
* The {@link MapPathNormalizer} for converting map paths to {@link
@@ -61,13 +61,13 @@
/**
* Creates a new instance.
* @param mapManager the map manager to use
- * @param globalSettings the global settings instance
+ * @param projectSettings the project settings instance
* @param mapPathNormalizer the map path normalize for converting map paths
* to files
*/
- public DefaultMapPropertiesDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapPathNormalizer mapPathNormalizer) {
+ public DefaultMapPropertiesDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ProjectSettings projectSettings, @NotNull final MapPathNormalizer mapPathNormalizer) {
this.mapManager = mapManager;
- this.globalSettings = globalSettings;
+ this.projectSettings = projectSettings;
this.mapPathNormalizer = mapPathNormalizer;
}
@@ -76,7 +76,7 @@
*/
@Override
public void showDialog(@NotNull final Component parent, @NotNull final Frame helpParent, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter) {
- final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer);
+ final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, projectSettings, mapModel, mapFileFilter, mapPathNormalizer);
pane.showDialog(parent);
}
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -54,7 +54,7 @@
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
@@ -314,13 +314,13 @@
* Creates a new instance.
* @param helpParent the parent frame for help windows
* @param mapManager the map manager to use
- * @param globalSettings the global settings instance
+ * @param projectSettings the project settings instance
* @param mapModel the map model whose properties are shown/edited.
* @param mapFileFilter the Swing file filter to use
* @param mapPathNormalizer the map path normalizer for converting map paths
* to files
*/
- public MapPropertiesDialog(@NotNull final Frame helpParent, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter, @NotNull final MapPathNormalizer mapPathNormalizer) {
+ public MapPropertiesDialog(@NotNull final Frame helpParent, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ProjectSettings projectSettings, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter, @NotNull final MapPathNormalizer mapPathNormalizer) {
okButton.setDefaultCapable(true);
final JButton helpButton = new JButton(ACTION_BUILDER.createAction(false, "mapHelp", this));
final JButton restoreButton = new JButton(ACTION_BUILDER.createAction(false, "mapRestore", this));
@@ -336,7 +336,7 @@
final Component mainPanel = createMainPanel(map);
tabs.add(ActionBuilderUtils.getString(ACTION_BUILDER, "mapMapTabTitle"), mainPanel);
- mapTilePane = new IsoMapTilePane<GameObject, MapArchObject, Archetype>(mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer);
+ mapTilePane = new IsoMapTilePane<GameObject, MapArchObject, Archetype>(mapManager, projectSettings, mapModel, mapFileFilter, mapPathNormalizer);
final Component tilePanel = createTilePathPanel(mapTilePane);
tabs.add(ActionBuilderUtils.getString(ACTION_BUILDER, "mapTilesTabTitle"), tilePanel);
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -88,7 +88,8 @@
import net.sf.gridarta.model.scripts.ScriptArchData;
import net.sf.gridarta.model.scripts.ScriptArchUtils;
import net.sf.gridarta.model.scripts.ScriptedEventFactory;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.EditorSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.model.spells.GameObjectSpell;
import net.sf.gridarta.model.spells.NumberSpell;
import net.sf.gridarta.model.spells.Spells;
@@ -121,7 +122,7 @@
import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
import net.sf.gridarta.var.atrinik.model.mapcontrol.DefaultMapControlFactory;
import net.sf.gridarta.var.atrinik.model.scripts.DefaultScriptedEventFactory;
-import net.sf.gridarta.var.atrinik.model.settings.DefaultGlobalSettings;
+import net.sf.gridarta.var.atrinik.model.settings.AtrinikDefaultProjectSettings;
import net.sf.gridarta.var.atrinik.resource.DefaultResources;
import net.sf.japi.swing.prefs.PreferencesGroup;
import org.apache.log4j.Category;
@@ -181,8 +182,8 @@
*/
@NotNull
@Override
- public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
- return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, pluginModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
+ public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
+ return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, projectSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, pluginModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
}
/**
@@ -198,8 +199,8 @@
*/
@NotNull
@Override
- public MapArchObjectFactory<MapArchObject> newMapArchObjectFactory(@NotNull final GlobalSettings globalSettings) {
- return new DefaultMapArchObjectFactory(globalSettings);
+ public MapArchObjectFactory<MapArchObject> newMapArchObjectFactory(@NotNull final ProjectSettings projectSettings) {
+ return new DefaultMapArchObjectFactory(projectSettings);
}
/**
@@ -234,8 +235,8 @@
*/
@NotNull
@Override
- public GlobalSettings newGlobalSettings() {
- return new DefaultGlobalSettings();
+ public ProjectSettings newProjectSettings(@NotNull final EditorSettings editorSettings) {
+ return new AtrinikDefaultProjectSettings(editorSettings);
}
/**
@@ -252,7 +253,7 @@
*/
@NotNull
@Override
- public ArchetypeSet<GameObject, MapArchObject, Archetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
+ public ArchetypeSet<GameObject, MapArchObject, Archetype> newArchetypeSet(@NotNull final ProjectSettings projectSettings, @NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
return new DefaultArchetypeSet<GameObject, MapArchObject, Archetype>(archetypeFactory, null);
}
@@ -261,8 +262,8 @@
*/
@NotNull
@Override
- public MapControlFactory<GameObject, MapArchObject, Archetype> newMapControlFactory(@NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter, @NotNull final GlobalSettings globalSettings, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory) {
- return new DefaultMapControlFactory(mapWriter, globalSettings, mapModelFactory);
+ public MapControlFactory<GameObject, MapArchObject, Archetype> newMapControlFactory(@NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter, @NotNull final ProjectSettings projectSettings, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory) {
+ return new DefaultMapControlFactory(mapWriter, projectSettings, mapModelFactory);
}
/**
@@ -284,7 +285,7 @@
* {@inheritDoc}
*/
@Override
- public void initMapValidators(@NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> mapValidators, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final GlobalSettings globalSettings, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final ValidatorPreferences validatorPreferences) {
+ public void initMapValidators(@NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> mapValidators, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final ProjectSettings projectSettings, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final ValidatorPreferences validatorPreferences) {
final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcherWarn(errorViewCollector, "system_monster_only", "system_monster", "monster");
if (monsterMatcher != null) {
addAttributeRangeChecker(attributeRangeChecker, monsterMatcher, "level", "level", 0, 125);
@@ -366,9 +367,9 @@
* {@inheritDoc}
*/
@Override
- public ArchetypeParser newArchetypeParser(@NotNull final ErrorView errorView, final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final AnimationObjects animationObjects, final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final GlobalSettings globalSettings) {
+ public ArchetypeParser newArchetypeParser(@NotNull final ErrorView errorView, final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, final AnimationObjects animationObjects, final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ProjectSettings projectSettings) {
try {
- final URL url = IOUtils.getResource(globalSettings.getConfigurationDirectory(), IGUIConstants.ARCHDEF_FILE);
+ final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), IGUIConstants.ARCHDEF_FILE);
multiPositionData.load(errorView, url);
} catch (final IOException ex) {
errorView.addWarning(ErrorViewCategory.ARCHDEF_FILE_INVALID, IGUIConstants.ARCHDEF_FILE + ": " + ex.getMessage());
@@ -444,8 +445,8 @@
*/
@NotNull
@Override
- public MapPropertiesDialogFactory<GameObject, MapArchObject, Archetype> newMapPropertiesDialogFactory(@NotNull final GlobalSettings globalSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapPathNormalizer mapPathNormalizer) {
- return new DefaultMapPropertiesDialogFactory(mapManager, globalSettings, mapPathNormalizer);
+ public MapPropertiesDialogFactory<GameObject, MapArchObject, Archetype> newMapPropertiesDialogFactory(@NotNull final ProjectSettings projectSettings, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapPathNormalizer mapPathNormalizer) {
+ return new DefaultMapPropertiesDialogFactory(mapManager, projectSettings, mapPathNormalizer);
}
/**
@@ -462,8 +463,8 @@
*/
@NotNull
@Override
- public PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final AppPreferencesModel appPreferencesModel, @NotNull final ExitConnectorModel exitConnectorModel, @NotNull final ConfigSourceFactory configSourceFactory) {
- return new PreferencesGroup("Gridarta for Atrinik", new ResPreferences(globalSettings, configSourceFactory), new AppPreferences(appPreferencesModel), new NetPreferences(), new GUIPreferences(globalSettings), new MiscPreferences(exitConnectorModel, globalSettings), new DevPreferences(), new UpdatePreferences(), new MapValidatorPreferences(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
+ public PreferencesGroup createPreferencesGroup(@NotNull final ProjectSettings projectSettings, @NotNull final EditorSettings editorSettings, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final AppPreferencesModel appPreferencesModel, @NotNull final ExitConnectorModel exitConnectorModel, @NotNull final ConfigSourceFactory configSourceFactory) {
+ return new PreferencesGroup("Gridarta for Atrinik", new ResPreferences(projectSettings, editorSettings, configSourceFactory), new AppPreferences(appPreferencesModel), new NetPreferences(), new GUIPreferences(editorSettings), new MiscPreferences(exitConnectorModel, projectSettings, editorSettings), new DevPreferences(), new UpdatePreferences(), new MapValidatorPreferences(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
}
/**
@@ -471,8 +472,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final PluginExecutor<GameObject, MapArchObject, Archetype> pluginExecutor, @NotNull final PluginParameters pluginParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapModelFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, pluginExecutor, pluginParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, pluginModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new Direction[] { Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final PluginExecutor<GameObject, MapArchObject, Archetype> pluginExecutor, @NotNull final PluginParameters pluginParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final ProjectSettings projectSettings, @NotNull final EditorSettings editorSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapModelFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, pluginExecutor, pluginParameters, faceObjects, projectSettings, editorSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, pluginModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new Direction[] { Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
}
/**
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -20,7 +20,7 @@
package net.sf.gridarta.var.atrinik.model.maparchobject;
import net.sf.gridarta.model.maparchobject.MapArchObjectFactory;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import org.jetbrains.annotations.NotNull;
/**
@@ -30,17 +30,17 @@
public class DefaultMapArchObjectFactory implements MapArchObjectFactory<MapArchObject> {
/**
- * The {@link GlobalSettings} to use.
+ * The {@link ProjectSettings} to use.
*/
@NotNull
- private final GlobalSettings globalSettings;
+ private final ProjectSettings projectSettings;
/**
* Creates a new instance.
- * @param globalSettings the global settings to use
+ * @param projectSettings the project settings to use
*/
- public DefaultMapArchObjectFactory(@NotNull final GlobalSettings globalSettings) {
- this.globalSettings = globalSettings;
+ public DefaultMapArchObjectFactory(@NotNull final ProjectSettings projectSettings) {
+ this.projectSettings = projectSettings;
}
/**
@@ -51,7 +51,7 @@
public MapArchObject newMapArchObject(final boolean addDefaultAttributes) {
final MapArchObject mapArchObject = new MapArchObject();
if (addDefaultAttributes) {
- mapArchObject.addText("Created: " + String.format("%tF", System.currentTimeMillis()) + " " + globalSettings.getUserName());
+ mapArchObject.addText("Created: " + String.format("%tF", System.currentTimeMillis()) + " " + projectSettings.getUserName());
mapArchObject.setDarkness(-1);
}
return mapArchObject;
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -27,7 +27,7 @@
import net.sf.gridarta.model.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mapmodel.MapModelFactory;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
@@ -47,10 +47,10 @@
private final MapWriter<GameObject, MapArchObject, Archetype> mapWriter;
/**
- * The {@link GlobalSettings} to use.
+ * The {@link ProjectSettings} to use.
*/
@NotNull
- private final GlobalSettings globalSettings;
+ private final ProjectSettings projectSettings;
/**
* The {@link MapModelFactory} for creating {@link MapModel} instances.
@@ -61,13 +61,13 @@
/**
* Creates a new instance.
* @param mapWriter the map writer for saving map control instances
- * @param globalSettings the global settings to use
+ * @param projectSettings the project settings to use
* @param mapModelFactory the map model factory for creating map model
* instances
*/
- public DefaultMapControlFactory(@NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter, @NotNull final GlobalSettings globalSettings, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory) {
+ public DefaultMapControlFactory(@NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter, @NotNull final ProjectSettings projectSettings, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory) {
this.mapWriter = mapWriter;
- this.globalSettings = globalSettings;
+ this.projectSettings = projectSettings;
this.mapModelFactory = mapModelFactory;
}
@@ -87,7 +87,7 @@
}
mapModel.resetModified();
}
- final MapControl<GameObject, MapArchObject, Archetype> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype>(mapModel, false, mapWriter, globalSettings);
+ final MapControl<GameObject, MapArchObject, Archetype> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype>(mapModel, false, mapWriter, projectSettings);
mapControl.getMapModel().setMapFile(file);
return mapControl;
}
@@ -109,7 +109,7 @@
}
mapModel.resetModified();
}
- final MapControl<GameObject, MapArchObject, Archetype> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype>(mapModel, true, mapWriter, globalSettings);
+ final MapControl<GameObject, MapArchObject, Archetype> mapControl = new DefaultMapControl<GameObject, MapArchObject, Archetype>(mapModel, true, mapWriter, projectSettings);
mapControl.getMapModel().setMapFile(file);
mapControl.getMapModel().resetModified();
return mapControl;
Copied: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/AtrinikDefaultProjectSettings.java (from rev 9370, trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/DefaultGlobalSettings.java)
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/AtrinikDefaultProjectSettings.java (rev 0)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/AtrinikDefaultProjectSettings.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -0,0 +1,69 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.var.atrinik.model.settings;
+
+import java.io.File;
+import net.sf.gridarta.model.settings.AbstractDefaultProjectSettings;
+import net.sf.gridarta.model.settings.EditorSettings;
+import net.sf.gridarta.var.atrinik.IGUIConstants;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Maintains path names to resources.
+ * @author Andreas Kirschbaum
+ */
+public class AtrinikDefaultProjectSettings extends AbstractDefaultProjectSettings {
+
+ /**
+ * Creates a new instance.
+ * @param editorSettings the editor settings for retrieving default values
+ */
+ public AtrinikDefaultProjectSettings(@NotNull final EditorSettings editorSettings) {
+ super(editorSettings);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public File getPickmapDir() {
+ return new File(getArchDirectory(), IGUIConstants.PICKMAP_DIR);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public File getConfigurationDirectory() {
+ return new File(getArchDirectory(), "dev/editor/conf");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public File getCollectedDirectory() {
+ return getArchDirectory();
+ }
+
+}
Property changes on: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/AtrinikDefaultProjectSettings.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -25,7 +25,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.resource.AbstractResources;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import org.jetbrains.annotations.NotNull;
/**
@@ -47,8 +47,8 @@
* {@inheritDoc}
*/
@Override
- public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void read(@NotNull final GlobalSettings globalSettings, @NotNull final AbstractResources<G, A, R> resources, @NotNull final ErrorView errorView) {
- resources.readCollected(globalSettings, errorView);
+ public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void read(@NotNull final ProjectSettings projectSettings, @NotNull final AbstractResources<G, A, R> resources, @NotNull final ErrorView errorView) {
+ resources.readCollected(projectSettings, errorView);
}
/**
Deleted: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/DefaultGlobalSettings.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/DefaultGlobalSettings.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/DefaultGlobalSettings.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -1,59 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2010 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.var.atrinik.model.settings;
-
-import java.io.File;
-import net.sf.gridarta.var.atrinik.IGUIConstants;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Maintains path names to resources.
- * @author Andreas Kirschbaum
- */
-public class DefaultGlobalSettings extends net.sf.gridarta.model.settings.DefaultGlobalSettings {
-
- /**
- * {@inheritDoc}
- */
- @NotNull
- @Override
- public File getPickmapDir() {
- return new File(getArchDirectory(), IGUIConstants.PICKMAP_DIR);
- }
-
- /**
- * {@inheritDoc}
- */
- @NotNull
- @Override
- public File getConfigurationDirectory() {
- return new File(getArchDirectory(), "dev/editor/conf");
- }
-
- /**
- * {@inheritDoc}
- */
- @NotNull
- @Override
- public File getCollectedDirectory() {
- return getArchDirectory();
- }
-
-}
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -25,7 +25,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.resource.AbstractResources;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import org.jetbrains.annotations.NotNull;
/**
@@ -48,8 +48,8 @@
* {@inheritDoc}
*/
@Override
- public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void read(@NotNull final GlobalSettings globalSettings, @NotNull final AbstractResources<G, A, R> resources, @NotNull final ErrorView errorView) {
- resources.readFiles(globalSettings, errorView);
+ public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void read(@NotNull final ProjectSettings projectSettings, @NotNull final AbstractResources<G, A, R> resources, @NotNull final ErrorView errorView) {
+ resources.readFiles(projectSettings, errorView);
}
/**
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/resource/DefaultResources.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/resource/DefaultResources.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/resource/DefaultResources.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -37,7 +37,7 @@
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.resource.CollectedResourcesWriter;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.var.atrinik.IGUIConstants;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.collectable.AtrinikArchetypeSetCollectable;
@@ -121,9 +121,9 @@
* {@inheritDoc}
*/
@Override
- protected void readFilesInt(@NotNull final GlobalSettings globalSettings, @NotNull final ErrorView errorView, @NotNull final List<GameObject> invObjects) {
- faceObjectProviders.setNormal(new FilesResourcesReader(globalSettings.getArchDirectory(), globalSettings.getCollectedDirectory(), archetypeSet, archetypeParser, faceObjects, animationObjects, archFaceProvider).read(errorView, invObjects));
- loadArtifacts(errorView, invObjects, globalSettings.getCollectedDirectory());
+ protected void readFilesInt(@NotNull final ProjectSettings projectSettings, @NotNull final ErrorView errorView, @NotNull final List<GameObject> invObjects) {
+ faceObjectProviders.setNormal(new FilesResourcesReader(projectSettings.getArchDirectory(), projectSettings.getCollectedDirectory(), archetypeSet, archetypeParser, faceObjects, animationObjects, archFaceProvider).read(errorView, invObjects));
+ loadArtifacts(errorView, invObjects, projectSettings.getCollectedDirectory());
}
/**
@@ -131,10 +131,10 @@
*/
@NotNull
@Override
- protected List<GameObject> readCollectedInt(@NotNull final GlobalSettings globalSettings, @NotNull final ErrorView errorView) {
+ protected List<GameObject> readCollectedInt(@NotNull final ProjectSettings projectSettings, @NotNull final ErrorView errorView) {
final List<GameObject> invObjects = new ArrayList<GameObject>();
- faceObjectProviders.setNormal(new CollectedResourcesReader(globalSettings.getCollectedDirectory(), archetypeSet, archetypeParser, faceObjects, animationObjects).read(errorView, invObjects));
- loadArtifacts(errorView, invObjects, globalSettings.getCollectedDirectory());
+ faceObjectProviders.setNormal(new CollectedResourcesReader(projectSettings.getCollectedDirectory(), archetypeSet, archetypeParser, faceObjects, animationObjects).read(errorView, invObjects));
+ loadArtifacts(errorView, invObjects, projectSettings.getCollectedDirectory());
return invObjects;
}
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -26,7 +26,7 @@
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
import net.sf.gridarta.var.crossfire.model.maparchobject.MapArchObject;
@@ -46,10 +46,10 @@
private final MapManager<GameObject, MapArchObject, Archetype> mapManager;
/**
- * The {@link GlobalSettings} to use.
+ * The {@link ProjectSettings} to use.
*/
@NotNull
- private final GlobalSettings globalSettings;
+ private final ProjectSettings projectSettings;
/**
* The {@link MapPathNormalizer} for converting map paths to {@link
@@ -61,13 +61,13 @@
/**
* Creates a new instance.
* @param mapManager the map manager to use
- * @param globalSettings the global settings instance
+ * @param projectSettings the project settings instance
* @param mapPathNormalizer the map path normalizer for converting map paths
* to files
*/
- public DefaultMapPropertiesDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapPathNormalizer mapPathNormalizer) {
+ public DefaultMapPropertiesDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ProjectSettings projectSettings, @NotNull final MapPathNormalizer mapPathNormalizer) {
this.mapManager = mapManager;
- this.globalSettings = globalSettings;
+ this.projectSettings = projectSettings;
this.mapPathNormalizer = mapPathNormalizer;
}
@@ -76,7 +76,7 @@
*/
@Override
public void showDialog(@NotNull final Component parent, @NotNull final Frame helpParent, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter) {
- final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer);
+ final MapPropertiesDialog pane = new MapPropertiesDialog(helpParent, mapManager, projectSettings, mapModel, mapFileFilter, mapPathNormalizer);
pane.showDialog(parent);
}
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -46,7 +46,7 @@
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
@@ -357,13 +357,13 @@
* Creates a map-options dialog.
* @param helpParent the parent frame for help windows
* @param mapManager the map manager to use
- * @param globalSettings the global settings instance
+ * @param projectSettings the project settings instance
* @param mapModel the map model whose properties are shown/edited
* @param mapFileFilter the Swing file filter to use
* @param mapPathNormalizer the map path normalizer for converting map paths
* to files
*/
- public MapPropertiesDialog(@NotNull final Frame helpParent, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter, @NotNull final MapPathNormalizer mapPathNormalizer) {
+ public MapPropertiesDialog(@NotNull final Frame helpParent, @NotNull final MapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ProjectSettings projectSettings, @NotNull final MapModel<GameObject, MapArchObject, Archetype> mapModel, @NotNull final FileFilter mapFileFilter, @NotNull final MapPathNormalizer mapPathNormalizer) {
okButton.setDefaultCapable(true);
final JButton helpButton = new JButton(ACTION_BUILDER.createAction(false, "mapHelp", this));
final JButton restoreButton = new JButton(ACTION_BUILDER.createAction(false, "mapRestore", this));
@@ -409,7 +409,7 @@
final Component weatherPanel = createWeatherPanel(map);
tabs.add(ActionBuilderUtils.getString(ACTION_BUILDER, "mapWeatherTabTitle"), weatherPanel);
- mapTilePane = new FlatMapTilePane<GameObject, MapArchObject, Archetype>(mapManager, globalSettings, mapModel, mapFileFilter, mapPathNormalizer);
+ mapTilePane = new FlatMapTilePane<GameObject, MapArchObject, Archetype>(mapManager, projectSettings, mapModel, mapFileFilter, mapPathNormalizer);
final Component tilePanel = createTilePathPanel(mapTilePane);
tabs.add(ActionBuilderUtils.getString(ACTION_BUILDER, "mapTilesTabTitle"), tilePanel);
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2013-10-05 07:38:31 UTC (rev 9377)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2013-10-05 13:34:55 UTC (rev 9378)
@@ -83,7 +83,8 @@
import net.sf.gridarta.model.scripts.ScriptArchData;
import net.sf.gridarta.model.scripts.ScriptArchUtils;
import net.sf.gridarta.model.scripts.ScriptedEventFactory;
-import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.EditorSettings;
+import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.model.smoothface.SmoothFaces;
import net.sf.gridarta.model.spells.GameObjectSpell;
import net.sf.gridarta.model.spells.NumberSpell;
@@ -116,7 +117,7 @@
import net.sf.gridarta.var.crossfire.model.maparchobject.MapArchObject;
import net.sf.gridarta.var.crossfire.model.mapcontrol.DefaultMapControlFactory;
import net.sf.gridarta.var.crossfire.model.scripts.DefaultScriptedEventFactory;
-import net.sf.gridarta.var.crossfire.model.settings.DefaultGlobalSettings;
+import net.sf.gridarta.var.crossfire.model.settings.CrossfireDefaultProjectSettings;
import net.sf.gridarta.var.crossfire.resource.DefaultResources;
import net.sf.japi.swing.prefs.PreferencesGroup;
import org.apache.log4j.Category;
@@ -151,8 +152,8 @@
*/
...
[truncated message content] |
|
From: <aki...@us...> - 2013-10-14 21:09:03
|
Revision: 9432
http://sourceforge.net/p/gridarta/code/9432
Author: akirschbaum
Date: 2013-10-14 21:08:54 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
Extract ProjectModel from GridartaEditor.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
trunk/settings.gradle
trunk/src/atrinik/atrinik.iml
trunk/src/atrinik/build.gradle
trunk/src/crossfire/build.gradle
trunk/src/crossfire/crossfire.iml
trunk/src/daimonin/build.gradle
trunk/src/daimonin/daimonin.iml
trunk/src/gridarta/build.gradle
trunk/src/gridarta/gridarta.iml
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/ImageCreatorFactory.java
Added Paths:
-----------
trunk/src/project/
trunk/src/project/build.gradle
trunk/src/project/project.iml
trunk/src/project/src/
trunk/src/project/src/main/
trunk/src/project/src/main/java/
trunk/src/project/src/main/java/net/
trunk/src/project/src/main/java/net/sf/
trunk/src/project/src/main/java/net/sf/gridarta/
trunk/src/project/src/main/java/net/sf/gridarta/project/
trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectFactory.java
trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
trunk/src/project/src/main/resources/
trunk/src/project/src/test/
trunk/src/project/src/test/java/
trunk/src/project/src/test/resources/
trunk/src/project/src/test/resources/log4j.properties
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/build.xml 2013-10-14 21:08:54 UTC (rev 9432)
@@ -114,6 +114,14 @@
<pathelement location="${build.dir}/plugin/test"/>
</path>
+ <path id="path.class.project.app">
+ <pathelement location="${build.dir}/project/app"/>
+ </path>
+ <path id="path.class.project.test">
+ <path refid="path.class.project.app"/>
+ <pathelement location="${build.dir}/project/test"/>
+ </path>
+
<path id="path.class.textedit.app">
<pathelement location="${build.dir}/textedit/app"/>
</path>
@@ -193,6 +201,7 @@
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
<fileset dir="${build.dir}/plugin/app"/>
+ <fileset dir="${build.dir}/project/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -231,6 +240,7 @@
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
<fileset dir="${build.dir}/plugin/app"/>
+ <fileset dir="${build.dir}/project/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -269,6 +279,7 @@
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
<fileset dir="${build.dir}/plugin/app"/>
+ <fileset dir="${build.dir}/project/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -315,13 +326,14 @@
</echoproperties>
</target>
- <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
+ <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-project,compile-utils">
<mkdir dir="${build.dir}/atrinik/app"/>
<javac srcdir="src/atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
<path refid="path.class.plugin.app"/>
+ <path refid="path.class.project.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -352,13 +364,14 @@
</copy>
</target>
- <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
+ <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-project,compile-utils">
<mkdir dir="${build.dir}/crossfire/app"/>
<javac srcdir="src/crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
<path refid="path.class.plugin.app"/>
+ <path refid="path.class.project.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -389,13 +402,14 @@
</copy>
</target>
- <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-utils">
+ <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-project,compile-utils">
<mkdir dir="${build.dir}/daimonin/app"/>
<javac srcdir="src/daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
<path refid="path.class.plugin.app"/>
+ <path refid="path.class.project.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -424,13 +438,14 @@
</copy>
</target>
- <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-textedit,compile-utils">
+ <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-project,compile-textedit,compile-utils">
<mkdir dir="${build.dir}/gridarta/app"/>
<javac srcdir="src/gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.preferences.app"/>
<path refid="path.class.plugin.app"/>
+ <path refid="path.class.project.app"/>
<path refid="path.class.textedit.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -562,6 +577,33 @@
</copy>
</target>
+ <target name="compile-project" description="Compiles the project module." depends="compile-model,compile-utils">
+ <mkdir dir="${build.dir}/project/app"/>
+ <javac srcdir="src/project/src/main/java" destdir="${build.dir}/project/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <classpath>
+ <path refid="path.class.model.app"/>
+ <path refid="path.class.utils.app"/>
+ <path refid="path.lib.annotations"/>
+ <path refid="path.lib.japi-swing-action"/>
+ <path refid="path.lib.log4j"/>
+ </classpath>
+ <compilerarg line="${javac.args}"/>
+ </javac>
+ <copy todir="${build.dir}/project/app">
+ <fileset dir="src/project/src/main/resources"/>
+ </copy>
+ <mkdir dir="${build.dir}/project/test"/>
+ <javac srcdir="src/project/src/test/java" destdir="${build.dir}/project/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <classpath>
+ <path refid="path.class.project.app"/>
+ </classpath>
+ <compilerarg line="${javac.args}"/>
+ </javac>
+ <copy todir="${build.dir}/project/test">
+ <fileset dir="src/project/src/test/resources"/>
+ </copy>
+ </target>
+
<target name="compile-textedit" description="Compiles the textedit module." depends="compile-utils">
<mkdir dir="${build.dir}/textedit/app"/>
<javac srcdir="src/textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
@@ -680,6 +722,7 @@
<path refid="path.class.model.test"/>
<path refid="path.class.preferences.test"/>
<path refid="path.class.plugin.test"/>
+ <path refid="path.class.project.test"/>
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
@@ -697,6 +740,8 @@
<packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
<packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/project/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/project/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
<packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
@@ -884,6 +929,8 @@
<fileset dir="src/preferences/src/test/java" includes="**/*.java"/>
<fileset dir="src/plugin/src/main/java" includes="**/*.java"/>
<fileset dir="src/plugin/src/test/java" includes="**/*.java"/>
+ <fileset dir="src/project/src/main/java" includes="**/*.java"/>
+ <fileset dir="src/project/src/test/java" includes="**/*.java"/>
<fileset dir="src/textedit/src/main/java" includes="**/*.java"/>
<fileset dir="src/textedit/src/test/java" includes="**/*.java"/>
<fileset dir="src/utils/src/main/java" includes="**/*.java"/>
@@ -923,6 +970,7 @@
<path refid="path.class.model.test"/>
<path refid="path.class.preferences.test"/>
<path refid="path.class.plugin.test"/>
+ <path refid="path.class.project.test"/>
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
@@ -940,6 +988,8 @@
<packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
<packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
+ <packageset dir="src/project/src/main/java" defaultexcludes="yes"/>
+ <packageset dir="src/project/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
<packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
<packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
@@ -974,7 +1024,7 @@
<target name="test" description="Executes all tests." depends="test-junit,test-mapvalidator-atrinik,test-mapvalidator-crossfire,test-mapvalidator-daimonin"/>
- <target name="test-junit" description="Executes the junit tests." depends="test-atrinik,test-crossfire,test-daimonin,test-gridarta,test-model,test-preferences,test-plugin,test-textedit,test-utils">
+ <target name="test-junit" description="Executes the junit tests." depends="test-atrinik,test-crossfire,test-daimonin,test-gridarta,test-model,test-preferences,test-plugin,test-project,test-textedit,test-utils">
<junitreport todir="${docs.dir}/test">
<fileset dir="${docs.dir}/test">
<include name="TEST-*.xml"/>
@@ -1133,6 +1183,23 @@
</junit>
</target>
+ <target name="test-project" depends="compile-project">
+ <mkdir dir="${docs.dir}/test"/>
+ <junit printsummary="no" haltonfailure="yes">
+ <classpath>
+ <path refid="path.class.project.test"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest todir="${docs.dir}/test">
+ <fileset dir="${build.dir}/project/test">
+ <include name="**/*Test.class"/>
+ <exclude name="**/*$*"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="test-textedit" depends="compile-textedit">
<mkdir dir="${docs.dir}/test"/>
<junit printsummary="no" haltonfailure="yes">
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/gridarta.ipr 2013-10-14 21:08:54 UTC (rev 9432)
@@ -2175,6 +2175,7 @@
<module fileurl="file://$PROJECT_DIR$/src/model/model.iml" filepath="$PROJECT_DIR$/src/model/model.iml" />
<module fileurl="file://$PROJECT_DIR$/src/plugin/plugin.iml" filepath="$PROJECT_DIR$/src/plugin/plugin.iml" />
<module fileurl="file://$PROJECT_DIR$/src/preferences/preferences.iml" filepath="$PROJECT_DIR$/src/preferences/preferences.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/project/project.iml" filepath="$PROJECT_DIR$/src/project/project.iml" />
<module fileurl="file://$PROJECT_DIR$/src/resources/resources.iml" filepath="$PROJECT_DIR$/src/resources/resources.iml" />
<module fileurl="file://$PROJECT_DIR$/src/textedit/textedit.iml" filepath="$PROJECT_DIR$/src/textedit/textedit.iml" />
<module fileurl="file://$PROJECT_DIR$/src/utils/utils.iml" filepath="$PROJECT_DIR$/src/utils/utils.iml" />
Modified: trunk/settings.gradle
===================================================================
--- trunk/settings.gradle 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/settings.gradle 2013-10-14 21:08:54 UTC (rev 9432)
@@ -7,6 +7,7 @@
include 'src:model'
include 'src:plugin'
include 'src:preferences'
+include 'src:project'
include 'src:resources'
include 'src:textedit'
include 'src:utils'
Modified: trunk/src/atrinik/atrinik.iml
===================================================================
--- trunk/src/atrinik/atrinik.iml 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/atrinik/atrinik.iml 2013-10-14 21:08:54 UTC (rev 9432)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="project" />
<orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
Modified: trunk/src/atrinik/build.gradle
===================================================================
--- trunk/src/atrinik/build.gradle 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/atrinik/build.gradle 2013-10-14 21:08:54 UTC (rev 9432)
@@ -10,6 +10,7 @@
compile name: 'log4j', version: '1.2.13'
compile project(':src:gridarta')
compile project(':src:model')
+ compile project(':src:project')
compile project(':src:resources')
runtime name: 'bsh-classgen', version: '2.0b4'
runtime name: 'bsh-commands', version: '2.0b4'
Modified: trunk/src/crossfire/build.gradle
===================================================================
--- trunk/src/crossfire/build.gradle 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/crossfire/build.gradle 2013-10-14 21:08:54 UTC (rev 9432)
@@ -10,6 +10,7 @@
compile name: 'log4j', version: '1.2.13'
compile project(':src:gridarta')
compile project(':src:model')
+ compile project(':src:project')
compile project(':src:resources')
runtime name: 'bsh-classgen', version: '2.0b4'
runtime name: 'bsh-commands', version: '2.0b4'
Modified: trunk/src/crossfire/crossfire.iml
===================================================================
--- trunk/src/crossfire/crossfire.iml 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/crossfire/crossfire.iml 2013-10-14 21:08:54 UTC (rev 9432)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="project" />
<orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
Modified: trunk/src/daimonin/build.gradle
===================================================================
--- trunk/src/daimonin/build.gradle 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/daimonin/build.gradle 2013-10-14 21:08:54 UTC (rev 9432)
@@ -10,6 +10,7 @@
compile name: 'log4j', version: '1.2.13'
compile project(':src:gridarta')
compile project(':src:model')
+ compile project(':src:project')
compile project(':src:resources')
runtime name: 'bsh-classgen', version: '2.0b4'
runtime name: 'bsh-commands', version: '2.0b4'
Modified: trunk/src/daimonin/daimonin.iml
===================================================================
--- trunk/src/daimonin/daimonin.iml 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/daimonin/daimonin.iml 2013-10-14 21:08:54 UTC (rev 9432)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="project" />
<orderEntry type="module" module-name="resources" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
Modified: trunk/src/gridarta/build.gradle
===================================================================
--- trunk/src/gridarta/build.gradle 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/gridarta/build.gradle 2013-10-14 21:08:54 UTC (rev 9432)
@@ -16,6 +16,7 @@
compile project(':src:model')
compile project(':src:plugin')
compile project(':src:preferences')
+ compile project(':src:project')
compile project(':src:textedit')
compile project(':src:utils')
testCompile name: 'junit', version: '4.2'
Modified: trunk/src/gridarta/gridarta.iml
===================================================================
--- trunk/src/gridarta/gridarta.iml 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/gridarta/gridarta.iml 2013-10-14 21:08:54 UTC (rev 9432)
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="preferences" />
<orderEntry type="module" module-name="plugin" />
+ <orderEntry type="module" module-name="project" />
<orderEntry type="module" module-name="textedit" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="library" name="annotations" level="project" />
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java 2013-10-14 21:08:54 UTC (rev 9432)
@@ -19,68 +19,15 @@
package net.sf.gridarta.maincontrol;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.archetypechooser.ArchetypeChooserModel;
-import net.sf.gridarta.model.archetypeset.ArchetypeSet;
-import net.sf.gridarta.model.archetypetype.ArchetypeAttributeFactory;
-import net.sf.gridarta.model.archetypetype.ArchetypeAttributeParser;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeList;
-import net.sf.gridarta.model.archetypetype.ArchetypeTypeParser;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
-import net.sf.gridarta.model.archetypetype.ArchetypeTypeSetParser;
-import net.sf.gridarta.model.archetypetype.DefaultArchetypeAttributeFactory;
-import net.sf.gridarta.model.configsource.ConfigSource;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.errorview.ErrorViewCategory;
-import net.sf.gridarta.model.errorview.ErrorViewCollector;
-import net.sf.gridarta.model.errorview.ErrorViewCollectorErrorHandler;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.gameobject.GameObjectFactory;
-import net.sf.gridarta.model.io.MapWriter;
import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.model.match.GameObjectMatcher;
-import net.sf.gridarta.model.match.GameObjectMatchers;
-import net.sf.gridarta.model.match.GameObjectMatchersParser;
-import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.scripts.ScriptArchUtils;
-import net.sf.gridarta.model.settings.ProjectSettings;
-import net.sf.gridarta.model.spells.ArchetypeSetSpellLoader;
-import net.sf.gridarta.model.spells.GameObjectSpell;
-import net.sf.gridarta.model.spells.NumberSpell;
-import net.sf.gridarta.model.spells.Spells;
-import net.sf.gridarta.model.spells.XMLSpellLoader;
-import net.sf.gridarta.model.treasurelist.TreasureListsParser;
-import net.sf.gridarta.model.treasurelist.TreasureTreeNode;
-import net.sf.gridarta.model.validation.DelegatingMapValidator;
-import net.sf.gridarta.model.validation.NoSuchValidatorException;
-import net.sf.gridarta.model.validation.ValidatorPreferences;
-import net.sf.gridarta.model.validation.checks.ArchetypeTypeChecks;
-import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
-import net.sf.gridarta.model.validation.checks.EnvironmentChecker;
-import net.sf.gridarta.model.validation.checks.PaidItemShopSquareChecker;
-import net.sf.gridarta.model.validation.checks.ShopSquareChecker;
-import net.sf.gridarta.model.validation.checks.ValidatorFactory;
-import net.sf.gridarta.utils.CommonConstants;
-import net.sf.gridarta.utils.IOUtils;
-import net.sf.gridarta.utils.StringUtils;
-import net.sf.gridarta.utils.XmlHelper;
-import net.sf.japi.swing.action.ActionBuilder;
-import net.sf.japi.swing.action.ActionBuilderFactory;
-import org.apache.log4j.Category;
-import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* MainControl is a central class that's used for access on global data
@@ -89,96 +36,7 @@
*/
public class DefaultMainControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
- /**
- * The Logger for printing log messages.
- */
@NotNull
- private static final Category log = Logger.getLogger(DefaultMainControl.class);
-
- /**
- * Loads map validators.
- * @param errorView the error view to add errors to
- * @param editorFactory the editor factory to use
- * @param projectSettings the project settings to use
- * @param gameObjectMatchers the game object matchers to use
- * @param archetypeTypeSet the archetype type set to use
- * @param validatorPreferences the validator preferences to use
- * @param mapWriter the map writer for writing temporary map files
- * @return the map validators
- */
- @NotNull
- public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> DelegatingMapValidator<G, A, R> loadValidators(@NotNull final ErrorView errorView, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ProjectSettings projectSettings, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<G, A, R> mapWriter) {
- final DelegatingMapValidator<G, A, R> validators = new DelegatingMapValidator<G, A, R>(validatorPreferences);
- final EnvironmentChecker<G, A, R> environmentChecker = new EnvironmentChecker<G, A, R>(validatorPreferences);
- final ValidatorFactory<G, A, R> validatorFactory = new ValidatorFactory<G, A, R>(validatorPreferences, gameObjectMatchers, projectSettings, mapWriter);
- loadValidators(validators, validatorFactory, errorView);
- final AttributeRangeChecker<G, A, R> attributeRangeChecker = editorFactory.loadAttributeRangeChecker(validators, new ErrorViewCollector(errorView, new File("GameObjectMatchers.xml")), projectSettings, gameObjectMatchers, validatorPreferences);
- validators.addValidator(attributeRangeChecker);
- validators.addValidator(environmentChecker);
- ArchetypeTypeChecks.addChecks(archetypeTypeSet, attributeRangeChecker, environmentChecker);
- final GameObjectMatcher shopSquareMatcher = gameObjectMatchers.getMatcher("system_shop_square", "shop_square");
- if (shopSquareMatcher != null) {
- final GameObjectMatcher noSpellsMatcher = gameObjectMatchers.getMatcher("system_no_spells", "no_spells");
- if (noSpellsMatcher != null) {
- final GameObjectMatcher blockedMatcher = gameObjectMatchers.getMatcher("system_blocked", "blocked");
- validators.addValidator(new ShopSquareChecker<G, A, R>(validatorPreferences, shopSquareMatcher, noSpellsMatcher, blockedMatcher));
- }
-
- final GameObjectMatcher paidItemMatcher = gameObjectMatchers.getMatcher("system_paid_item");
- if (paidItemMatcher != null) {
- validators.addValidator(new PaidItemShopSquareChecker<G, A, R>(validatorPreferences, shopSquareMatcher, paidItemMatcher));
- }
- }
- return validators;
- }
-
- @NotNull
- public static GameObjectMatchers loadGameObjectMatchers(@NotNull final XmlHelper xmlHelper, @NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings) {
- final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers();
- final URL url;
- try {
- url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "GameObjectMatchers.xml");
- } catch (final FileNotFoundException ex) {
- errorView.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, "GameObjectMatchers.xml: " + ex.getMessage());
- return gameObjectMatchers;
- }
- final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, url);
- try {
- xmlHelper.getDocumentBuilder().setErrorHandler(new ErrorViewCollectorErrorHandler(gameObjectMatchersErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
- try {
- final GameObjectMatchersParser gameObjectMatchersParser = new GameObjectMatchersParser(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
- gameObjectMatchersParser.readGameObjectMatchers(url, gameObjectMatchers, gameObjectMatchersErrorViewCollector);
- } finally {
- xmlHelper.getDocumentBuilder().setErrorHandler(null);
- }
- } catch (final IOException ex) {
- gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
- }
- return gameObjectMatchers;
- }
-
- @NotNull
- public static ArchetypeTypeSet loadArchetypeTypeSet(@NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final XmlHelper xmlHelper) {
- final ArchetypeAttributeFactory archetypeAttributeFactory = new DefaultArchetypeAttributeFactory();
- final ArchetypeAttributeParser archetypeAttributeParser = new ArchetypeAttributeParser(archetypeAttributeFactory);
- final ArchetypeTypeParser archetypeTypeParser = new ArchetypeTypeParser(archetypeAttributeParser);
- try {
- final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
- final ErrorViewCollector typesErrorViewCollector = new ErrorViewCollector(errorView, url);
- xmlHelper.getDocumentBuilder().setErrorHandler(new ErrorViewCollectorErrorHandler(typesErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
- try {
- final ArchetypeTypeSetParser archetypeTypeSetParser = new ArchetypeTypeSetParser(xmlHelper.getDocumentBuilder(), archetypeTypeParser);
- return archetypeTypeSetParser.loadTypesFromXML(typesErrorViewCollector, new InputSource(url.toString()));
- } finally {
- xmlHelper.getDocumentBuilder().setErrorHandler(null);
- }
- } catch (final FileNotFoundException ex) {
- errorView.addWarning(ErrorViewCategory.TYPES_FILE_INVALID, CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
- }
- return new ArchetypeTypeSet();
- }
-
- @NotNull
public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> ScriptArchUtils loadScriptArchUtils(@NotNull final ErrorView errorView, final EditorFactory<G, A, R> editorFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet) {
final ArchetypeTypeList eventTypeSetTmp = archetypeTypeSet.getList("event");
final ArchetypeTypeList eventTypeSet;
@@ -191,124 +49,4 @@
return editorFactory.newScriptArchUtils(eventTypeSet);
}
- public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void loadArchetypes(@NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final AbstractResources<G, A, R> resources, @NotNull final ConfigSource configSource) {
- final long timeStart = System.currentTimeMillis();
- if (log.isInfoEnabled()) {
- log.info("Start to load archetypes...");
- }
- configSource.read(projectSettings, resources, errorView);
- addArchetypes(archetypeChooserModel, archetypeSet);
- if (log.isInfoEnabled()) {
- log.info("Archetype loading took " + (double) (System.currentTimeMillis() - timeStart) / 1000.0 + " seconds.");
- }
- }
-
- @NotNull
- public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> Spells<GameObjectSpell<G, A, R>> loadArchetypeSpells(final int spellType, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet) {
- final Spells<GameObjectSpell<G, A, R>> gameObjectSpells = new Spells<GameObjectSpell<G, A, R>>();
- if (spellType != 0) {
- new ArchetypeSetSpellLoader<G, A, R>(gameObjectFactory).load(archetypeSet, spellType, gameObjectSpells);
- gameObjectSpells.sort();
- }
- return gameObjectSpells;
- }
-
- @NotNull
- public static Spells<NumberSpell> loadSpellFile(@Nullable final String spellFile, @NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final XmlHelper xmlHelper) {
- @NotNull final Spells<NumberSpell> numberSpells = new Spells<NumberSpell>();
- if (spellFile == null) {
- return numberSpells;
- }
-
- try {
- final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), spellFile);
- final ErrorViewCollector errorViewCollector = new ErrorViewCollector(errorView, url);
- final DocumentBuilder documentBuilder = xmlHelper.getDocumentBuilder();
- documentBuilder.setErrorHandler(new ErrorViewCollectorErrorHandler(errorViewCollector, ErrorViewCategory.SPELLS_FILE_INVALID));
- try {
- XMLSpellLoader.load(errorViewCollector, url, documentBuilder, numberSpells);
- } finally {
- documentBuilder.setErrorHandler(null);
- }
- } catch (final FileNotFoundException ex) {
- errorView.addWarning(ErrorViewCategory.SPELLS_FILE_INVALID, spellFile + ": " + ex.getMessage());
- }
- numberSpells.sort();
- return numberSpells;
- }
-
- private static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void addArchetypes(@NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet) {
- for (final R archetype : archetypeSet.getArchetypes()) {
- final CharSequence editorFolder = archetype.getEditorFolder();
- if (editorFolder != null && !editorFolder.equals(GameObject.EDITOR_FOLDER_INTERN)) {
- final String[] tmp = StringUtils.PATTERN_SLASH.split(editorFolder, 2);
- if (tmp.length == 2) {
- final String panelName = tmp[0];
- final String folderName = tmp[1];
- archetypeChooserModel.addArchetype(panelName, folderName, archetype);
- }
- }
- }
- }
-
- @NotNull
- public static Map<String, TreasureTreeNode> loadSpecialTreasureLists(@NotNull final ErrorView errorView, @NotNull final DocumentBuilder documentBuilder, @NotNull final ProjectSettings projectSettings) {
- Map<String, TreasureTreeNode> specialTreasureLists;
- try {
- final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "TreasureLists.xml");
- final ErrorViewCollector treasureListsErrorViewCollector = new ErrorViewCollector(errorView, url);
- try {
- final InputStream inputStream = url.openStream();
- try {
- documentBuilder.setErrorHandler(new ErrorViewCollectorErrorHandler(treasureListsErrorViewCollector, ErrorViewCategory.TREASURES_FILE_INVALID));
- try {
- final Document specialTreasureListsDocument = documentBuilder.parse(new InputSource(inputStream));
- specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
- } finally {
- documentBuilder.setErrorHandler(null);
- }
- } finally {
- inputStream.close();
- }
- } catch (final IOException ex) {
- treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- } catch (final SAXException ex) {
- treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- }
- } catch (final FileNotFoundException ex) {
- errorView.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "TreasureLists.xml: " + ex.getMessage());
- specialTreasureLists = Collections.emptyMap();
- }
- return specialTreasureLists;
- }
-
- /**
- * Creates map validators from preferences.
- * @param validators the validators to add the newly created validators to
- * @param validatorFactory the validator factory for creating new
- * validators
- * @param errorView the error view to add error messages to
- */
- private static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void loadValidators(@NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final ValidatorFactory<G, A, R> validatorFactory, @NotNull final ErrorView errorView) {
- final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
- int id = 0;
- while (true) {
- final String spec = actionBuilder.getString("validator." + id);
- if (spec == null) {
- break;
- }
- try {
- validators.addValidator(validatorFactory.newValidator(spec));
- } catch (final NoSuchValidatorException ex) {
- errorView.addWarning(ErrorViewCategory.MAP_VALIDATOR_ENTRY_INVALID, id, ex.getMessage());
- }
- id++;
- }
- if (log.isInfoEnabled()) {
- log.info("Loaded " + id + " map validators.");
- }
- }
-
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/EditorFactory.java 2013-10-14 21:08:54 UTC (rev 9432)
@@ -32,39 +32,24 @@
import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
-import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.archetype.ArchetypeFactory;
import net.sf.gridarta.model.archetypeset.ArchetypeSet;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeList;
-import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
import net.sf.gridarta.model.configsource.ConfigSourceFactory;
import net.sf.gridarta.model.direction.Direction;
-import net.sf.gridarta.model.errorview.ErrorView;
-import net.sf.gridarta.model.errorview.ErrorViewCollector;
import net.sf.gridarta.model.exitconnector.ExitConnectorModel;
-import net.sf.gridarta.model.face.ArchFaceProvider;
import net.sf.gridarta.model.face.FaceObjectProviders;
-import net.sf.gridarta.model.face.FaceObjects;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
-import net.sf.gridarta.model.io.AbstractArchetypeParser;
import net.sf.gridarta.model.io.CacheFiles;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.io.GameObjectParserFactory;
-import net.sf.gridarta.model.io.MapArchObjectParserFactory;
-import net.sf.gridarta.model.io.MapWriter;
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.maparchobject.MapArchObjectFactory;
-import net.sf.gridarta.model.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.mapmanager.FileControl;
import net.sf.gridarta.model.mapmanager.MapManager;
-import net.sf.gridarta.model.mapmodel.MapModelFactory;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
-import net.sf.gridarta.model.match.GameObjectMatchers;
-import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.scripts.ScriptArchData;
import net.sf.gridarta.model.scripts.ScriptArchUtils;
import net.sf.gridarta.model.scripts.ScriptedEventFactory;
@@ -72,8 +57,7 @@
import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.model.smoothface.SmoothFaces;
import net.sf.gridarta.model.validation.DelegatingMapValidator;
-import net.sf.gridarta.model.validation.ValidatorPreferences;
-import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
+import net.sf.gridarta.project.ProjectFactory;
import net.sf.gridarta.utils.EditorAction;
import net.sf.gridarta.utils.GUIUtils;
import net.sf.gridarta.utils.SystemIcons;
@@ -85,52 +69,9 @@
* A factory to create editor-dependent objects.
* @author Andreas Kirschbaum
*/
-public interface EditorFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+public interface EditorFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends ProjectFactory<G, A, R> {
/**
- * Returns the offset for drawing double faces.
- * @return the offset
- */
- int getDoubleFaceOffset();
-
- /**
- * Creates a new {@link MapArchObjectFactory} instance.
- * @param projectSettings the project settings to use
- * @return the new instance
- */
- @NotNull
- MapArchObjectFactory<A> newMapArchObjectFactory(@NotNull ProjectSettings projectSettings);
-
- /**
- * Creates a new {@link MapArchObjectParserFactory} instance.
- * @return the new instance
- */
- @NotNull
- MapArchObjectParserFactory<A> newMapArchObjectParserFactory();
-
- /**
- * Creates a new {@link GameObjectFactory} instance.
- * @param faceObjectProviders the face object providers to use
- * @param animationObjects the animation objects for looking up animations
- * @param archetypeTypeSet the archetype type set for looking up archetype
- * types
- * @return the new instance
- */
- @NotNull
- GameObjectFactory<G, A, R> newGameObjectFactory(@NotNull FaceObjectProviders faceObjectProviders, @NotNull AnimationObjects animationObjects, @NotNull ArchetypeTypeSet archetypeTypeSet);
-
- /**
- * Creates a new {@link GameObjectParserFactory} instance.
- * @param gameObjectFactory the game object parser factory to use
- * @param archetypeSet the archetype set for looking up archetypes
- * @param archetypeTypeSet the archetype type set for sorting attributes on
- * save
- * @return the new instance
- */
- @NotNull
- GameObjectParserFactory<G, A, R> newGameObjectParserFactory(@NotNull GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ArchetypeTypeSet archetypeTypeSet);
-
- /**
* Creates a new {@link ProjectSettings} instance.
* @param editorSettings the editor settings instance for default values
* @return the new instance
@@ -139,66 +80,6 @@
ProjectSettings newProjectSettings(@NotNull EditorSettings editorSettings);
/**
- * Creates a new {@link ArchetypeFactory} instance.
- * @param faceObjectProviders the face object providers for looking up
- * faces
- * @param animationObjects the animation objects for looking up animations
- * @return the new instance
- */
- @NotNull
- ArchetypeFactory<G, A, R> newArchetypeFactory(@NotNull FaceObjectProviders faceObjectProviders, @NotNull AnimationObjects animationObjects);
-
- /**
- * Creates a new {@link ArchetypeSet} instance.
- * @param projectSettings the project settings to use
- * @param archetypeFactory the archetype factory to use
- * @return the new instance
- */
- @NotNull
- ArchetypeSet<G, A, R> newArchetypeSet(@NotNull ProjectSettings projectSettings, @NotNull ArchetypeFactory<G, A, R> archetypeFactory);
-
- /**
- * Creates a new {@link MapControlFactory} instance.
- * @param mapWriter the map writer to use
- * @param projectSettings the project settings to use
- * @param mapModelFactory the map model factory to use
- * @return the new instance
- */
- @NotNull
- MapControlFactory<G, A, R> newMapControlFactory(@NotNull MapWriter<G, A, R> mapWriter, @NotNull ProjectSettings projectSettings, @NotNull MapModelFactory<G, A, R> mapModelFactory);
-
- /**
- * Returns whether the face file contains face numbers.
- * @return whether the face file contains face numbers
- */
- boolean getIncludeFaceNumbers();
-
- /**
- * Loads the attribute range checker for map validation.
- * @param mapValidators the map validators that delegates to add to
- * @param errorViewCollector the error view collector to use
- * @param projectSettings the project settings instance
- * @param gameObjectMatchers the defined game object matchers
- * @param validatorPreferences the validator preferences to use
- * @return the loaded attribute range checker
- */
- @NotNull
- AttributeRangeChecker<G, A, R> loadAttributeRangeChecker(@NotNull DelegatingMapValidator<G, A, R> mapValidators, @NotNull ErrorViewCollector errorViewCollector, @NotNull ProjectSettings projectSettings, @NotNull GameObjectMatchers gameObjectMatchers, @NotNull final ValidatorPreferences validatorPreferences);
-
- /**
- * Creates a new {@link AbstractArchetypeParser} instance.
- * @param errorView the error view for reporting errors
- * @param gameObjectParser the game object parser to use
- * @param animationObjects the animation objects to use
- * @param archetypeSet the archetype set to use
- * @param gameObjectFactory the game object factory to use
- * @param projectSettings the project settings to use
- * @param smoothFaces the smooth faces to use
- * @return the new instance
- */
- AbstractArchetypeParser<G, A, R, ?> newArchetypeParser(@NotNull ErrorView errorView, GameObjectParser<G, A, R> gameObjectParser, AnimationObjects animationObjects, ArchetypeSet<G, A, R> archetypeSet, @NotNull GameObjectFactory<G, A, R> gameObjectFactory, @NotNull ProjectSettings projectSettings, @NotNull SmoothFaces smoothFaces);
-
- /**
* Creates a new {@link ScriptArchUtils} instance.
* @param eventTypes the event types to use
* @return the new instance
@@ -301,23 +182,6 @@
PreferencesGroup createPreferencesGroup(@NotNull ProjectSettings projectSettings, @NotNull EditorSettings editorSettings, @NotNull DelegatingMapValidator<G, A, R> validators, @NotNull AppPreferencesModel appPreferencesModel, @NotNull ExitConnectorModel exitConnectorModel, @NotNull ConfigSourceFactory configSourceFactory);
/**
- * Creates a new {@link AbstractResources} instance.
- * @param gameObjectParser the game object parser to use
- * @param archetypeSet the archetype set to use
- * @param archetypeParser the archetype parser to use
- * @param mapViewSettings the map view settings to use
- * @param faceObjects the face objects to use
- * @param animationObjects the animation objects to use
- * @param archFaceProvider the arch face provider to use
- * @param faceObjectProviders the face object providers for looking up
- * faces
- * @param smoothFaces the smooth faces to use
- * @return the new instance
- */
- @NotNull
- AbstractResources<G, A, R> newResources(@NotNull final GameObjectParser<G, A, R> gameObjectParser, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final AbstractArchetypeParser<G, A, R, ?> archetypeParser, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjects faceObjects, @NotNull final AnimationObjects animationObjects, @NotNull final ArchFaceProvider archFaceProvider, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull SmoothFaces smoothFaces);
-
- /**
* Creates the "open in client" action. Does nothing if this editor does not
* support this action.
* @param mapViewManager the map view manager for tracking the current map
@@ -330,25 +194,6 @@
EditorAction newServerActions(@NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final FileControl<G, A, R> fileControl, @NotNull final PathManager pathManager);
/**
- * Returns the default directory for editor scripts.
- * @return the directory
- */
- String getScriptsDir();
-
- /**
- * Returns the spell file name to load.
- * @return the spell file name or {@code null} to not load numbered spells
- */
- @Nullable
- String getSpellFile();
-
- /**
- * Returns the archetype type for game object spells.
- * @return the archetype type or {@code 0} to not load game object spells
- */
- int getSpellType();
-
- /**
* Returns the {@link FileFilter} for script files.
* @return the file filter
*/
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2013-10-14 18:54:27 UTC (rev 9431)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2013-10-14 21:08:54 UTC (rev 9432)
@@ -169,52 +169,32 @@
import net.sf.gridarta.gui.utils.tabbedpanel.Tab;
import net.sf.gridarta.mainactions.DefaultExiter;
import net.sf.gridarta.mainactions.MainActions;
-import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.anim.AnimationValidator;
import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.model.archetypechooser.DisplayMode;
-import net.sf.gridarta.model.archetypeset.ArchetypeSet;
import net.sf.gridarta.model.archetypeset.ArchetypeValidator;
-import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
import net.sf.gridarta.model.configsource.ConfigSourceFactory;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.errorview.ErrorViewCollector;
import net.sf.gridarta.model.exitconnector.DefaultExitConnectorModel;
import net.sf.gridarta.model.exitconnector.ExitConnectorModel;
import net.sf.gridarta.model.exitconnector.ExitMatcher;
-import net.sf.gridarta.model.face.FaceObjectProviders;
-import net.sf.gridarta.model.face.FaceObjects;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.gameobject.GameObjectFactory;
-import net.sf.gridarta.model.io.MapReaderFactory;
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.model.maparchobject.MapArchObjectFactory;
-import net.sf.gridarta.model.mapmanager.AbstractMapManager;
-import net.sf.gridarta.model.mapmanager.MapManager;
-import net.sf.gridarta.model.mapmodel.InsertionMode;
import net.sf.gridarta.model.mapmodel.InsertionModeSet;
-import net.sf.gridarta.model.mapmodel.MapModelFactory;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
-import net.sf.gridarta.model.match.GameObjectMatchers;
import net.sf.gridarta.model.match.TypeNrsGameObjectMatcher;
import net.sf.gridarta.model.pickmapsettings.DefaultPickmapSettings;
import net.sf.gridarta.model.pickmapsettings.PickmapSettings;
-import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.scripts.ScriptArchUtils;
import net.sf.gridarta.model.settings.DefaultVolatileSettings;
import net.sf.gridarta.model.settings.EditorSettings;
import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.model.settings.VolatileSettings;
-import net.sf.gridarta.model.spells.GameObjectSpell;
-import net.sf.gridarta.model.spells.NumberSpell;
-import net.sf.gridarta.model.spells.Spells;
-import net.sf.gridarta.model.treasurelist.TreasureTree;
-import net.sf.gridarta.model.validation.DelegatingMapValidator;
import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.project.ProjectModel;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
import net.sf.gridarta.textedit.textarea.TextAreaDefaults;
import net.sf.gridarta.updater.UpdaterManager;
@@ -258,6 +238,12 @@
private static final Preferences preferences = Preferences.userNodeForPackage(MainControl.class);
/**
+ * The {@link ProjectModel} to edit.
+ */
+ @NotNull
+ private final ProjectModel<G, A, R> projectModel;
+
+ /**
* The main window's {@link JFrame}.
*/
@NotNull
@@ -301,12 +287,6 @@
private final DefaultFileControl<G, A, R> fileControl;
/**
- * The {@link ArchetypeSet} instance.
- */
- @NotNull
- private final ArchetypeSet<G, A, R> archetypeSet;
-
- /**
* The {@link UpdaterManager} instance.
*/
@NotNull
@@ -314,84 +294,64 @@
/**
* Creates a new instance.
- * @param mapManager the map manager instance
- * @param pickmapManager the pickmap manager instance
- * @param archetypeSet the archetype set instance
- * @param faceObjects the face objects instance
+ * @param projectModel the project model to edit
* @param projectSettings the project settings instance
* @param editorSettings the editor settings instance
- * @param mapViewSettings the map view settings instance
- * @param mapModelFactory the map model factory instance
- * @param mapReaderFactory the map reader factory instance
- * @param mapArchObjectFactory the map arch object factory instance
- * @param treasureTree the treasure tree instance
- * @param archetypeTypeSet the archetype type set instance
- * @param validators the map validators
- * @param resources the resources to collect
- * @param gameObjectMatchers the game object matchers instance
* @param errorView the error view for reporting errors
* @param guiUtils the gui utils for creating icons
* @param pluginModel the plugin model instance
- * @param archetypeChooserModel the archetype chooser model instance
- * @param animationObjects the animation objects instance
* @param scriptArchEditor the script arch editor instance
* @param scriptedEventEditor the scripted event editor instance
* @param scriptArchDataUtils the script arch data utils instance
* @param scriptArchUtils the script arch utils instance
* @param editorFactory the editor factory instance
- * @param faceObjectProviders the face object providers for looking up
- * faces
- * @param gameObjectFactory the game object factory instance
* @param pathManager the path manager for converting path names
- * @param gameObjectSpells the game object spells instance
- * @param numberSpells the numbered spells instance
* @param systemIcons the system icons for creating icons
* @param configSourceFactory the config source factory instance
- * @param topmostInsertionMode the "topmost" insertion mode instance
* @param rendererFactory the renderer factory instance
* @param filterControl the filter control instance
*/
- public GUIMainControl(@NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final ProjectSettings projectSettings, @NotNull final EditorSettings editorSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final MapModelFactory<G, A, R> mapModelFactory, @NotNull final MapReaderFactory<G, A> mapReaderFactory, final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final TreasureTree treasureTree, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final AbstractResources<G, A, R> resources, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final AnimationObjects animationObjects, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final ScriptArchDataUtils<G, A, R> scriptArchDataUtils, @NotNull final ScriptArchUtils scriptArchUtils, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final FaceObjectProviders faceObjectProviders, final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final PathManager pathManager, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl) {
- this.archetypeSet = archetypeSet;
+ public GUIMainControl(@NotNull final ProjectModel<G, A, R> projectModel, @NotNull final ProjectSettings projectSettings, @NotNull final EditorSettings editorSettings, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final ScriptArchDataUtils<G, A, R> scriptArchDataUtils, @NotNull final ScriptArchUtils scriptArchUtils, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final PathManager pathManager, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl) {
+ this.projectModel = projectModel;
final MapViewFactory<G, A, R> mapViewFactory = editorFactory.newMapViewFactory(rendererFactory, pathManager);
- mapViewsManager = new MapViewsManager<G, A, R>(mapViewSettings, mapViewFactory, mapManager, pickmapManager);
+ mapViewsManager = new MapViewsManager<G, A, R>(projectModel.getMapViewSettings(), mapViewFactory, projectModel.getMapManager(), projectModel.getPickmapManager());
scriptExtension = editorFactory.getScriptExtension();
- final DisplayMode<G, A, R> displayModeGameObjectNames = new DisplayNameCellRenderer<G, A, R>(faceObjectProviders);
- final DisplayMode<G, A, R> displayModeArchetypeNames = new ArchetypeNameCellRenderer<G, A, R>(faceObjectProviders);
- final DisplayMode<G, A, R> displayModeIconsOnly = new ArchetypeIconCellRenderer<G, A, R>(faceObjectProviders);
+ final DisplayMode<G, A, R> displayModeGameObjectNames = new DisplayNameCellRenderer<G, A, R>(projectModel.getFaceObjectProviders());
+ final DisplayMode<G, A, R> displayModeArchetypeNames = new ArchetypeNameCellRenderer<G, A, R>(projectModel.getFaceObjectProviders());
+ final DisplayMode<G, A, R> displayModeIconsOnly = new ArchetypeIconCellRenderer<G, A, R>(projectModel.getFaceObjectProviders());
final ExitConnectorModel exitConnectorModel = new De...
[truncated message content] |
|
From: <aki...@us...> - 2013-10-17 20:18:51
|
Revision: 9472
http://sourceforge.net/p/gridarta/code/9472
Author: akirschbaum
Date: 2013-10-17 20:18:48 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Clean up code related to plugin execution.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginController.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModel.java
trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/gridarta.ipr 2013-10-17 20:18:48 UTC (rev 9472)
@@ -74,6 +74,9 @@
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
<option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
<option name="BLANK_LINES_AROUND_FIELD" value="1" />
<option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginController.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginController.java 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/PluginController.java 2013-10-17 20:18:48 UTC (rev 9472)
@@ -32,8 +32,10 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.plugin.Plugin;
+import net.sf.gridarta.plugin.PluginExecutor;
import net.sf.gridarta.plugin.PluginModel;
import net.sf.gridarta.plugin.PluginModelListener;
+import net.sf.gridarta.plugin.PluginParameters;
import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.EditorAction;
import net.sf.gridarta.utils.FileChooserUtils;
@@ -62,6 +64,9 @@
private final PluginModel<G, A, R> pluginModel;
@NotNull
+ private final PluginParameters pluginParameters;
+
+ @NotNull
private final PluginView<G, A, R> view;
/**
@@ -99,14 +104,14 @@
final String filterName = "(s)" + plugin.getName();
if (plugin.isFilter()) {
- final Filter<?, ?> filter = pluginModel.getPluginAsFilter(plugin);
+ final Filter<?, ?> filter = plugin.getPluginAsFilter(pluginParameters);
if (filter != null) {
filterControl.addFilter(filterName, filter);
}
}
if (plugin.isAutoBoot()) {
- pluginModel.runPlugin(plugin);
+ plugin.runPlugin(pluginParameters);
}
}
@@ -121,10 +126,11 @@
/**
* Creates a new instance.
*/
- public PluginController(@NotNull final FilterControl<G, A, R> filterControl, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final Component parent, @NotNull final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory, @NotNull final File pluginsDir, @NotNull final SystemIcons systemIcons) {
+ public PluginController(@NotNull final FilterControl<G, A, R> filterControl, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final PluginParameters pluginParameters, @NotNull final Component parent, @NotNull final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory, @NotNull final File pluginsDir, @NotNull final SystemIcons systemIcons) {
this.parent = parent;
this.filterControl = filterControl;
this.pluginModel = pluginModel;
+ this.pluginParameters = pluginParameters;
this.pluginsDir = pluginsDir;
view = new PluginView<G, A, R>(this, pluginModel, pluginParameterViewFactory, systemIcons);
pluginModel.addPluginModelListener(pluginModelListener);
@@ -242,7 +248,7 @@
return;
}
- pluginModel.doRunPlugin(clonedPlugin, view.createConsole(clonedPlugin.getName())); // XXX: drops thread
+ new PluginExecutor<G, A, R>(pluginModel, pluginParameters).doRunPlugin(clonedPlugin, view.createConsole(clonedPlugin.getName())); // XXX: drops thread
}
@ActionMethod
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java 2013-10-17 20:18:48 UTC (rev 9472)
@@ -194,7 +194,7 @@
import net.sf.gridarta.model.settings.DefaultVolatileSettings;
import net.sf.gridarta.model.settings.EditorSettings;
import net.sf.gridarta.model.settings.VolatileSettings;
-import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.plugin.PluginParameters;
import net.sf.gridarta.project.ProjectModel;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
import net.sf.gridarta.textedit.textarea.TextAreaDefaults;
@@ -300,14 +300,13 @@
* @param editorSettings the editor settings instance
* @param errorView the error view for reporting errors
* @param guiUtils the gui utils for creating icons
- * @param pluginModel the plugin model instance
* @param editorFactory the editor factory instance
* @param systemIcons the system icons for creating icons
* @param configSourceFactory the config source factory instance
* @param rendererFactory the renderer factory instance
* @param filterControl the filter control instance
*/
- public GUIMainControl(@NotNull final ProjectModel<G, A, R> projectModel, @NotNull final MapViewSettings mapViewSettings, @NotNull final EditorSettings editorSettings, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl) {
+ public GUIMainControl(@NotNull final ProjectModel<G, A, R> projectModel, @NotNull final MapViewSettings mapViewSettings, @NotNull final EditorSettings editorSettings, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl) {
this.projectModel = projectModel;
final MapViewFactory<G, A, R> mapViewFactory = editorFactory.newMapViewFactory(rendererFactory, projectModel.getPathManager());
scriptExtension = editorFactory.getScriptExtension();
@@ -396,7 +395,9 @@
final GameObjectTab<G, A, R> gameObjectTab = new GameObjectTab<G, A, R>("gameObject", gameObjectAttributesControl, Location.BOTTOM, false, 0, true);
final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(parent, copyBuffer, objectChooser, mapViewManager, projectModel.getFaceObjectProviders(), insertionModeSet);
final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory = new PluginParameterViewFactory<G, A, R>(projectModel.getArchetypeSet(), gameObjectAttributesModel, objectChooser, projectModel.getMapManager(), projectModel.getFaceObjectProviders());
- final PluginController<G, A, R> pluginControl = new PluginController<G, A, R>(filterControl, pluginModel, parent, pluginParameterViewFactory, scriptsFile, systemIcons);
+ final PluginParameters pluginParameters = projectModel.newPluginParameters();
+ pluginParameters.addPluginParameter("rendererFactory", rendererFactory);
+ final PluginController<G, A, R> pluginControl = new PluginController<G, A, R>(filterControl, projectModel.getPluginModel(), pluginParameters, parent, pluginParameterViewFactory, scriptsFile, systemIcons);
final EditorAction mainActions = new MainActions<G, A, R>(findDialogManager, replaceDialogManager, mainViewFrame, mapViewSettings, projectModel.getArchetypeSet(), copyBuffer, objectChooser, projectModel.getMapManager(), mapViewManager, insertionModeSet);
final EditorAction mapCursorActions = new MapCursorActions<G, A, R>(mapViewManager);
final Action moveSquareDownAction = createAction("moveSquareDown", "Selected Square View", new MoveSquareDownAction<G, A, R>(selectedSquareModel, projectModel.getMapManager()));
@@ -437,7 +438,7 @@
createToggleAction("smoothing", "Map Navigation", mapActions);
createToggleAction("doubleFaces", "Map Navigation", mapActions);
createToggleAction("tileShow", "Map Navigation", mapActions);
- createAction("editPlugins", "Plugin", new PluginManagerFactory<G, A, R>(pluginControl, pluginModel, pluginParameterViewFactory, systemIcons));
+ createAction("editPlugins", "Plugin", new PluginManagerFactory<G, A, R>(pluginControl, projectModel.getPluginModel(), pluginParameterViewFactory, systemIcons));
createAction("savePlugins", "Plugin", pluginControl);
createAction("importPlugin", "Plugin", pluginControl);
createAction("update", "Tool", updaterManager);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java 2013-10-17 20:18:48 UTC (rev 9472)
@@ -25,7 +25,6 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
@@ -53,14 +52,10 @@
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapviewsettings.DefaultMapViewSettings;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
-import net.sf.gridarta.model.match.NamedGameObjectMatcher;
import net.sf.gridarta.model.settings.DefaultEditorSettings;
import net.sf.gridarta.model.settings.EditorSettings;
import net.sf.gridarta.model.settings.ProjectSettings;
-import net.sf.gridarta.plugin.PluginModel;
-import net.sf.gridarta.plugin.PluginModelLoader;
-import net.sf.gridarta.plugin.PluginModelParser;
-import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
+import net.sf.gridarta.plugin.PluginExecutor;
import net.sf.gridarta.preferences.FilePreferencesFactory;
import net.sf.gridarta.project.ProjectModel;
import net.sf.gridarta.utils.ConfigFileUtils;
@@ -211,25 +206,13 @@
final MapViewSettings mapViewSettings = new DefaultMapViewSettings();
final RendererFactory<G, A, R> rendererFactory = editorFactory.newRendererFactory(mapViewSettings, filterControl, projectModel.getGameObjectParser(), projectModel.getFaceObjectProviders(), systemIcons, projectModel.getSmoothFaces());
- final NamedFilter defaultFilterList = new NamedFilter(Collections.<NamedGameObjectMatcher>emptyList());
- final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(projectModel.getArchetypeSet(), projectModel.getMapManager(), defaultFilterList, projectModel.getProjectSettings());
- final PluginModelParser<G, A, R> pluginModelParser = new PluginModelParser<G, A, R>(pluginParameterFactory);
- final PluginModel<G, A, R> pluginModel = PluginModelLoader.loadPlugins(pluginParameterFactory, pluginModelParser, errorView, projectModel.getScriptsFile());
- pluginModel.addPluginParameter("archetypeSet", projectModel.getArchetypeSet());
- pluginModel.addPluginParameter("projectSettings", projectModel.getProjectSettings());
- pluginModel.addPluginParameter("globalSettings", projectModel.getProjectSettings()); // XXX: for compatibility with existing scripts; should be replaced with "projectSettings"
- pluginModel.addPluginParameter("mapManager", projectModel.getMapManager());
- pluginModel.addPluginParameter("validators", projectModel.getValidators());
- pluginModel.addPluginParameter("rendererFactory", rendererFactory);
- pluginModel.addPluginParameter("gameObjectMatchers", projectModel.getGameObjectMatchers());
-
if (plugin != null) {
- returnCode = runPlugin(plugin, errorView, args2, pluginModel);
+ returnCode = runPlugin(plugin, errorView, args2, projectModel);
} else {
try {
switch (mode) {
case NORMAL:
- returnCode = runNormal(args2, editorFactory, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, pluginModel, projectModel, mapViewSettings, editorSettings, systemIcons);
+ returnCode = runNormal(args2, editorFactory, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, projectModel, mapViewSettings, editorSettings, systemIcons);
break;
case BATCH_PNG:
@@ -269,13 +252,13 @@
* @param plugin the name of the plugin to run
* @param errorView the error view to add errors to
* @param args the arguments for the plugin
- * @param pluginModel the plugin model to use
+ * @param projectModel the project model to use
* @return return code suitable for passing to {@link System#exit(int)}
*/
- private int runPlugin(@NotNull final String plugin, final ErrorView errorView, final Iterable<String> args, @NotNull final PluginModel<G, A, R> pluginModel) {
+ private int runPlugin(@NotNull final String plugin, final ErrorView errorView, final Iterable<String> args, @NotNull final ProjectModel<G, A, R> projectModel) {
checkForErrors(errorView);
waitDialog(errorView);
- return pluginModel.executePlugin(plugin, args);
+ return new PluginExecutor<G, A, R>(projectModel.getPluginModel(), projectModel.newPluginParameters()).executePlugin(plugin, args);
}
/**
@@ -314,20 +297,19 @@
* @param configSourceFactory the config source factory to use
* @param rendererFactory the renderer factory to use
* @param filterControl the filter control to use
- * @param pluginModel the plugin model to use
* @param projectModel the project model to use
* @param mapViewSettings the map view settings
* @param editorSettings the editor settings
* @param systemIcons the system icons for creating icons
* @return return code suitable for passing to {@link System#exit(int)}
*/
- private int runNormal(@NotNull final Iterable<String> args, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final PluginModel<G, A, R> pluginModel, @NotNull final ProjectModel<G, A, R> projectModel, @NotNull final MapViewSettings mapViewSettings, @NotNull final EditorSettings editorSettings, @NotNull final SystemIcons systemIcons) {
+ private int runNormal(@NotNull final Iterable<String> args, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ProjectModel<G, A, R> projectModel, @NotNull final MapViewSettings mapViewSettings, @NotNull final EditorSettings editorSettings, @NotNull final SystemIcons systemIcons) {
final GUIMainControl<?, ?, ?>[] guiMainControl = new GUIMainControl<?, ?, ?>[1];
final Runnable runnable = new Runnable() {
@Override
public void run() {
- guiMainControl[0] = new GUIMainControl<G, A, R>(projectModel, mapViewSettings, editorSettings, errorView, guiUtils, pluginModel, editorFactory, systemIcons, configSourceFactory, rendererFactory, filterControl);
+ guiMainControl[0] = new GUIMainControl<G, A, R>(projectModel, mapViewSettings, editorSettings, errorView, guiUtils, editorFactory, systemIcons, configSourceFactory, rendererFactory, filterControl);
}
};
Modified: trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModel.java
===================================================================
--- trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModel.java 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModel.java 2013-10-17 20:18:48 UTC (rev 9472)
@@ -19,7 +19,6 @@
package net.sf.gridarta.plugin;
-import bsh.ConsoleInterface;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -28,7 +27,6 @@
import java.util.Map;
import java.util.TreeMap;
import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.filter.Filter;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
@@ -64,9 +62,6 @@
@NotNull
private final Map<String, Plugin<G, A, R>> plugins = new TreeMap<String, Plugin<G, A, R>>();
- @NotNull
- private final PluginParameters pluginParameters = new PluginParameters();
-
/**
* The {@link PluginModelListener PluginModelListeners} to inform of
* changes.
@@ -226,29 +221,6 @@
firePluginRegisteredEvent(plugin);
}
- public void addPluginParameter(@NotNull final String name, @NotNull final Object value) {
- pluginParameters.addPluginParameter(name, value);
- }
-
- @Nullable
- public Filter<?, ?> getPluginAsFilter(@NotNull final Plugin<G, A, R> plugin) {
- return plugin.getPluginAsFilter(pluginParameters);
- }
-
-
- public void runPlugin(@NotNull final Plugin<G, A, R> plugin) {
- plugin.runPlugin(pluginParameters);
- }
-
- public int executePlugin(@NotNull final String plugin, @NotNull final Iterable<String> args) {
- return new PluginExecutor<G, A, R>(this, pluginParameters).executePlugin(plugin, args);
- }
-
- @Nullable
- public BshThread<G, A, R> doRunPlugin(@NotNull final Plugin<G, A, R> plugin, @NotNull final ConsoleInterface console) {
- return new PluginExecutor<G, A, R>(this, pluginParameters).doRunPlugin(plugin, console);
- }
-
@NotNull
public String[] getTypes() {
return pluginParameterFactory.getTypes();
Modified: trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
===================================================================
--- trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java 2013-10-17 19:38:37 UTC (rev 9471)
+++ trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java 2013-10-17 20:18:48 UTC (rev 9472)
@@ -53,6 +53,7 @@
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.face.FaceObjectProvidersListener;
import net.sf.gridarta.model.face.FaceObjects;
+import net.sf.gridarta.model.filter.NamedFilter;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.AbstractArchetypeParser;
@@ -77,6 +78,7 @@
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
import net.sf.gridarta.model.match.GameObjectMatchersParser;
+import net.sf.gridarta.model.match.NamedGameObjectMatcher;
import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.settings.ProjectSettings;
import net.sf.gridarta.model.smoothface.SmoothFaces;
@@ -99,6 +101,11 @@
import net.sf.gridarta.model.validation.checks.PaidItemShopSquareChecker;
import net.sf.gridarta.model.validation.checks.ShopSquareChecker;
import net.sf.gridarta.model.validation.checks.ValidatorFactory;
+import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.plugin.PluginModelLoader;
+import net.sf.gridarta.plugin.PluginModelParser;
+import net.sf.gridarta.plugin.PluginParameters;
+import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
import net.sf.gridarta.utils.CommonConstants;
import net.sf.gridarta.utils.IOUtils;
import net.sf.gridarta.utils.StringUtils;
@@ -197,6 +204,9 @@
@NotNull
private final PathManager pathManager;
+ @NotNull
+ private final PluginModel<G, A, R> pluginModel;
+
public ProjectModel(@NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final ProjectFactory<G, A, R> projectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ConfigSource configSource) {
this.projectSettings = projectSettings;
final XmlHelper xmlHelper;
@@ -249,6 +259,10 @@
final Map<String, TreasureTreeNode> specialTreasureLists = loadSpecialTreasureLists(errorView, xmlHelper.getDocumentBuilder(), projectSettings);
treasureTree = TreasureLoader.parseTreasures(errorView, specialTreasureLists, configSource, projectSettings);
pathManager = new PathManager(projectSettings);
+ final NamedFilter defaultFilterList = new NamedFilter(Collections.<NamedGameObjectMatcher>emptyList());
+ final PluginParameterFactory<G, A, R> pluginParameterFactory = new PluginParameterFactory<G, A, R>(archetypeSet, mapManager, defaultFilterList, projectSettings);
+ final PluginModelParser<G, A, R> pluginModelParser = new PluginModelParser<G, A, R>(pluginParameterFactory);
+ pluginModel = PluginModelLoader.loadPlugins(pluginParameterFactory, pluginModelParser, errorView, scriptsFile);
}
@NotNull
@@ -574,4 +588,25 @@
return pathManager;
}
+ @NotNull
+ public PluginModel<G, A, R> getPluginModel() {
+ return pluginModel;
+ }
+
+ /**
+ * Creates a new {@link PluginParameters} instance for this project model.
+ * @return the plugin parameters; may be modified
+ */
+ @NotNull
+ public PluginParameters newPluginParameters() {
+ final PluginParameters pluginParameters = new PluginParameters();
+ pluginParameters.addPluginParameter("archetypeSet", archetypeSet);
+ pluginParameters.addPluginParameter("projectSettings", projectSettings);
+ pluginParameters.addPluginParameter("globalSettings", projectSettings); // XXX: for compatibility with existing scripts; should be replaced with "projectSettings"
+ pluginParameters.addPluginParameter("mapManager", mapManager);
+ pluginParameters.addPluginParameter("validators", validators);
+ pluginParameters.addPluginParameter("gameObjectMatchers", gameObjectMatchers);
+ return pluginParameters;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-07 20:09:56
|
Revision: 9534
http://sourceforge.net/p/gridarta/code/9534
Author: akirschbaum
Date: 2014-01-07 20:09:51 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Add the Gradle Wrapper.
Modified Paths:
--------------
trunk/build.gradle
Added Paths:
-----------
trunk/gradle/
trunk/gradle/wrapper/
trunk/gradle/wrapper/gradle-wrapper.jar
trunk/gradle/wrapper/gradle-wrapper.properties
trunk/gradlew
trunk/gradlew.bat
Modified: trunk/build.gradle
===================================================================
--- trunk/build.gradle 2014-01-07 19:11:24 UTC (rev 9533)
+++ trunk/build.gradle 2014-01-07 20:09:51 UTC (rev 9534)
@@ -164,3 +164,7 @@
}
buildNumber
}.memoize()
+
+task wrapper(type: Wrapper) {
+ gradleVersion = '1.6'
+}
Added: trunk/gradle/wrapper/gradle-wrapper.jar
===================================================================
(Binary files differ)
Index: trunk/gradle/wrapper/gradle-wrapper.jar
===================================================================
--- trunk/gradle/wrapper/gradle-wrapper.jar 2014-01-07 19:11:24 UTC (rev 9533)
+++ trunk/gradle/wrapper/gradle-wrapper.jar 2014-01-07 20:09:51 UTC (rev 9534)
Property changes on: trunk/gradle/wrapper/gradle-wrapper.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- trunk/gradle/wrapper/gradle-wrapper.properties (rev 0)
+++ trunk/gradle/wrapper/gradle-wrapper.properties 2014-01-07 20:09:51 UTC (rev 9534)
@@ -0,0 +1,6 @@
+#Tue Jan 07 20:12:55 CET 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
Property changes on: trunk/gradle/wrapper/gradle-wrapper.properties
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/gradlew
===================================================================
--- trunk/gradlew (rev 0)
+++ trunk/gradlew 2014-01-07 20:09:51 UTC (rev 9534)
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Property changes on: trunk/gradlew
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/gradlew.bat
===================================================================
--- trunk/gradlew.bat (rev 0)
+++ trunk/gradlew.bat 2014-01-07 20:09:51 UTC (rev 9534)
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
Property changes on: trunk/gradlew.bat
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-07 20:22:50
|
Revision: 9535
http://sourceforge.net/p/gridarta/code/9535
Author: akirschbaum
Date: 2014-01-07 20:22:47 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Update build instructions.
Modified Paths:
--------------
trunk/INSTALL
trunk/README
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2014-01-07 20:09:51 UTC (rev 9534)
+++ trunk/INSTALL 2014-01-07 20:22:47 UTC (rev 9535)
@@ -8,37 +8,53 @@
Build Requirements
------------------
-* Java Software Development Kit 5.0 or newer
-* Ant 1.7.0 or newer, including the "optional" tasks
- On Debian: install packages "ant" and "ant-optional".
- On Mandriva: install "ant-nodeps".
+* Java Software Development Kit 6.0 or newer
Runtime Requirements
--------------------
-* Java Runtime Environment 5.0 or newer
+* Java Runtime Environment 6.0 or newer
How to Build
------------
-Run "ant" to build the editor. This builds AtrinikEditor.jar,
-CrossfireEditor.jar, and DaimoninEditor.jar. To find out options about building
-Gridarta, run "ant -projecthelp".
+Run "./gradlew" (or gradlew on Windows) to build the editors. This first
+downloads Gradle (http://www.gradle.org), then builds all Gridarta variants.
+If your Internet connection requires a proxy try one of the following:
+
+ ./gradlew -DsocksProxyHost=... -DsocksProxyPort=...
+ ./gradlew -Dhttp.proxyHost=... -Dhttp.proxyPort=...
+
+You need the proxy only during the first build. Afterwards no further Internet
+access is needed.
+
+If you have more than one Java version installed, you can select the right
+version with
+
+ JAVA_HOME=/.../jdk1.6.0_21 ./gradlew
+
+or
+
+ SET JAVA_HOME=\...\jdk1.6.0_21
+ gradlew
+
+on Windows.
+
To build Debian packages, run "debuild -uc -us".
How to Run
----------
-java -jar AtrinikEditor.jar
-java -jar CrossfireEditor.jar
-java -jar DaimoninEditor.jar
+java -jar src/atrinik/build/libs/AtrinikEditor.jar
+java -jar src/daimonin/build/libs/DaimoninEditor.jar
+java -jar src/crossfire/build/libs/CrossfireEditor.jar
How to Generate Documentation (Javadoc)
---------------------------------------
-Change to the main directory and run "ant javadoc". The documentation will be
-placed in dest/doc/dev/api/.
+Change to the main directory and run "./gradlew :javadoc". The documentation
+will be placed in build/javadoc.
How to Publish a Build
@@ -46,11 +62,11 @@
Gridarta supports updating itself through the GUI (Help|Update...). Gridarta
first checks whether an update is available, then downloads the update.
+
To check whether an update is available, Gridarta downloads a file specified in
-"update.url=" in atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties,
-crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties, or
-daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties. This file
-contains the following entries:
+"update.url=" in
+src/{atrinik,crossfire,daimonin}/src/main/resources/net/sf/gridarta/var/{atrinik,crossfire,daimonin}/action.properties.
+This file contains the following entries:
- update.url=Download URL to AtrinikEditor.jar, CrossfireEditor.jar, or
DaimoninEditor.jar.
- update.number=the Gridarta version number corresponding to update.url
@@ -61,9 +77,9 @@
update is available from update.url. The other entries are displayed to the
user.
-To provide a build, edit the value of "update.url" in
-*/src/app/net/sf/gridarta/var/*/action.properties for the editor variant. Then
-create or edit the file "developer.properties" in the project's root directory.
+To provide a build, edit the value of "update.url" in the action.properties
+file for the editor variant. Then create or edit the file
+"developer.properties" in the project's root directory.
Add the following entries:
- build.developer=Name of the developer providing the build.
- user.update.url.atrinik=Download URL to AtrinikEditor.jar.
@@ -72,8 +88,9 @@
The definitions of user.update.url.* are optional for editor variants not
provided.
-Run "ant preparePublish". This compiles the editors and creates the file
+Run "./gradlew preparePublish". This compiles the editors and creates the file
"update.properties" for the editor variants to publish. The result is in
-dist/atrinik, dist/crossfire, and dist/daimonin.
+src/{atrinik,crossfire,daimonin}/build/libs.
-Upload the contents of dist/atrinik, dist/crossfire, and dist/daimonin.
+Upload the contents of src/{atrinik,crossfire,daimonin}/build/libs. The files
+atrinik.jar, crossfire.jar, and daimonin.jar can be omitted.
Modified: trunk/README
===================================================================
--- trunk/README 2014-01-07 20:09:51 UTC (rev 9534)
+++ trunk/README 2014-01-07 20:22:47 UTC (rev 9535)
@@ -37,12 +37,13 @@
SYSTEM REQUIREMENTS
-------------------
Java 6.0 or later
- Previous versions of Java will not work. Gridarta uses Generics,
- auto-boxing, static imports, foreach loops, assertions, covariant return
- types and varargs quite a lot.
+ Previous versions of Java will not work. Gridarta uses Generics,
+ auto-boxing, foreach loops, assertions, covariant return types and varargs
+ quite a lot.
-Ant 1.7.0 or later
- Previous versions of Ant might work but are not tested.
+Gradle 1.6
+ Other versions of Gradle might work but are not tested. Alternatively, the
+ project can download Gradle automatically. See INSTALL for details.
FILE STRUCTURE
@@ -50,10 +51,6 @@
AUTHORS
People that contributed code to Gridarta. See also CREDITS, MAINTAINERS.
-build.xml
- The build file to build the project with Ant.
- See also INSTALL.
-
COPYING
Gridarta license conditions. Note: applies to Gridarta only, not third
party libraries.
@@ -61,37 +58,37 @@
CREDITS
List of project contributions. See also AUTHORS, MAINTAINERS.
-atrinik/
- Directory containing the Atrinik Map Editor / Atrinik specific code.
+INSTALL
+ Description of how to build and install Gridarta.
-build/ (generated)
-**/build/ (generated)
- These directories contain generated files.
+LICENSE
+ File with license information.
-build.developer (optional)
- Optional file for changing default settings of the Gradle build. You won't
- need to tweak this file for normal building. But if you want to set or
- override properties for build.gradle, this is the place to put them.
+MAINTAINERS
+ List of current project maintainers. See also AUTHORS, CREDITS.
-crossfire/
- Directory containing the Crossfire Map Editor / Crossfire specific code.
+NEWS
+ Project News.
-daimonin/
- Directory containing the Daimonin Map Editor / Daimonin specific code.
+README
+ This file
-dest/ (generated)
- The directory containing generated files.
+build.gradle
+ The build file to build the project with Gradle.
+ See also INSTALL.
-developer.properties (optional)
- Optional file for changing default settings of the Ant build. You won't
- need to tweak this file for normal building. But if you want to set or
- override properties for build.xml, this is the place to put them.
+build.xml
+ The build file to build the project with Ant. This file may or may not work
+ anymore. The preferred way to build the project is now Gradle.
-dist/ (generated)
- Generated directory containing distribution archives.
+build/ (generated)
+**/build/ (generated)
+ These directories contain generated files.
-INSTALL
- Description of how to build and install Gridarta.
+build.developer (optional)
+ Optional file for changing default settings of the Gradle build. You won't
+ need to tweak this file for normal building. But if you want to set or
+ override properties for build.gradle, this is the place to put them.
lib/
Directory containing third part libraries used to build Gridarta. Please
@@ -99,34 +96,22 @@
The licenses of the third party libraries are included in the lib/
directory.
-LICENSE
- File with license information.
+src/
+ Source files.
-MAINTAINERS
- List of current project maintainers. See also AUTHORS, CREDITS.
+src/atrinik/
+ Directory containing the Atrinik Map Editor / Atrinik specific code.
-NEWS
- Project News.
+src/crossfire/
+ Directory containing the Crossfire Map Editor / Crossfire specific code.
-project.properties
- File with automatically changed settings for Ant.
+src/daimonin/
+ Directory containing the Daimonin Map Editor / Daimonin specific code.
-README
- This file
-
-src/
- Source files.
-
-src/app/
+src/*/
Core Gridarta library sources.
-src/doc/
- Documentation source files (website).
-src/test/
- Unit test suite for automated unit testing of Gridarta.
-
-
BUILD / INSTALLATION
--------------------
See the file INSTALL.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-25 18:14:23
|
Revision: 9541
http://sourceforge.net/p/gridarta/code/9541
Author: akirschbaum
Date: 2014-01-25 18:14:15 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Add version numbers to some .jar file names.
Modified Paths:
--------------
trunk/build.xml
trunk/gridarta.ipr
trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
trunk/src/model/build.gradle
Added Paths:
-----------
trunk/lib/antmeat-0.3.jar
trunk/lib/antmeat-0.3.jar-LICENSE
trunk/lib/jdom-1.0.jar
trunk/lib/jdom-1.0.jar-LICENSE
Removed Paths:
-------------
trunk/lib/antmeat.jar
trunk/lib/antmeat.jar-LICENSE
trunk/lib/jdom.jar
trunk/lib/jdom.jar-LICENSE
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/build.xml 2014-01-25 18:14:15 UTC (rev 9541)
@@ -149,7 +149,7 @@
<path id="path.lib.japi-swing-tod" location="lib/japi-lib-swing-tod-0.1.0.jar"/>
<path id="path.lib.japi-util" location="lib/japi-lib-util-trunk-1410.jar"/>
<path id="path.lib.japi-xml" location="lib/japi-lib-xml-0.1.0.jar"/>
- <path id="path.lib.jdom" location="lib/jdom.jar"/>
+ <path id="path.lib.jdom" location="lib/jdom-1.0.jar"/>
<path id="path.lib.log4j" location="lib/log4j-1.2.13.jar"/>
<path id="path.lib.junit" location="lib/junit-4.2.jar"/>
<path id="path.lib.rsyntaxtextarea" location="lib/rsyntaxtextarea-1.5.1.jar"/>
@@ -160,7 +160,7 @@
<taskdef name="megaxslt" classpathref="xsltpath" classname="com.hujer.ant.tasks.megaxslt.MegaXsltTask"/>
<taskdef name="rgzip" classpath="lib/megaxslt.jar" classname="com.hujer.ant.tasks.rgzip.RGZipTask"/>
<taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task"/>
- <taskdef name="freshmeat" classpath="lib/antmeat.jar" classname="de.frewert.ant.freshmeat.Announcement">
+ <taskdef name="freshmeat" classpath="lib/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement">
<classpath>
<pathelement path="lib/xmlrpc-2.0.1.jar"/>
<pathelement path="lib/commons-codec-1.3.jar"/>
@@ -213,7 +213,7 @@
<include name="bsh-LICENSE"/>
<include name="japi.jar-LICENSE"/>
<include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom.jar-LICENSE"/>
+ <include name="jdom-1.0.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
@@ -222,7 +222,7 @@
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom.jar"/>
+ <zipfileset src="lib/jdom-1.0.jar"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
<zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
@@ -252,7 +252,7 @@
<include name="bsh-LICENSE"/>
<include name="japi.jar-LICENSE"/>
<include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom.jar-LICENSE"/>
+ <include name="jdom-1.0.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
@@ -261,7 +261,7 @@
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom.jar" excludes="META-INF/**"/>
+ <zipfileset src="lib/jdom-1.0.jar" excludes="META-INF/**"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
<zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
@@ -291,7 +291,7 @@
<include name="bsh-LICENSE"/>
<include name="japi.jar-LICENSE"/>
<include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom.jar-LICENSE"/>
+ <include name="jdom-1.0.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
<include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
@@ -300,7 +300,7 @@
<zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom.jar"/>
+ <zipfileset src="lib/jdom-1.0.jar"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
<zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/gridarta.ipr 2014-01-25 18:14:15 UTC (rev 9541)
@@ -2393,7 +2393,7 @@
</library>
<library name="jdom">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jdom.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jdom-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Copied: trunk/lib/antmeat-0.3.jar (from rev 9539, trunk/lib/antmeat.jar)
===================================================================
(Binary files differ)
Copied: trunk/lib/antmeat-0.3.jar-LICENSE (from rev 9539, trunk/lib/antmeat.jar-LICENSE)
===================================================================
--- trunk/lib/antmeat-0.3.jar-LICENSE (rev 0)
+++ trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Deleted: trunk/lib/antmeat.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/antmeat.jar-LICENSE
===================================================================
--- trunk/lib/antmeat.jar-LICENSE 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/lib/antmeat.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
Copied: trunk/lib/jdom-1.0.jar (from rev 9539, trunk/lib/jdom.jar)
===================================================================
(Binary files differ)
Copied: trunk/lib/jdom-1.0.jar-LICENSE (from rev 9539, trunk/lib/jdom.jar-LICENSE)
===================================================================
--- trunk/lib/jdom-1.0.jar-LICENSE (rev 0)
+++ trunk/lib/jdom-1.0.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
@@ -0,0 +1,49 @@
+Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+In addition, we request (but do not require) that you include in the
+end-user documentation provided with the redistribution and/or in the
+software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+Alternatively, the acknowledgment may be graphical using the logos
+available at http://www.jdom.org/images/logos.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+This software consists of voluntary contributions made by many
+individuals on behalf of the JDOM Project and was originally
+created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+on the JDOM Project, please see <http://www.jdom.org/>.
Deleted: trunk/lib/jdom.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jdom.jar-LICENSE
===================================================================
--- trunk/lib/jdom.jar-LICENSE 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/lib/jdom.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
@@ -1,49 +0,0 @@
-Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
- provided with the distribution.
-
-3. The name "JDOM" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact <request_AT_jdom_DOT_org>.
-
-4. Products derived from this software may not be called "JDOM", nor
- may "JDOM" appear in their name, without prior written permission
- from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
-In addition, we request (but do not require) that you include in the
-end-user documentation provided with the redistribution and/or in the
-software itself an acknowledgement equivalent to the following:
- "This product includes software developed by the
- JDOM Project (http://www.jdom.org/)."
-Alternatively, the acknowledgment may be graphical using the logos
-available at http://www.jdom.org/images/logos.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the JDOM Project and was originally
-created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
-Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
-on the JDOM Project, please see <http://www.jdom.org/>.
Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-25 18:14:15 UTC (rev 9541)
@@ -986,7 +986,7 @@
license.5.title=Log4J
license.5.file=log4j-1.2.13.jar-LICENSE
license.6.title=JDOM
-license.6.file=jdom.jar-LICENSE
+license.6.file=jdom-1.0.jar-LICENSE
license.7.title=GNU getopt
license.7.file=java-getopt-1.0.13.jar-LICENSE
license.8.title=RSyntaxTextArea
Modified: trunk/src/model/build.gradle
===================================================================
--- trunk/src/model/build.gradle 2014-01-25 16:00:05 UTC (rev 9540)
+++ trunk/src/model/build.gradle 2014-01-25 18:14:15 UTC (rev 9541)
@@ -7,7 +7,7 @@
dependencies {
compile name: 'annotations', version: '0.0'
compile name: 'japi-lib-swing-misc', version: 'trunk-1398'
- compile name: 'jdom', version: '0.0'
+ compile name: 'jdom', version: '1.0'
compile name: 'log4j', version: '1.2.13'
compile project(':src:utils')
testCompile name: 'junit', version: '4.2'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-26 18:26:46
|
Revision: 9542
http://sourceforge.net/p/gridarta/code/9542
Author: akirschbaum
Date: 2014-01-26 18:26:26 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Convert flat file repository to Maven repository.
Modified Paths:
--------------
trunk/build.gradle
trunk/build.xml
trunk/gridarta.ipr
trunk/src/atrinik/build.gradle
trunk/src/crossfire/build.gradle
trunk/src/daimonin/build.gradle
trunk/src/gridarta/build.gradle
trunk/src/model/build.gradle
trunk/src/plugin/build.gradle
trunk/src/preferences/build.gradle
trunk/src/project/build.gradle
trunk/src/utils/build.gradle
Added Paths:
-----------
trunk/repo/
trunk/repo/annotations/
trunk/repo/annotations/0.0/
trunk/repo/annotations/0.0/annotations-0.0.jar
trunk/repo/antmeat/
trunk/repo/antmeat/0.3/
trunk/repo/antmeat/0.3/antmeat-0.3.jar
trunk/repo/antmeat/0.3/antmeat-0.3.jar-LICENSE
trunk/repo/bsh/
trunk/repo/bsh/bsh-LICENSE
trunk/repo/bsh/bsh-classgen/
trunk/repo/bsh/bsh-classgen/2.0b4/
trunk/repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar
trunk/repo/bsh/bsh-commands/
trunk/repo/bsh/bsh-commands/2.0b4/
trunk/repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar
trunk/repo/bsh/bsh-core/
trunk/repo/bsh/bsh-core/2.0b4/
trunk/repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar
trunk/repo/bsh/bsh-util/
trunk/repo/bsh/bsh-util/2.0b4/
trunk/repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar
trunk/repo/checkstyle-all/
trunk/repo/checkstyle-all/5.0/
trunk/repo/checkstyle-all/5.0/checkstyle-all-5.0.jar
trunk/repo/checkstyle-all/5.0/checkstyle-all-5.0.jar-LICENSE
trunk/repo/japi-lib/
trunk/repo/japi-lib/japi-lib-lang/
trunk/repo/japi-lib/japi-lib-lang/0.1.0/
trunk/repo/japi-lib/japi-lib-lang/0.1.0/japi-lib-lang-0.1.0.jar
trunk/repo/japi-lib/japi-lib-swing-about/
trunk/repo/japi-lib/japi-lib-swing-about/0.1.0/
trunk/repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar
trunk/repo/japi-lib/japi-lib-swing-action/
trunk/repo/japi-lib/japi-lib-swing-action/0.1.0/
trunk/repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar
trunk/repo/japi-lib/japi-lib-swing-extlib/
trunk/repo/japi-lib/japi-lib-swing-extlib/0.1.0/
trunk/repo/japi-lib/japi-lib-swing-extlib/0.1.0/japi-lib-swing-extlib-0.1.0.jar
trunk/repo/japi-lib/japi-lib-swing-misc/
trunk/repo/japi-lib/japi-lib-swing-misc/trunk-1398/
trunk/repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar
trunk/repo/japi-lib/japi-lib-swing-prefs/
trunk/repo/japi-lib/japi-lib-swing-prefs/0.1.0/
trunk/repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar
trunk/repo/japi-lib/japi-lib-swing-tod/
trunk/repo/japi-lib/japi-lib-swing-tod/0.1.0/
trunk/repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar
trunk/repo/japi-lib/japi-lib-util/
trunk/repo/japi-lib/japi-lib-util/trunk-1410/
trunk/repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar
trunk/repo/japi-lib/japi-lib-xml/
trunk/repo/japi-lib/japi-lib-xml/0.1.0/
trunk/repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar
trunk/repo/japi-lib/japi.jar-LICENSE
trunk/repo/java-getopt/
trunk/repo/java-getopt/1.0.13/
trunk/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar
trunk/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE
trunk/repo/jdom/
trunk/repo/jdom/1.0/
trunk/repo/jdom/1.0/jdom-1.0.jar
trunk/repo/jdom/1.0/jdom-1.0.jar-LICENSE
trunk/repo/junit/
trunk/repo/junit/4.2/
trunk/repo/junit/4.2/junit-4.2.jar
trunk/repo/junit/4.2/junit-4.2.jar-LICENSE
trunk/repo/log4j/
trunk/repo/log4j/1.2.13/
trunk/repo/log4j/1.2.13/log4j-1.2.13.jar
trunk/repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE
trunk/repo/rsyntaxtextarea/
trunk/repo/rsyntaxtextarea/1.5.1/
trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1-README
trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar
trunk/repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE
Removed Paths:
-------------
trunk/lib/annotations-0.0.jar
trunk/lib/antmeat-0.3.jar
trunk/lib/antmeat-0.3.jar-LICENSE
trunk/lib/bsh-LICENSE
trunk/lib/bsh-classgen-2.0b4.jar
trunk/lib/bsh-commands-2.0b4.jar
trunk/lib/bsh-core-2.0b4.jar
trunk/lib/bsh-util-2.0b4.jar
trunk/lib/checkstyle-all-5.0.jar
trunk/lib/checkstyle-all-5.0.jar-LICENSE
trunk/lib/japi-lib-lang-0.1.0.jar
trunk/lib/japi-lib-swing-about-0.1.0.jar
trunk/lib/japi-lib-swing-action-0.1.0.jar
trunk/lib/japi-lib-swing-extlib-0.1.0.jar
trunk/lib/japi-lib-swing-misc-trunk-1398.jar
trunk/lib/japi-lib-swing-prefs-0.1.0.jar
trunk/lib/japi-lib-swing-tod-0.1.0.jar
trunk/lib/japi-lib-util-trunk-1410.jar
trunk/lib/japi-lib-xml-0.1.0.jar
trunk/lib/japi.jar-LICENSE
trunk/lib/java-getopt-1.0.13.jar
trunk/lib/java-getopt-1.0.13.jar-LICENSE
trunk/lib/jdom-1.0.jar
trunk/lib/jdom-1.0.jar-LICENSE
trunk/lib/junit-4.2.jar
trunk/lib/junit-4.2.jar-LICENSE
trunk/lib/log4j-1.2.13.jar
trunk/lib/log4j-1.2.13.jar-LICENSE
trunk/lib/rsyntaxtextarea-1.5.1-README
trunk/lib/rsyntaxtextarea-1.5.1.jar
trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE
Modified: trunk/build.gradle
===================================================================
--- trunk/build.gradle 2014-01-25 18:14:15 UTC (rev 9541)
+++ trunk/build.gradle 2014-01-26 18:26:26 UTC (rev 9542)
@@ -6,8 +6,8 @@
// Add lib directory as repository for .jar files.
allprojects {
repositories {
- flatDir {
- dirs rootProject.file('lib')
+ maven {
+ url "$rootDir/repo"
}
}
}
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2014-01-25 18:14:15 UTC (rev 9541)
+++ trunk/build.xml 2014-01-26 18:26:26 UTC (rev 9542)
@@ -138,29 +138,30 @@
<pathelement location="${build.dir}/utils/test"/>
</path>
- <path id="path.lib.annotations" location="lib/annotations-0.0.jar"/>
- <path id="path.lib.bsh-core" location="lib/bsh-core-2.0b4.jar"/>
- <path id="path.lib.bsh-util" location="lib/bsh-util-2.0b4.jar"/>
- <path id="path.lib.getopt" location="lib/java-getopt-1.0.13.jar"/>
- <path id="path.lib.japi-swing-about" location="lib/japi-lib-swing-about-0.1.0.jar"/>
- <path id="path.lib.japi-swing-action" location="lib/japi-lib-swing-action-0.1.0.jar"/>
- <path id="path.lib.japi-swing-misc" location="lib/japi-lib-swing-misc-trunk-1398.jar"/>
- <path id="path.lib.japi-swing-prefs" location="lib/japi-lib-swing-prefs-0.1.0.jar"/>
- <path id="path.lib.japi-swing-tod" location="lib/japi-lib-swing-tod-0.1.0.jar"/>
- <path id="path.lib.japi-util" location="lib/japi-lib-util-trunk-1410.jar"/>
- <path id="path.lib.japi-xml" location="lib/japi-lib-xml-0.1.0.jar"/>
- <path id="path.lib.jdom" location="lib/jdom-1.0.jar"/>
- <path id="path.lib.log4j" location="lib/log4j-1.2.13.jar"/>
- <path id="path.lib.junit" location="lib/junit-4.2.jar"/>
- <path id="path.lib.rsyntaxtextarea" location="lib/rsyntaxtextarea-1.5.1.jar"/>
+ <path id="path.lib.annotations" location="repo/annotations/0.0/annotations-0.0.jar"/>
+ <path id="path.lib.bsh-core" location="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar"/>
+ <path id="path.lib.bsh-util" location="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar"/>
+ <path id="path.lib.getopt" location="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
+ <path id="path.lib.japi-swing-about" location="repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar"/>
+ <path id="path.lib.japi-swing-action" location="repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar"/>
+ <path id="path.lib.japi-swing-misc" location="repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar"/>
+ <path id="path.lib.japi-swing-prefs" location="repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar"/>
+ <path id="path.lib.japi-swing-tod" location="repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar"/>
+ <path id="path.lib.japi-util" location="repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar"/>
+ <path id="path.lib.japi-xml" location="repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar"/>
+ <path id="path.lib.jdom" location="repo/jdom/1.0/jdom-1.0.jar"/>
+ <path id="path.lib.log4j" location="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <path id="path.lib.junit" location="repo/junit/4.2/junit-4.2.jar"/>
+ <path id="path.lib.rsyntaxtextarea" location="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
<path id="xsltpath">
<fileset dir="lib" includes="**/*.jar"/>
+ <fileset dir="repo" includes="**/*.jar"/>
</path>
<taskdef name="megaxslt" classpathref="xsltpath" classname="com.hujer.ant.tasks.megaxslt.MegaXsltTask"/>
<taskdef name="rgzip" classpath="lib/megaxslt.jar" classname="com.hujer.ant.tasks.rgzip.RGZipTask"/>
<taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task"/>
- <taskdef name="freshmeat" classpath="lib/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement">
+ <taskdef name="freshmeat" classpath="repo/antmeat/0.3/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement">
<classpath>
<pathelement path="lib/xmlrpc-2.0.1.jar"/>
<pathelement path="lib/commons-codec-1.3.jar"/>
@@ -209,23 +210,21 @@
<fileset dir="src/atrinik/lib">
<include name="*-LICENSE"/>
</fileset>
- <fileset dir="lib">
- <include name="bsh-LICENSE"/>
- <include name="japi.jar-LICENSE"/>
- <include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom-1.0.jar-LICENSE"/>
- <include name="log4j-1.2.13.jar-LICENSE"/>
- <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- </fileset>
- <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom-1.0.jar"/>
- <zipfileset src="lib/log4j-1.2.13.jar"/>
- <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="lib/" includes="japi-*.jar"/>
+ <fileset file="repo/bsh/bsh-LICENSE"/>
+ <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
+ <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
+ <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
+ <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
+ <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/>
+ <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
+ <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor"/>
<attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
@@ -248,23 +247,21 @@
<fileset dir="src/crossfire/lib">
<include name="*-LICENSE"/>
</fileset>
- <fileset dir="lib">
- <include name="bsh-LICENSE"/>
- <include name="japi.jar-LICENSE"/>
- <include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom-1.0.jar-LICENSE"/>
- <include name="log4j-1.2.13.jar-LICENSE"/>
- <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- </fileset>
- <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom-1.0.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/log4j-1.2.13.jar"/>
- <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="lib/" includes="japi-*.jar"/>
+ <fileset file="repo/bsh/bsh-LICENSE"/>
+ <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
+ <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
+ <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
+ <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
+ <zipfileset src="repo/jdom/1.0/jdom-1.0.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
+ <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor"/>
<attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
@@ -287,23 +284,21 @@
<fileset dir="src/daimonin/lib">
<include name="*-LICENSE"/>
</fileset>
- <fileset dir="lib">
- <include name="bsh-LICENSE"/>
- <include name="japi.jar-LICENSE"/>
- <include name="java-getopt-1.0.13.jar-LICENSE"/>
- <include name="jdom-1.0.jar-LICENSE"/>
- <include name="log4j-1.2.13.jar-LICENSE"/>
- <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- </fileset>
- <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="lib/java-getopt-1.0.13.jar"/>
- <zipfileset src="lib/jdom-1.0.jar"/>
- <zipfileset src="lib/log4j-1.2.13.jar"/>
- <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="lib/" includes="japi-*.jar"/>
+ <fileset file="repo/bsh/bsh-LICENSE"/>
+ <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
+ <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
+ <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
+ <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
+ <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
+ <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/>
+ <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
+ <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor"/>
<attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
@@ -719,6 +714,7 @@
<fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
<pathelement path="${user.javadoc.javasrc}"/>
@@ -917,7 +913,7 @@
</target>
<target name="checkstyle" description="Runs checkstyle to style-check the source code">
- <taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"/>
+ <taskdef resource="checkstyletask.properties" classpath="repo/checkstyle-all/5.0/checkstyle-all-5.0.jar"/>
<mkdir dir="${build.dir}/doc"/>
<checkstyle config="config/checkstyle/checkstyle.xml" failOnViolation="true">
<formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
@@ -967,6 +963,7 @@
<fileset dir="src/daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="src/crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/>
<fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
+ <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/>
</classpath>
<sourcepath>
<pathelement path="${user.javadoc.javasrc}"/>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-01-25 18:14:15 UTC (rev 9541)
+++ trunk/gridarta.ipr 2014-01-26 18:26:26 UTC (rev 9542)
@@ -2295,126 +2295,126 @@
<component name="libraryTable">
<library name="annotations">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/annotations-0.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/rep/annotations/0.0/annotations-0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="bsh-commands">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/bsh-commands-2.0b4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="bsh-core">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/bsh-core-2.0b4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="bsh-util">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/bsh-util-2.0b4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-lang">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-lang-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-lang/0.1.0/japi-lib-lang-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-about">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-about-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-action">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-action-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-extlib">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-extlib-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-extlib/0.1.0/japi-lib-swing-extlib-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-misc">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-misc-trunk-1398.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-prefs">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-prefs-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-swing-tod">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-tod-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-util">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-util-trunk-1410.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="japi-lib-xml">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/japi-lib-xml-0.1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="java-getopt">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/java-getopt-1.0.13.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/java-getopt/1.0.13/java-getopt-1.0.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="jdom">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jdom-1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/jdom/1.0/jdom-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="junit">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/junit-4.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/junit/4.2/junit-4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="log4j">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.13.jar!/" />
+ <root url="jar://$PROJECT_DIR$/repo/log4j/1.2.13/log4j-1.2.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="rsyntaxtextarea">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/rsyntaxtextarea-1.5.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../gridarta.tmprepo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Deleted: trunk/lib/annotations-0.0.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/antmeat-0.3.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/antmeat-0.3.jar-LICENSE
===================================================================
--- trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
+++ trunk/lib/antmeat-0.3.jar-LICENSE 2014-01-26 18:26:26 UTC (rev 9542)
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
Deleted: trunk/lib/bsh-LICENSE
===================================================================
--- trunk/lib/bsh-LICENSE 2014-01-25 18:14:15 UTC (rev 9541)
+++ trunk/lib/bsh-LICENSE 2014-01-26 18:26:26 UTC (rev 9542)
@@ -1,502 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR ...
[truncated message content] |
|
From: <aki...@us...> - 2014-01-26 18:41:30
|
Revision: 9543
http://sourceforge.net/p/gridarta/code/9543
Author: akirschbaum
Date: 2014-01-26 18:41:23 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Move jlfgr to repository.
Modified Paths:
--------------
trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
Added Paths:
-----------
trunk/repo/jlfgr/
trunk/repo/jlfgr/1.0/
trunk/repo/jlfgr/1.0/jlfgr-1.0.jar
trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE
Removed Paths:
-------------
trunk/src/atrinik/lib/
trunk/src/crossfire/lib/
trunk/src/daimonin/lib/
Copied: trunk/repo/jlfgr/1.0/jlfgr-1.0.jar (from rev 9542, trunk/src/daimonin/lib/jlfgr-1_0.jar)
===================================================================
(Binary files differ)
Copied: trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE (from rev 9542, trunk/src/daimonin/lib/jlfgr-1_0.jar-LICENSE)
===================================================================
--- trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE (rev 0)
+++ trunk/repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE 2014-01-26 18:41:23 UTC (rev 9543)
@@ -0,0 +1,10 @@
+Copyright 2000 by Sun Microsystems, Inc. All Rights Reserved.
+
+Sun grants you ("Licensee") a non-exclusive, royalty free, license to use, and redistribute this software graphics artwork, as individual graphics or as a collection, as part of software code or programs that you develop, provided that i) this copyright notice and license accompany the software graphics artwork; and ii) you do not utilize the software graphics artwork in a manner which is disparaging to Sun. Unless enforcement is prohibited by applicable law, you may not modify the graphics, and must use them true to color and unmodified in every way.
+
+This software graphics artwork is provided "AS IS," without a warranty of any kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS ARTWORK.
+
+IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE GRAPHICS ARTWORK, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+If any of the above provisions are held to be in violation of applicable law, void, or unenforceable in any jurisdiction, then such provisions are waived to the extent necessary for this Disclaimer to be otherwise enforceable in such jurisdiction.
+
Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 18:26:26 UTC (rev 9542)
+++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 18:41:23 UTC (rev 9543)
@@ -63,7 +63,7 @@
license.1.file=License
license.2.file=japi.jar-LICENSE
-license.3.file=jlfgr-1_0.jar-LICENSE
+license.3.file=jlfgr-1.0.jar-LICENSE
license.4.file=log4j-1.2.13.jar-LICENSE
about.logo=icons/atrinikLogoSmall.png
Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 18:26:26 UTC (rev 9542)
+++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 18:41:23 UTC (rev 9543)
@@ -63,7 +63,7 @@
license.1.file=License
license.2.file=japi.jar-LICENSE
-license.3.file=jlfgr-1_0.jar-LICENSE
+license.3.file=jlfgr-1.0.jar-LICENSE
license.4.file=log4j-1.2.13.jar-LICENSE
about.logo=icons/daimoninLogoSmall.png
Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 18:26:26 UTC (rev 9542)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 18:41:23 UTC (rev 9543)
@@ -980,7 +980,7 @@
license.2.title=JAPI
license.2.file=japi.jar-LICENSE
license.3.title=SUN Icons
-license.3.file=jlfgr-1_0.jar-LICENSE
+license.3.file=jlfgr-1.0.jar-LICENSE
license.4.title=BeanShell
license.4.file=bsh-LICENSE
license.5.title=Log4J
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-26 19:24:01
|
Revision: 9544
http://sourceforge.net/p/gridarta/code/9544
Author: akirschbaum
Date: 2014-01-26 19:23:54 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Properly display license text in About dialog.
Modified Paths:
--------------
trunk/build.xml
trunk/src/atrinik/build.gradle
trunk/src/crossfire/build.gradle
trunk/src/daimonin/build.gradle
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2014-01-26 18:41:23 UTC (rev 9543)
+++ trunk/build.xml 2014-01-26 19:23:54 UTC (rev 9544)
@@ -207,13 +207,11 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="src/atrinik/lib">
- <include name="*-LICENSE"/>
- </fileset>
<fileset file="repo/bsh/bsh-LICENSE"/>
<fileset file="repo/japi-lib/japi.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
<fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
<fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
<zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
@@ -244,13 +242,11 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="src/crossfire/lib">
- <include name="*-LICENSE"/>
- </fileset>
<fileset file="repo/bsh/bsh-LICENSE"/>
<fileset file="repo/japi-lib/japi.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
<fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
<fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
<zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
@@ -281,13 +277,11 @@
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
- <fileset dir="src/daimonin/lib">
- <include name="*-LICENSE"/>
- </fileset>
<fileset file="repo/bsh/bsh-LICENSE"/>
<fileset file="repo/japi-lib/japi.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
+ <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
<fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
<fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
<zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
Modified: trunk/src/atrinik/build.gradle
===================================================================
--- trunk/src/atrinik/build.gradle 2014-01-26 18:41:23 UTC (rev 9543)
+++ trunk/src/atrinik/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
@@ -27,6 +27,13 @@
manifest.attributes 'Main-Class': mainClassName
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
+ from new File(rootDir, 'repo/bsh/bsh-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
+ from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
+ from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
doFirst {
// The following must be executed in doFirst since the configuration
// has not been initialized at configuration time.
Modified: trunk/src/crossfire/build.gradle
===================================================================
--- trunk/src/crossfire/build.gradle 2014-01-26 18:41:23 UTC (rev 9543)
+++ trunk/src/crossfire/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
@@ -27,6 +27,13 @@
manifest.attributes 'Main-Class': mainClassName
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
+ from new File(rootDir, 'repo/bsh/bsh-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
+ from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
+ from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
doFirst {
// The following must be executed in doFirst since the configuration
// has not been initialized at configuration time.
Modified: trunk/src/daimonin/build.gradle
===================================================================
--- trunk/src/daimonin/build.gradle 2014-01-26 18:41:23 UTC (rev 9543)
+++ trunk/src/daimonin/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
@@ -27,6 +27,13 @@
manifest.attributes 'Main-Class': mainClassName
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
+ from new File(rootDir, 'repo/bsh/bsh-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
+ from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
+ from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
+ from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
doFirst {
// The following must be executed in doFirst since the configuration
// has not been initialized at configuration time.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-01-26 19:27:09
|
Revision: 9545
http://sourceforge.net/p/gridarta/code/9545
Author: akirschbaum
Date: 2014-01-26 19:27:03 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Rename japi.jar-LICENSE to japi-lib.jar-LICENSE.
Modified Paths:
--------------
trunk/build.xml
trunk/src/atrinik/build.gradle
trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
trunk/src/crossfire/build.gradle
trunk/src/daimonin/build.gradle
trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
Added Paths:
-----------
trunk/repo/japi-lib/japi-lib.jar-LICENSE
Removed Paths:
-------------
trunk/repo/japi-lib/japi.jar-LICENSE
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/build.xml 2014-01-26 19:27:03 UTC (rev 9545)
@@ -208,7 +208,7 @@
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
<fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
<fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
@@ -243,7 +243,7 @@
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
<fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
<fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
@@ -278,7 +278,7 @@
<fileset dir="${build.dir}" includes="build.properties"/>
<fileset file="COPYING"/>
<fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi.jar-LICENSE"/>
+ <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
<fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
<fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
<fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
Copied: trunk/repo/japi-lib/japi-lib.jar-LICENSE (from rev 9543, trunk/repo/japi-lib/japi.jar-LICENSE)
===================================================================
--- trunk/repo/japi-lib/japi-lib.jar-LICENSE (rev 0)
+++ trunk/repo/japi-lib/japi-lib.jar-LICENSE 2014-01-26 19:27:03 UTC (rev 9545)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Deleted: trunk/repo/japi-lib/japi.jar-LICENSE
===================================================================
--- trunk/repo/japi-lib/japi.jar-LICENSE 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/repo/japi-lib/japi.jar-LICENSE 2014-01-26 19:27:03 UTC (rev 9545)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Modified: trunk/src/atrinik/build.gradle
===================================================================
--- trunk/src/atrinik/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/atrinik/build.gradle 2014-01-26 19:27:03 UTC (rev 9545)
@@ -28,7 +28,7 @@
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
from new File(rootDir, 'repo/bsh/bsh-LICENSE')
- from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE')
from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties 2014-01-26 19:27:03 UTC (rev 9545)
@@ -62,7 +62,7 @@
license.1.file=License
-license.2.file=japi.jar-LICENSE
+license.2.file=japi-lib.jar-LICENSE
license.3.file=jlfgr-1.0.jar-LICENSE
license.4.file=log4j-1.2.13.jar-LICENSE
Modified: trunk/src/crossfire/build.gradle
===================================================================
--- trunk/src/crossfire/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/crossfire/build.gradle 2014-01-26 19:27:03 UTC (rev 9545)
@@ -28,7 +28,7 @@
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
from new File(rootDir, 'repo/bsh/bsh-LICENSE')
- from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE')
from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
Modified: trunk/src/daimonin/build.gradle
===================================================================
--- trunk/src/daimonin/build.gradle 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/daimonin/build.gradle 2014-01-26 19:27:03 UTC (rev 9545)
@@ -28,7 +28,7 @@
manifest.attributes 'SplashScreen-Image': 'icons/CFIntro.gif'
from sourceSets.main.output
from new File(rootDir, 'repo/bsh/bsh-LICENSE')
- from new File(rootDir, 'repo/japi-lib/japi.jar-LICENSE')
+ from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE')
from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties 2014-01-26 19:27:03 UTC (rev 9545)
@@ -62,7 +62,7 @@
license.1.file=License
-license.2.file=japi.jar-LICENSE
+license.2.file=japi-lib.jar-LICENSE
license.3.file=jlfgr-1.0.jar-LICENSE
license.4.file=log4j-1.2.13.jar-LICENSE
Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 19:23:54 UTC (rev 9544)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-01-26 19:27:03 UTC (rev 9545)
@@ -978,7 +978,7 @@
license.1.title=Gridarta
license.1.file=COPYING
license.2.title=JAPI
-license.2.file=japi.jar-LICENSE
+license.2.file=japi-lib.jar-LICENSE
license.3.title=SUN Icons
license.3.file=jlfgr-1.0.jar-LICENSE
license.4.title=BeanShell
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-02-16 20:21:55
|
Revision: 9579
http://sourceforge.net/p/gridarta/code/9579
Author: akirschbaum
Date: 2014-02-16 20:21:46 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
Rename constant names.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectArchesAction.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/commands/CollectArchesCommand.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/autovalidator/AutoValidator.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/help/HtmlPane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/NewMapDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsManager.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/filter/FilterMenuEntry.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/MapPreviewAccessory.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/AbstractMapView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/viewaction/ViewActions.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapimagecache/MapImageCacheEntry.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapmenu/MapMenu.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapmenu/MapMenuLoader.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/misc/MainView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/misc/MapPreview.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeChooserView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserView.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/scripts/ScriptArchDataUtils.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/spells/SpellsUtils.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/utils/DirectionLayout.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/utils/GSplitPane.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/utils/tabbedpanel/Tab.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/utils/tabbedpanel/TabbedPanel.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/mainactions/DefaultExiter.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/updater/Updater.java
trunk/src/gridarta/src/main/java/net/sf/gridarta/updater/UpdaterManager.java
trunk/src/model/src/main/java/net/sf/gridarta/model/anim/DefaultAnimationObject.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
trunk/src/model/src/main/java/net/sf/gridarta/model/artifact/ArtifactParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/autojoin/AutojoinList.java
trunk/src/model/src/main/java/net/sf/gridarta/model/exitconnector/DefaultExitConnectorModel.java
trunk/src/model/src/main/java/net/sf/gridarta/model/face/AbstractFaceProvider.java
trunk/src/model/src/main/java/net/sf/gridarta/model/face/DefaultFaceObjects.java
trunk/src/model/src/main/java/net/sf/gridarta/model/filter/AbstractFilterConfig.java
trunk/src/model/src/main/java/net/sf/gridarta/model/filter/NamedFilter.java
trunk/src/model/src/main/java/net/sf/gridarta/model/filter/NamedFilterConfig.java
trunk/src/model/src/main/java/net/sf/gridarta/model/floodfill/FillUtils.java
trunk/src/model/src/main/java/net/sf/gridarta/model/floodfill/FloodFill.java
trunk/src/model/src/main/java/net/sf/gridarta/model/gameobject/MultiPositionData.java
trunk/src/model/src/main/java/net/sf/gridarta/model/index/MapsIndexer.java
trunk/src/model/src/main/java/net/sf/gridarta/model/io/AbstractGameObjectParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapmodel/DefaultMapModel.java
trunk/src/model/src/main/java/net/sf/gridarta/model/mapviewsettings/DefaultMapViewSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatchersParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/pickmapsettings/DefaultPickmapSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/resource/AbstractCollectedResourcesReader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/resource/AbstractResourcesReader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/scripts/ScriptUtils.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/AbstractDefaultProjectSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/settings/DefaultEditorSettings.java
trunk/src/model/src/main/java/net/sf/gridarta/model/smoothface/SmoothFacesLoader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/spells/ArchetypeSetSpellLoader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/spells/Spells.java
trunk/src/model/src/main/java/net/sf/gridarta/model/spells/XMLSpellLoader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/treasurelist/TreasureLoader.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/DefaultValidatorPreferences.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java
trunk/src/model/src/main/java/net/sf/gridarta/model/validation/checks/BlockedSpawnPointChecker.java
trunk/src/model/src/test/java/net/sf/gridarta/model/errorview/TestErrorView.java
trunk/src/model/src/test/java/net/sf/gridarta/model/mapcursor/MapCursorTest.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/Plugin.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModel.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModelLoader.java
trunk/src/plugin/src/main/java/net/sf/gridarta/plugin/PluginModelParser.java
trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/Codec.java
trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/FilePreferences.java
trunk/src/preferences/src/main/java/net/sf/gridarta/preferences/Storage.java
trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/InputHandler.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/actions/Paste.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/DaimoninAITokenMarker.java
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarkerFactory.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/FileFilters.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/GuiFileFilters.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/ImageUtils.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/ProcessRunner.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/RandomUtils.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/ResourceIcons.java
trunk/src/utils/src/test/java/net/sf/gridarta/utils/XteaTest.java
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/gridarta.ipr 2014-02-16 20:21:46 UTC (rev 9579)
@@ -390,7 +390,7 @@
<inspection_tool class="ConstantJUnitAssertArgument" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ConstantMathCall" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ConstantNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
- <option name="onlyCheckImmutables" value="true" />
+ <option name="onlyCheckImmutables" value="false" />
<option name="m_regex" value="[A-Z_\d]*" />
<option name="m_minLength" value="1" />
<option name="m_maxLength" value="64" />
Modified: trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/atrinik/src/main/java/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -152,7 +152,7 @@
/**
* The Logger for printing log messages.
*/
- private static final Category log = Logger.getLogger(DefaultEditorFactory.class);
+ private static final Category LOG = Logger.getLogger(DefaultEditorFactory.class);
/**
* The {@link IsoMapSquareInfo} instance.
@@ -335,7 +335,7 @@
try {
attributeRangeChecker.add(matcher, name, displayName, minValue, maxValue);
} catch (final InvalidCheckException ex) {
- log.warn(ex.getMessage());
+ LOG.warn(ex.getMessage());
}
}
@@ -484,7 +484,7 @@
@NotNull
@Override
public FileFilter getScriptFileFilter() {
- return GuiFileFilters.pythonFileFilter;
+ return GuiFileFilters.PYTHON_FILE_FILTER;
}
/**
@@ -571,7 +571,7 @@
@NotNull
@Override
public FileFilter getMapFileFilter() {
- return GuiFileFilters.mapFileFilter;
+ return GuiFileFilters.MAP_FILE_FILTER;
}
/**
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -61,7 +61,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(FlatMapRenderer.class);
+ private static final Category LOG = Logger.getLogger(FlatMapRenderer.class);
/**
* Serial Version UID.
@@ -263,8 +263,8 @@
backBufferRef = null;
- if (log.isDebugEnabled()) {
- log.debug("Creating a backbuffer of size " + size.width + "x" + size.height + ".");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating a backbuffer of size " + size.width + "x" + size.height + ".");
}
final BufferedImage newBackBuffer;
//The backbuffer is optional
@@ -272,8 +272,8 @@
try {
newBackBuffer = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
} catch (final OutOfMemoryError ignore) {
- if (log.isDebugEnabled()) {
- log.debug("out of memory creating new back buffer");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("out of memory creating new back buffer");
}
return;
}
@@ -371,8 +371,8 @@
final BufferedImage backBuffer = backBufferRef.get();
if (backBuffer == null) {
- if (log.isDebugEnabled()) {
- log.debug("lost back buffer");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("lost back buffer");
}
backBufferRef = null;
return null;
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -41,19 +41,19 @@
public class SmoothingRenderer {
@NotNull
- private static final int[] dx = { 1, 2, 2, 2, 1, 0, 0, 0, };
+ private static final int[] DX = { 1, 2, 2, 2, 1, 0, 0, 0, };
@NotNull
- private static final int[] dy = { 0, 0, 1, 2, 2, 2, 1, 0, };
+ private static final int[] DY = { 0, 0, 1, 2, 2, 2, 1, 0, };
@NotNull
- private static final int[] bWeights = { 2, 0, 4, 0, 8, 0, 1, 0, };
+ private static final int[] B_WEIGHTS = { 2, 0, 4, 0, 8, 0, 1, 0, };
@NotNull
- private static final int[] cWeights = { 0, 2, 0, 4, 0, 8, 0, 1, };
+ private static final int[] C_WEIGHTS = { 0, 2, 0, 4, 0, 8, 0, 1, };
@NotNull
- private static final int[] bcExclude = { 1 + 2, /*north exclude northwest (bit0) and northeast(bit1)*/
+ private static final int[] BC_EXCLUDE = { 1 + 2, /*north exclude northwest (bit0) and northeast(bit1)*/
0, 2 + 4, /*east exclude northeast and southeast*/
0, 4 + 8, /*and so on*/
0, 8 + 1, 0 };
@@ -146,7 +146,7 @@
/*surrounding nodes having smoothlevel >0 found*/
/*below is ripped and adapted from sdl client smooth renderer*/
for (int i = 0; i < 8; i++) {
- final net.sf.gridarta.model.gameobject.GameObject<?, ?, ?> node = layerNode[dx[i]][dy[i]];
+ final net.sf.gridarta.model.gameobject.GameObject<?, ?, ?> node = layerNode[DX[i]][DY[i]];
if (node == null) {
sLevels[i] = 0;
//false warning: cannot annotate with @Nullable
@@ -193,11 +193,11 @@
for (int i = 0; i < 8; i++) { /*check all nearby squares*/
if (sLevels[i] == sLevels[lowest] && sFaces[i] == smoothFace) {
partDone[i] = true;
- weight += bWeights[i];
- weightC &= ~bcExclude[i];
+ weight += B_WEIGHTS[i];
+ weightC &= ~BC_EXCLUDE[i];
} else {
/*must remove the weight of a corner if not in smoothing*/
- weightC &= ~cWeights[i];
+ weightC &= ~C_WEIGHTS[i];
}
}
if (smoothFace == null) {
Modified: trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/crossfire/src/main/java/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -375,7 +375,7 @@
@NotNull
@Override
public FileFilter getScriptFileFilter() {
- return GuiFileFilters.pythonFileFilter;
+ return GuiFileFilters.PYTHON_FILE_FILTER;
}
/**
@@ -462,7 +462,7 @@
@NotNull
@Override
public FileFilter getMapFileFilter() {
- return GuiFileFilters.mapFileFilter;
+ return GuiFileFilters.MAP_FILE_FILTER;
}
/**
Modified: trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/daimonin/src/main/java/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -151,7 +151,7 @@
/**
* The Logger for printing log messages.
*/
- private static final Category log = Logger.getLogger(DefaultEditorFactory.class);
+ private static final Category LOG = Logger.getLogger(DefaultEditorFactory.class);
/**
* The {@link IsoMapSquareInfo} instance.
@@ -334,7 +334,7 @@
try {
attributeRangeChecker.add(matcher, name, displayName, minValue, maxValue);
} catch (final InvalidCheckException ex) {
- log.warn(ex.getMessage());
+ LOG.warn(ex.getMessage());
}
}
@@ -483,7 +483,7 @@
@NotNull
@Override
public FileFilter getScriptFileFilter() {
- return GuiFileFilters.luaFileFilter;
+ return GuiFileFilters.LUA_FILE_FILTER;
}
/**
@@ -570,7 +570,7 @@
@NotNull
@Override
public FileFilter getMapFileFilter() {
- return GuiFileFilters.mapFileFilter;
+ return GuiFileFilters.MAP_FILE_FILTER;
}
/**
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectArchesAction.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectArchesAction.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/CollectArchesAction.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -59,7 +59,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(CollectArchesAction.class);
+ private static final Category LOG = Logger.getLogger(CollectArchesAction.class);
/**
* The project settings instance.
@@ -209,7 +209,7 @@
tmp.waitUntilFinished();
} catch (final InterruptedException ignored) {
Thread.currentThread().interrupt();
- log.warn("DelayedMapModelListenerManager was interrupted");
+ LOG.warn("DelayedMapModelListenerManager was interrupted");
}
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/commands/CollectArchesCommand.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/commands/CollectArchesCommand.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/commands/CollectArchesCommand.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -38,7 +38,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(CollectArchesCommand.class);
+ private static final Category LOG = Logger.getLogger(CollectArchesCommand.class);
/**
* The project to collect.
@@ -60,7 +60,7 @@
@Override
public int execute() {
if (!projectModel.getResources().canWriteCollected()) {
- log.fatal("Cannot collect resources");
+ LOG.fatal("Cannot collect resources");
return 1;
}
final Collector collector = new Collector(new ConsoleProgress(), projectModel.getResources(), projectModel.getProjectSettings().getCollectedDirectory());
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/autovalidator/AutoValidator.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/autovalidator/AutoValidator.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/autovalidator/AutoValidator.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -48,7 +48,7 @@
* Preferences.
*/
@NotNull
- private static final Preferences preferences = Preferences.userNodeForPackage(MainControl.class);
+ private static final Preferences PREFERENCES = Preferences.userNodeForPackage(MainControl.class);
/**
* The map validators to run.
@@ -118,7 +118,7 @@
this.delayedMapModelListenerManager = delayedMapModelListenerManager;
setDefaultPreferencesValue(autoDefault);
wasEnabled = isEnabled(); // call to isEnabled() must not happen before setDefaultPreferencesValue()
- preferences.addPreferenceChangeListener(preferenceChangeListener);
+ PREFERENCES.addPreferenceChangeListener(preferenceChangeListener);
delayedMapModelListenerManager.addDelayedMapModelListener(delayedMapModelListener);
}
@@ -136,9 +136,9 @@
* @param autoDefault the default value to set
*/
private static void setDefaultPreferencesValue(final boolean autoDefault) {
- final boolean enabled = preferences.getBoolean(PREFERENCES_VALIDATOR_AUTO, autoDefault);
+ final boolean enabled = PREFERENCES.getBoolean(PREFERENCES_VALIDATOR_AUTO, autoDefault);
if (enabled != isEnabled()) {
- preferences.putBoolean(PREFERENCES_VALIDATOR_AUTO, autoDefault);
+ PREFERENCES.putBoolean(PREFERENCES_VALIDATOR_AUTO, autoDefault);
}
}
@@ -147,7 +147,7 @@
* @return whether the auto-validator is enabled
*/
public static boolean isEnabled() {
- return preferences.getBoolean(PREFERENCES_VALIDATOR_AUTO, false);
+ return PREFERENCES.getBoolean(PREFERENCES_VALIDATOR_AUTO, false);
}
/**
@@ -155,7 +155,7 @@
* @param enabled whether the auto-validator is enabled
*/
public static void setEnabled(final boolean enabled) {
- preferences.putBoolean(PREFERENCES_VALIDATOR_AUTO, enabled);
+ PREFERENCES.putBoolean(PREFERENCES_VALIDATOR_AUTO, enabled);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -55,7 +55,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(DelayedMapModelListenerManager.class);
+ private static final Category LOG = Logger.getLogger(DelayedMapModelListenerManager.class);
/**
* Notification delay in milliseconds. All listeners will be notified this
@@ -198,7 +198,7 @@
}
});
} catch (final InvocationTargetException ex) {
- log.error("InvocationTargetException: " + ex.getMessage(), ex);
+ LOG.error("InvocationTargetException: " + ex.getMessage(), ex);
}
mapModels.clear();
}
@@ -227,7 +227,7 @@
thread.join();
} catch (final InterruptedException ignored) {
Thread.currentThread().interrupt();
- log.warn("DelayedMapModelListenerManager was interrupted");
+ LOG.warn("DelayedMapModelListenerManager was interrupted");
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -56,7 +56,7 @@
/**
* The column titles.
*/
- private static final String[] columnName = { ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnName"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnArch"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnType"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnFolder"), };
+ private static final String[] COLUMN_NAME = { ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnName"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnArch"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnType"), ActionBuilderUtils.getString(ACTION_BUILDER, "findArchetypesColumnFolder"), };
/**
* The instance for looking up archetype types.
@@ -184,7 +184,7 @@
@NotNull
@Override
public String getColumnName(final int column) {
- return columnName[column];
+ return COLUMN_NAME[column];
}
/**
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -44,7 +44,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(DialogAttribute.class);
+ private static final Category LOG = Logger.getLogger(DialogAttribute.class);
/**
* Reference to the attribute data.
@@ -102,7 +102,7 @@
try {
doc.insertString(doc.getLength(), prefix + ref.getAttributeName() + postfix + "\n", style);
} catch (final BadLocationException e) {
- log.error("toggleSummary: Bad Location in Document!", e);
+ LOG.error("toggleSummary: Bad Location in Document!", e);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -44,7 +44,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(DialogAttributeBitmask.class);
+ private static final Category LOG = Logger.getLogger(DialogAttributeBitmask.class);
/**
* The input ui component for editing the value.
@@ -137,7 +137,7 @@
if (bitmask != null) {
input.setText(bitmask.getText(value));
} else {
- log.warn("null bitmask");
+ LOG.warn("null bitmask");
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -107,7 +107,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(GameObjectAttributesDialog.class);
+ private static final Category LOG = Logger.getLogger(GameObjectAttributesDialog.class);
/**
* Action Builder.
@@ -669,7 +669,7 @@
dialogAttribute.appendSummary(doc, summaryTextStyle);
}
} catch (final BadLocationException e) {
- log.error("toggleSummary: Bad Location in Document!", e);
+ LOG.error("toggleSummary: Bad Location in Document!", e);
}
summaryTextPane.setCaretPosition(0); // this prevents the document from scrolling down
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -47,7 +47,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(GoMapDialogManager.class);
+ private static final Category LOG = Logger.getLogger(GoMapDialogManager.class);
/**
* The parent {@link Window} for go map dialogs.
@@ -99,7 +99,7 @@
mapsIndexer.stop();
} catch (final InterruptedException ignored) {
Thread.currentThread().interrupt();
- log.warn("Waiting for MapsIndexer to terminate was interrupted");
+ LOG.warn("Waiting for MapsIndexer to terminate was interrupted");
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/help/HtmlPane.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/help/HtmlPane.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/help/HtmlPane.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -48,7 +48,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Logger log = Logger.getLogger("HtmlPane.class");
+ private static final Logger LOG = Logger.getLogger("HtmlPane.class");
/**
* Serial Version UID.
@@ -82,12 +82,12 @@
html = new JEditorPane(url1);
} else {
// let's try it again without first directory
- log.info("trying: HelpFiles/" + fileName);
+ LOG.info("trying: HelpFiles/" + fileName);
final URL url2 = ClassLoader.getSystemResource("HelpFiles/" + fileName);
if (url2 != null) {
html = new JEditorPane(url2);
} else {
- log.info("Failed to open help file '" + fileName + "'!");
+ LOG.info("Failed to open help file '" + fileName + "'!");
throw new RuntimeException(); // FIXME
}
}
@@ -113,10 +113,10 @@
// failed to open the html file
throw new RuntimeException(e); // FIXME
} catch (final MalformedURLException e) {
- log.log(Level.WARNING, "Malformed URL: %s", e);
+ LOG.log(Level.WARNING, "Malformed URL: %s", e);
throw new RuntimeException(e); // FIXME
} catch (final IOException e) {
- log.log(Level.WARNING, "IOException: %s", e);
+ LOG.log(Level.WARNING, "IOException: %s", e);
throw new RuntimeException(e); // FIXME
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractMapsizeNewMapDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractMapsizeNewMapDialog.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractMapsizeNewMapDialog.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -108,13 +108,13 @@
*/
@Override
protected void addFields(@NotNull final JPanel panel, @NotNull final GridBagConstraints gbcLabel, @NotNull final GridBagConstraints gbcField) {
- mapWidthField.setText(Integer.toString(widthKey == null ? defaultWidth : preferences.getInt(widthKey, defaultWidth)));
+ mapWidthField.setText(Integer.toString(widthKey == null ? defaultWidth : PREFERENCES.getInt(widthKey, defaultWidth)));
mapWidthField.setColumns(3);
panel.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "mapWidth"), gbcLabel);
panel.add(mapWidthField, gbcField);
mapWidthField.selectAll();
- mapHeightField.setText(Integer.toString(heightKey == null ? defaultHeight : preferences.getInt(heightKey, defaultHeight)));
+ mapHeightField.setText(Integer.toString(heightKey == null ? defaultHeight : PREFERENCES.getInt(heightKey, defaultHeight)));
mapHeightField.setColumns(3);
panel.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "mapHeight"), gbcLabel);
panel.add(mapHeightField, gbcField);
@@ -139,10 +139,10 @@
}
if (widthKey != null) {
- preferences.putInt(widthKey, width);
+ PREFERENCES.putInt(widthKey, width);
}
if (heightKey != null) {
- preferences.putInt(heightKey, height);
+ PREFERENCES.putInt(heightKey, height);
}
return new Size2D(width, height);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -76,7 +76,7 @@
* Preferences.
*/
@NotNull
- protected static final Preferences preferences = Preferences.userNodeForPackage(MainControl.class);
+ protected static final Preferences PREFERENCES = Preferences.userNodeForPackage(MainControl.class);
/**
* JButton for ok.
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/NewMapDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/NewMapDialog.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/newmap/NewMapDialog.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -201,7 +201,7 @@
}
super.addFields(panel, gbcLabel, gbcField);
if (showMapDifficulty) {
- mapDifficultyField.setText(Integer.toString(preferences.getInt(DEFAULT_DIFFICULTY_KEY, defaultDifficulty)));
+ mapDifficultyField.setText(Integer.toString(PREFERENCES.getInt(DEFAULT_DIFFICULTY_KEY, defaultDifficulty)));
panel.add(ActionBuilderUtils.newLabel(ACTION_BUILDER, "mapDifficulty"), gbcLabel);
mapDifficultyField.setColumns(3);
panel.add(mapDifficultyField, gbcField);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -39,7 +39,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(ArchComboBox.class);
+ private static final Category LOG = Logger.getLogger(ArchComboBox.class);
private static final long serialVersionUID = 1L;
@@ -65,12 +65,12 @@
setEditable(true);
setEditor(archComboBoxEditor);
final Dimension d = getPreferredSize();
- if (log.isDebugEnabled()) {
- log.debug("Preferred size: " + d);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Preferred size: " + d);
}
setPreferredSize(new Dimension(d.width, archComboBoxEditor.getEditorComponent().getPreferredSize().height));
- if (log.isDebugEnabled()) {
- log.debug("NEW Preferred size: " + getPreferredSize());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("NEW Preferred size: " + getPreferredSize());
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -41,7 +41,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(ParameterTypeEditor.class);
+ private static final Category LOG = Logger.getLogger(ParameterTypeEditor.class);
public ParameterTypeEditor(@NotNull final PluginModel<G, A, R> pluginModel, @NotNull final Plugin<G, A, R> plugin, @NotNull final PluginParameter<G, A, R, ?> parameter) {
super(pluginModel.getTypes());
@@ -55,7 +55,7 @@
try {
plugin.convertType(parameter, (String) e.getItem());
} catch (final NoSuchParameterException ex) {
- log.warn("Cannot create parameter for type " + e.getItem());
+ LOG.warn("Cannot create parameter for type " + e.getItem());
}
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -475,7 +475,7 @@
objectsToReplace.clear();
for (final G node : square) {
if (node.isHead() && matchCriteria.matches(node)) {
- if (replaceDensity > RandomUtils.rnd.nextInt(100)) {
+ if (replaceDensity > RandomUtils.RND.nextInt(100)) {
objectsToReplace.add(node);
}
}
@@ -505,7 +505,7 @@
if (replaceListSize == 1) {
randomArch = replaceList.get(0);
} else {
- randomArch = replaceList.get(RandomUtils.rnd.nextInt(replaceList.size()));
+ randomArch = replaceList.get(RandomUtils.RND.nextInt(replaceList.size()));
}
// insert replacement object
if (randomArch.isMulti()) {
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsManager.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsManager.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsManager.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -72,7 +72,7 @@
* A {@link Comparator} that compares {@link Action Actions} by name.
*/
@NotNull
- private static final Comparator<Action> actionComparator = new Comparator<Action>() {
+ private static final Comparator<Action> ACTION_COMPARATOR = new Comparator<Action>() {
@Override
public int compare(@NotNull final Action o1, @NotNull final Action o2) {
@@ -251,7 +251,7 @@
}
}
}
- Collections.sort(result, actionComparator);
+ Collections.sort(result, ACTION_COMPARATOR);
return result.iterator();
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/filter/FilterMenuEntry.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/filter/FilterMenuEntry.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/filter/FilterMenuEntry.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -40,7 +40,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(NamedFilter.class);
+ private static final Category LOG = Logger.getLogger(NamedFilter.class);
/**
* The serial version UID.
@@ -95,8 +95,8 @@
switch (type) {
case ADD:
for (final FilterComponent filterComponent : components) {
- if (log.isDebugEnabled()) {
- log.debug("set sub filter enabled(), calling on " + filterName);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("set sub filter enabled(), calling on " + filterName);
}
config.setSubFilterEnabled(filterName, false);
filterComponent.addFilter(filterName, config.getConfig(filterName));
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/MapPreviewAccessory.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/MapPreviewAccessory.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/MapPreviewAccessory.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -67,7 +67,7 @@
* Preferences.
*/
@NotNull
- private static final Preferences preferences = Preferences.userNodeForPackage(MainControl.class);
+ private static final Preferences PREFERENCES = Preferences.userNodeForPackage(MainControl.class);
/**
* Preferences key for automatic preview generation.
@@ -160,7 +160,7 @@
* Build the user interface.
*/
private void buildUI() {
- setAutoGeneratePreviews(preferences.getBoolean(PREFERENCES_AUTO_GENERATE_PREVIEW, false));
+ setAutoGeneratePreviews(PREFERENCES.getBoolean(PREFERENCES_AUTO_GENERATE_PREVIEW, false));
setPreferredSize(new Dimension(240, 115));
setLayout(new BorderLayout());
add(autoGeneratePreview.createCheckBox(), BorderLayout.NORTH);
@@ -197,7 +197,7 @@
public void setAutoGeneratePreviews(final boolean autoGeneratePreviews) {
this.autoGeneratePreviews = autoGeneratePreviews;
autoGeneratePreview.setSelected(autoGeneratePreviews);
- preferences.putBoolean(PREFERENCES_AUTO_GENERATE_PREVIEW, autoGeneratePreviews);
+ PREFERENCES.putBoolean(PREFERENCES_AUTO_GENERATE_PREVIEW, autoGeneratePreviews);
if (autoGeneratePreviews) {
fileChooser.validate();
fileChooser.repaint();
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -45,18 +45,18 @@
/**
* The tile links used for the attach map algorithm.
*/
- private static final MapLink[][] tileLink = new MapLink[8][0];
+ private static final MapLink[][] TILE_LINK = new MapLink[8][0];
/**
* Maps map direction to {@link net.sf.gridarta.gui.utils.DirectionLayout}
* direction.
*/
- private static final Direction[] directionMapping = { Direction.NORTH_WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, };
+ private static final Direction[] DIRECTION_MAPPING = { Direction.NORTH_WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, };
/**
* Indices of next focus.
*/
- private static final int[] nextFocus = { 1, 2, 3, 0 };
+ private static final int[] NEXT_FOCUS = { 1, 2, 3, 0 };
/**
* Create a MapTilePane.
@@ -66,7 +66,7 @@
* @param mapFileFilter the Swing file filter to use
*/
public FlatMapTilePane(final MapManager<G, A, R> mapManager, @NotNull final ProjectSettings projectSettings, final MapModel<G, A, R> mapModel, final FileFilter mapFileFilter) {
- super(mapManager, projectSettings, mapModel, tileLink, directionMapping, nextFocus, mapFileFilter);
+ super(mapManager, projectSettings, mapModel, TILE_LINK, DIRECTION_MAPPING, NEXT_FOCUS, mapFileFilter);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -45,45 +45,45 @@
/**
* The tile links used for the attach map algorithm.
*/
- private static final MapLink[][] tileLink = new MapLink[8][2];
+ private static final MapLink[][] TILE_LINK = new MapLink[8][2];
static {
/* fine list of indirect links von maps around to other maps around us */
- tileLink[Direction.NORTH.ordinal()][0] = new MapLink(Direction.NORTH_WEST, Direction.WEST);
- tileLink[Direction.NORTH.ordinal()][1] = new MapLink(Direction.NORTH_EAST, Direction.EAST);
+ TILE_LINK[Direction.NORTH.ordinal()][0] = new MapLink(Direction.NORTH_WEST, Direction.WEST);
+ TILE_LINK[Direction.NORTH.ordinal()][1] = new MapLink(Direction.NORTH_EAST, Direction.EAST);
- tileLink[Direction.NORTH_EAST.ordinal()][0] = new MapLink(Direction.NORTH, Direction.WEST);
- tileLink[Direction.NORTH_EAST.ordinal()][1] = new MapLink(Direction.EAST, Direction.SOUTH);
+ TILE_LINK[Direction.NORTH_EAST.ordinal()][0] = new MapLink(Direction.NORTH, Direction.WEST);
+ TILE_LINK[Direction.NORTH_EAST.ordinal()][1] = new MapLink(Direction.EAST, Direction.SOUTH);
- tileLink[Direction.EAST.ordinal()][0] = new MapLink(Direction.NORTH_EAST, Direction.NORTH);
- tileLink[Direction.EAST.ordinal()][1] = new MapLink(Direction.SOUTH_EAST, Direction.SOUTH);
+ TILE_LINK[Direction.EAST.ordinal()][0] = new MapLink(Direction.NORTH_EAST, Direction.NORTH);
+ TILE_LINK[Direction.EAST.ordinal()][1] = new MapLink(Direction.SOUTH_EAST, Direction.SOUTH);
- tileLink[Direction.SOUTH_EAST.ordinal()][0] = new MapLink(Direction.EAST, Direction.NORTH);
- tileLink[Direction.SOUTH_EAST.ordinal()][1] = new MapLink(Direction.SOUTH, Direction.WEST);
+ TILE_LINK[Direction.SOUTH_EAST.ordinal()][0] = new MapLink(Direction.EAST, Direction.NORTH);
+ TILE_LINK[Direction.SOUTH_EAST.ordinal()][1] = new MapLink(Direction.SOUTH, Direction.WEST);
- tileLink[Direction.SOUTH.ordinal()][0] = new MapLink(Direction.SOUTH_EAST, Direction.EAST);
- tileLink[Direction.SOUTH.ordinal()][1] = new MapLink(Direction.SOUTH_WEST, Direction.WEST);
+ TILE_LINK[Direction.SOUTH.ordinal()][0] = new MapLink(Direction.SOUTH_EAST, Direction.EAST);
+ TILE_LINK[Direction.SOUTH.ordinal()][1] = new MapLink(Direction.SOUTH_WEST, Direction.WEST);
- tileLink[Direction.SOUTH_WEST.ordinal()][0] = new MapLink(Direction.SOUTH, Direction.EAST);
- tileLink[Direction.SOUTH_WEST.ordinal()][1] = new MapLink(Direction.WEST, Direction.NORTH);
+ TILE_LINK[Direction.SOUTH_WEST.ordinal()][0] = new MapLink(Direction.SOUTH, Direction.EAST);
+ TILE_LINK[Direction.SOUTH_WEST.ordinal()][1] = new MapLink(Direction.WEST, Direction.NORTH);
- tileLink[Direction.WEST.ordinal()][0] = new MapLink(Direction.SOUTH_WEST, Direction.SOUTH);
- tileLink[Direction.WEST.ordinal()][1] = new MapLink(Direction.NORTH_WEST, Direction.NORTH);
+ TILE_LINK[Direction.WEST.ordinal()][0] = new MapLink(Direction.SOUTH_WEST, Direction.SOUTH);
+ TILE_LINK[Direction.WEST.ordinal()][1] = new MapLink(Direction.NORTH_WEST, Direction.NORTH);
- tileLink[Direction.NORTH_WEST.ordinal()][0] = new MapLink(Direction.WEST, Direction.SOUTH);
- tileLink[Direction.NORTH_WEST.ordinal()][1] = new MapLink(Direction.NORTH, Direction.EAST);
+ TILE_LINK[Direction.NORTH_WEST.ordinal()][0] = new MapLink(Direction.WEST, Direction.SOUTH);
+ TILE_LINK[Direction.NORTH_WEST.ordinal()][1] = new MapLink(Direction.NORTH, Direction.EAST);
}
/**
* Maps map direction to {@link net.sf.gridarta.gui.utils.DirectionLayout}
* direction.
*/
- private static final Direction[] directionMapping = { Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, };
+ private static final Direction[] DIRECTION_MAPPING = { Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, };
/**
* Indices of next focus.
*/
- private static final int[] nextFocus = { 4, 5, 6, 7, 1, 2, 3, 0 };
+ private static final int[] NEXT_FOCUS = { 4, 5, 6, 7, 1, 2, 3, 0 };
/**
* Create a MapTilePane.
@@ -93,7 +93,7 @@
* @param mapFileFilter the Swing file filter to use
*/
public IsoMapTilePane(final MapManager<G, A, R> mapManager, @NotNull final ProjectSettings projectSettings, final MapModel<G, A, R> mapModel, final FileFilter mapFileFilter) {
- super(mapManager, projectSettings, mapModel, tileLink, directionMapping, nextFocus, mapFileFilter);
+ super(mapManager, projectSettings, mapModel, TILE_LINK, DIRECTION_MAPPING, NEXT_FOCUS, mapFileFilter);
}
}
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/AbstractMapView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/AbstractMapView.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/AbstractMapView.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -119,7 +119,7 @@
if (objectSize == 1) {
return objects.get(0);
}
- return objects.get(RandomUtils.rnd.nextInt(objects.size()));
+ return objects.get(RandomUtils.RND.nextInt(objects.size()));
}
/**
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/mapview/DefaultMapView.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -68,7 +68,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(DefaultMapView.class);
+ private static final Category LOG = Logger.getLogger(DefaultMapView.class);
/**
* Action Builder to create Actions.
@@ -328,7 +328,7 @@
try {
internalFrame.setSelected(true);
} catch (final PropertyVetoException e) {
- log.warn("Unexpected exception", e);
+ LOG.warn("Unexpected exception", e);
}
internalFrame.setVisible(true);
internalFrame.requestFocus();
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -49,7 +49,7 @@
* The Logger for printing log messages.
*/
@NotNull
- private static final Category log = Logger.getLogger(ImageCreator.class);
+ private static final Category LOG = Logger.getLogger(ImageCreator.class);
/**
* The {@link MapManager} for loading map instances.
@@ -81,14 +81,14 @@
throw new IOException("cannot rename " + tmpFile + " to " + file);
}
}
- if (log.isInfoEnabled()) {
- log.info(ACTION_BUILDER.format("logImageCreated", file, mapModel.getMapArchObject().getMapName()));
+ if (LOG.isInfoEnabled()) {
+ LOG.info(ACTION_BUILDER.format("logImageCreated", file, mapModel.getMapArchObject().getMapName()));
}
}
public void makeImage(final File in, final File out) throws IOException {
- if (log.isInfoEnabled()) {
- log.info("converting " + in + " to " + out);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("converting " + in + " to " + out);
}
if (in.canRead()) {
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator2.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/renderer/ImageCreator2.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -86,7 +86,7 @@
fileChooser.setMultiSelectionEnabled(false);
fileChooser.setSelectedFile(file);
// set a file filter for "*.png" files
- fileChooser.setFileFilter(FileFilters.pngFileFilter);
+ fileChooser.setFileFilter(FileFilters.PNG_FILE_FILTER);
FileChooserUtils.sanitizeCurrentDirectory(fileChooser);
final int returnVal = fileChooser.showSaveDialog(component);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/viewaction/ViewActions.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -145,7 +145,7 @@
* The comparator for sorting menu entries.
*/
@NotNull
- private static final Comparator<ViewAction> actionNameComparator = new Comparator<ViewAction>() {
+ private static final Comparator<ViewAction> ACTION_NAME_COMPARATOR = new Comparator<ViewAction>() {
@Override
public int compare(final ViewAction o1, final ViewAction o2) {
@@ -174,7 +174,7 @@
}
final ViewAction[] actions = viewActions.toArray(new ViewAction[viewActions.size()]);
- Arrays.sort(actions, actionNameComparator);
+ Arrays.sort(actions, ACTION_NAME_COMPARATOR);
int index = 0;
for (final ViewAction viewAction : actions) {
viewActionsMenu.add(viewAction.getCheckBoxMenuItem(), index++);
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2014-02-16 19:58:59 UTC (rev 9578)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2014-02-16 20:21:46 UTC (rev 9579)
@@ -59,7 +59,7 @@
* All {@link Direction Directions}.
*/
@NotNull
- private static final Direction[] directions = Direction.values();
+ private static final Direction[] DIRECTIONS = Direction.values();
@NotNull
private final MapActions<G, A, R> mapActions;
@@ -176,7 +176,7 @@
*/
public MapCursorActions(@NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final MapActions<G, A, R> mapActions) {
this.mapActions = mapActions;
- aMoveCursor = new Action[directions.length];
+ aMoveCursor = new Action[DIRECTIONS.length];
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
currentMapView = mapViewManager.getActiveMapView();
refreshActions();
@@ -250,7 +250,7 @@
* Enable/disable menu entries based on the current cursor state.
*/
private void refreshActions() {
- for (final Direction direction : directions) {
+ for (final Direction direction : DIRECTIONS) {
final Action action = aMoveCursor[direction.ordinal()];
if (action != null) {
action.setEnabled(doMoveCursor(false, direction));
@@ -292,7 +292,7 @@
public void setAction(@NotNull final Action action, @NotNull final String name) {
if (name.startsWith("moveCursor")) {
boolean found = false;
- for (final Direction direction : directions) {
+ for (final Direction direction : DIRECTIONS) {
if (name.equals("moveCursor" + direction.getId())) {
aMoveCursor[direction.ordinal()] = action;
found = true;
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/mapdeskto...
[truncated message content] |
|
From: <aki...@us...> - 2014-02-23 13:12:22
|
Revision: 9647
http://sourceforge.net/p/gridarta/code/9647
Author: akirschbaum
Date: 2014-02-23 13:12:15 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Simplify build script.
Modified Paths:
--------------
trunk/build.gradle
trunk/test-mapvalidator/build.gradle
Modified: trunk/build.gradle
===================================================================
--- trunk/build.gradle 2014-02-23 13:06:29 UTC (rev 9646)
+++ trunk/build.gradle 2014-02-23 13:12:15 UTC (rev 9647)
@@ -103,11 +103,9 @@
}
// Delete all generated files.
-task clean {
+task clean(type: Delete) {
description = 'Deletes generated files.'
- doLast {
- delete 'build'
- }
+ delete buildDir
}
// Run checkstyle on Java sources in all projects.
Modified: trunk/test-mapvalidator/build.gradle
===================================================================
--- trunk/test-mapvalidator/build.gradle 2014-02-23 13:06:29 UTC (rev 9646)
+++ trunk/test-mapvalidator/build.gradle 2014-02-23 13:12:15 UTC (rev 9647)
@@ -42,8 +42,7 @@
check.dependsOn check_crossfire
check.dependsOn check_daimonin
-task clean {
- doLast {
- delete buildDir
- }
+task clean(type: Delete) {
+ description = 'Deletes generated files.'
+ delete buildDir
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-03-08 19:53:18
|
Revision: 9676
http://sourceforge.net/p/gridarta/code/9676
Author: akirschbaum
Date: 2014-03-08 19:53:12 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
Rewrite parser for GameObjectMatchers.xml.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/model/build.gradle
trunk/src/model/model.iml
trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatcherParser.java
trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatchersParser.java
trunk/src/project/build.gradle
trunk/src/project/project.iml
trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
trunk/src/utils/build.gradle
trunk/src/utils/src/main/java/net/sf/gridarta/utils/XmlHelper.java
trunk/src/utils/utils.iml
Added Paths:
-----------
trunk/repo/xom/
trunk/repo/xom/1.2.10/
trunk/repo/xom/1.2.10/xom-1.2.10.jar
trunk/repo/xom/1.2.10/xom-1.2.10.jar-LICENSE
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterable.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterator.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdEntityResolver.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdInputStream.java
trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ParseUtils.java
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/gridarta.ipr 2014-03-08 19:53:12 UTC (rev 9676)
@@ -2419,6 +2419,13 @@
<JAVADOC />
<SOURCES />
</library>
+ <library name="xom">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/repo/xom/1.2.10/xom-1.2.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
</component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="false" />
Added: trunk/repo/xom/1.2.10/xom-1.2.10.jar
===================================================================
(Binary files differ)
Index: trunk/repo/xom/1.2.10/xom-1.2.10.jar
===================================================================
--- trunk/repo/xom/1.2.10/xom-1.2.10.jar 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/repo/xom/1.2.10/xom-1.2.10.jar 2014-03-08 19:53:12 UTC (rev 9676)
Property changes on: trunk/repo/xom/1.2.10/xom-1.2.10.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/repo/xom/1.2.10/xom-1.2.10.jar-LICENSE
===================================================================
--- trunk/repo/xom/1.2.10/xom-1.2.10.jar-LICENSE (rev 0)
+++ trunk/repo/xom/1.2.10/xom-1.2.10.jar-LICENSE 2014-03-08 19:53:12 UTC (rev 9676)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Property changes on: trunk/repo/xom/1.2.10/xom-1.2.10.jar-LICENSE
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/model/build.gradle
===================================================================
--- trunk/src/model/build.gradle 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/model/build.gradle 2014-03-08 19:53:12 UTC (rev 9676)
@@ -9,6 +9,7 @@
compile name: 'japi-lib-swing-misc', version: 'trunk-1398', group: 'japi-lib'
compile name: 'jdom', version: '1.0'
compile name: 'log4j', version: '1.2.13'
+ compile name: 'xom', version: '1.2.10'
compile project(':src:utils')
testCompile name: 'junit', version: '4.2'
testCompile project(':src:utils').sourceSets.test.output
Modified: trunk/src/model/model.iml
===================================================================
--- trunk/src/model/model.iml 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/model/model.iml 2014-03-08 19:53:12 UTC (rev 9676)
@@ -20,6 +20,7 @@
<orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="log4j" level="project" />
+ <orderEntry type="library" name="xom" level="project" />
</component>
</module>
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatcherParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatcherParser.java 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatcherParser.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -23,15 +23,12 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
import net.sf.gridarta.utils.StringUtils;
+import nu.xom.Element;
+import nu.xom.Node;
+import nu.xom.Nodes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Class for some default {@link GameObjectMatcher GameObjectMatchers}.
@@ -124,17 +121,9 @@
private static final String XML_TYPENRS_ATTRIBUTE_NUMBERS = "numbers";
/**
- * {@link XPath} to use.
+ * Private constructor to prevent instantiation.
*/
- @NotNull
- private final XPath xpath;
-
- /**
- * Creates a {@code GameObjectMatcherParser}.
- * @param xpath the {@code XPath} to use
- */
- public GameObjectMatcherParser(@NotNull final XPath xpath) {
- this.xpath = xpath;
+ private GameObjectMatcherParser() {
}
/**
@@ -145,13 +134,13 @@
* @throws ParsingException if a parsing error occurs
*/
@NotNull
- public NamedGameObjectMatcher parseMatcher(@NotNull final Element el, final int editType) throws ParsingException {
+ public static NamedGameObjectMatcher parseMatcher(@NotNull final Element el, final int editType) throws ParsingException {
final String currentLanguage = Locale.getDefault().getLanguage();
final String localName = el.getLocalName();
if (localName == null || !localName.equals("GameObjectMatcher")) {
throw new ParsingException("wrong local element name: expected \"GameObjectMatcher\" but got \"" + localName + "\"");
}
- final String id = el.getAttribute(XML_MATCHER_ATTRIBUTE_ID);
+ final String id = el.getAttribute(XML_MATCHER_ATTRIBUTE_ID).getValue();
String title = getLanguageTitle(el, currentLanguage);
if (title == null || title.isEmpty()) {
title = getLanguageTitle(el, "en");
@@ -159,7 +148,7 @@
if (title == null || title.isEmpty()) {
title = id;
}
- final boolean systemMatcher = el.getAttribute(XML_MATCHER_ATTRIBUTE_SYSTEM).equals("true");
+ final boolean systemMatcher = el.getAttribute(XML_MATCHER_ATTRIBUTE_SYSTEM).getValue().equals("true");
final Node content = xpathEvaluate(el, "*[last()]");
assert content != null;
@@ -172,7 +161,7 @@
envGameObjectMatcher = null;
}
- assert content.getNodeType() == Node.ELEMENT_NODE;
+ //XXX:assert content.getNodeType() == Node.ELEMENT_NODE;
final GameObjectMatcher matcher = createMatcher((Element) content);
return new NamedGameObjectMatcher(systemMatcher ? 0 : editType, id, title, systemMatcher, envGameObjectMatcher, matcher);
}
@@ -184,12 +173,10 @@
* @return the title
*/
@Nullable
- private String getLanguageTitle(@NotNull final Node el, @NotNull final String language) {
- try {
- return (String) xpath.evaluate("title[lang('" + language + "')]", el, XPathConstants.STRING);
- } catch (final XPathExpressionException ex) {
- throw new AssertionError(ex);
- }
+ private static String getLanguageTitle(@NotNull final Node el, @NotNull final String language) {
+ final Nodes nodes = el.query("title[lang('" + language + "')]");
+ assert nodes.size() <= 1;
+ return nodes.size() == 0 ? null : nodes.get(0).getValue();
}
/**
@@ -249,10 +236,9 @@
@NotNull
private static Collection<GameObjectMatcher> getChildMatchers(@NotNull final Node el) throws ParsingException {
final Collection<GameObjectMatcher> childMatchers = new ArrayList<GameObjectMatcher>();
- final NodeList childNodes = el.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- final Node childNode = childNodes.item(i);
- if (childNode.getNodeType() == Node.ELEMENT_NODE) {
+ for (int i = 0; i < el.getChildCount(); i++) {
+ final Node childNode = el.getChild(i);
+ if (childNode instanceof Element) {
childMatchers.add(createMatcher((Element) childNode));
}
}
@@ -267,11 +253,11 @@
*/
@NotNull
private static GameObjectMatcher createAttributeArchObjectMatcher(@NotNull final Element el) throws ParsingException {
- final String type = el.getAttribute(XML_ATTRIB_ATTRIBUTE_TYPE);
+ final String type = el.getAttribute(XML_ATTRIB_ATTRIBUTE_TYPE).getValue();
if (type.equals("string")) {
- return new StringAttributeGameObjectMatcher(el.getAttribute(XML_ATTRIB_ATTRIBUTE_NAME), Enum.valueOf(Operation.class, el.getAttribute(XML_ATTRIB_ATTRIBUTE_OP)), el.getAttribute(XML_ATTRIB_ATTRIBUTE_VALUE), Boolean.valueOf(el.getAttribute(XML_ATTRIB_ATTRIBUTE_USEARCHETYPE)));
+ return new StringAttributeGameObjectMatcher(el.getAttribute(XML_ATTRIB_ATTRIBUTE_NAME).getValue(), Enum.valueOf(Operation.class, el.getAttribute(XML_ATTRIB_ATTRIBUTE_OP).getValue()), el.getAttribute(XML_ATTRIB_ATTRIBUTE_VALUE).getValue(), el.getAttribute(XML_ATTRIB_ATTRIBUTE_USEARCHETYPE).getValue().equals("true"));
} else if (type.equals("int")) {
- return new IntAttributeGameObjectMatcher(el.getAttribute(XML_ATTRIB_ATTRIBUTE_NAME), Enum.valueOf(Operation.class, el.getAttribute(XML_ATTRIB_ATTRIBUTE_OP)), el.getAttribute(XML_ATTRIB_ATTRIBUTE_VALUE), Boolean.valueOf(el.getAttribute(XML_ATTRIB_ATTRIBUTE_USEARCHETYPE)));
+ return new IntAttributeGameObjectMatcher(el.getAttribute(XML_ATTRIB_ATTRIBUTE_NAME).getValue(), Enum.valueOf(Operation.class, el.getAttribute(XML_ATTRIB_ATTRIBUTE_OP).getValue()), el.getAttribute(XML_ATTRIB_ATTRIBUTE_VALUE).getValue(), el.getAttribute(XML_ATTRIB_ATTRIBUTE_USEARCHETYPE).getValue().equals("true"));
} else {
throw new AssertionError("impossible value '" + type + "' for XML_ATTRIB_ATTRIBUTE_TYPE");
}
@@ -285,7 +271,7 @@
*/
@NotNull
private static GameObjectMatcher createTypeNrsArchObjectMatcher(@NotNull final Element el) throws ParsingException {
- final CharSequence numbers = el.getAttribute(XML_TYPENRS_ATTRIBUTE_NUMBERS);
+ final CharSequence numbers = el.getAttribute(XML_TYPENRS_ATTRIBUTE_NUMBERS).getValue();
final String[] typeNrs = StringUtils.PATTERN_WHITESPACE.split(numbers, 0);
final int[] types = new int[typeNrs.length];
for (int i = 0; i < types.length; i++) {
@@ -306,12 +292,10 @@
* @return the result node
*/
@Nullable
- private Node xpathEvaluate(@NotNull final Node el, @NotNull final String xpathExpression) {
- try {
- return (Node) xpath.evaluate(xpathExpression, el, XPathConstants.NODE);
- } catch (final XPathExpressionException ex) {
- throw new AssertionError(ex);
- }
+ private static Node xpathEvaluate(@NotNull final Node el, @NotNull final String xpathExpression) {
+ final Nodes nodes = el.query(xpathExpression);
+ assert nodes.size() <= 1;
+ return nodes.size() == 0 ? null : nodes.get(0);
}
}
Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatchersParser.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatchersParser.java 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/match/GameObjectMatchersParser.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -19,21 +19,14 @@
package net.sf.gridarta.model.match;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.xpath.XPath;
import net.sf.gridarta.model.errorview.ErrorViewCategory;
import net.sf.gridarta.model.errorview.ErrorViewCollector;
-import net.sf.japi.xml.NodeListIterator;
+import net.sf.gridarta.utils.xml.ElementsIterable;
+import nu.xom.Document;
+import nu.xom.Element;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* Parser for the GameObjectMatchers.xml file.
@@ -48,51 +41,25 @@
private static final Category LOG = Logger.getLogger(GameObjectMatchersParser.class);
/**
- * DocumentBuilder.
+ * Private constructor to prevent instantiation.
*/
- @NotNull
- private final DocumentBuilder documentBuilder;
-
- /**
- * The XPath for using XPath.
- */
- @NotNull
- private final XPath xpath;
-
- /**
- * Creates a new instance.
- * @param documentBuilder the {@code DocumentBuilder} to use for parsing
- * XML
- * @param xpath the XPath to use for applying for XPath expressions
- */
- public GameObjectMatchersParser(@NotNull final DocumentBuilder documentBuilder, @NotNull final XPath xpath) {
- this.documentBuilder = documentBuilder;
- this.xpath = xpath;
+ private GameObjectMatchersParser() {
}
/**
* Parses a .xml file defining game object matchers.
- * @param url the URL to parse
+ * @param document the document parse
* @param gameObjectMatchers the game object matchers to update
* @param errorViewCollector the error view collector to use
- * @throws IOException if the file cannot be parsed
*/
- public void readGameObjectMatchers(@NotNull final URL url, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ErrorViewCollector errorViewCollector) throws IOException {
- final GameObjectMatcherParser aom = new GameObjectMatcherParser(xpath);
- final Document doc;
- try {
- doc = documentBuilder.parse(new InputSource(url.toString()));
- } catch (final SAXException ex) {
- throw new IOException("sax exception: " + ex.getMessage(), ex);
- }
+ public static void readGameObjectMatchers(@NotNull final Document document, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ErrorViewCollector errorViewCollector) {
int count = 0;
int editType = 1;
- final Iterator<Element> it = new NodeListIterator<Element>(doc.getElementsByTagName("GameObjectMatcher"));
- while (it.hasNext()) {
- final Element node = it.next();
+ final Element rootElement = document.getRootElement();
+ for (final Element node : new ElementsIterable(rootElement.getChildElements("GameObjectMatcher"))) {
final NamedGameObjectMatcher archObjectMatcher;
try {
- archObjectMatcher = aom.parseMatcher(node, editType);
+ archObjectMatcher = GameObjectMatcherParser.parseMatcher(node, editType);
} catch (final ParsingException ex) {
errorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_ENTRY_INVALID, node.getAttribute("id") + ": " + ex.getMessage());
continue;
@@ -107,7 +74,7 @@
}
}
if (LOG.isInfoEnabled()) {
- LOG.info("Loaded " + count + " GameObjectMatchers from '" + url + "'.");
+ LOG.info("Loaded " + count + " GameObjectMatchers.");
}
}
Modified: trunk/src/project/build.gradle
===================================================================
--- trunk/src/project/build.gradle 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/project/build.gradle 2014-03-08 19:53:12 UTC (rev 9676)
@@ -6,6 +6,7 @@
compile name: 'annotations', version: '0.0'
compile name: 'japi-lib-swing-action', version: '0.1.0', group: 'japi-lib'
compile name: 'log4j', version: '1.2.13'
+ compile name: 'xom', version: '1.2.10'
compile project(':src:model')
compile project(':src:plugin')
compile project(':src:utils')
Modified: trunk/src/project/project.iml
===================================================================
--- trunk/src/project/project.iml 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/project/project.iml 2014-03-08 19:53:12 UTC (rev 9676)
@@ -18,6 +18,7 @@
<orderEntry type="library" name="japi-lib-swing-action" level="project" />
<orderEntry type="library" name="log4j" level="project" />
<orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="xom" level="project" />
</component>
</module>
Modified: trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java
===================================================================
--- trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/project/src/main/java/net/sf/gridarta/project/ProjectModel.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -111,8 +111,10 @@
import net.sf.gridarta.utils.ResourceIcons;
import net.sf.gridarta.utils.StringUtils;
import net.sf.gridarta.utils.XmlHelper;
+import net.sf.gridarta.utils.xml.ParseUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import nu.xom.ParsingException;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -246,7 +248,7 @@
mapReaderFactory = new DefaultMapReaderFactory<G, A, R>(mapArchObjectFactory, mapArchObjectParserFactory, gameObjectParserFactory);
final MapWriter<G, A, R> mapWriter = new DefaultMapWriter<G, A, R>(mapArchObjectParserFactory, gameObjectParser);
final ValidatorPreferences validatorPreferences = new DefaultValidatorPreferences();
- gameObjectMatchers = loadGameObjectMatchers(xmlHelper, errorView, projectSettings);
+ gameObjectMatchers = loadGameObjectMatchers(errorView, projectSettings);
validators = loadValidators(errorView, projectFactory, projectSettings, gameObjectMatchers, archetypeTypeSet, validatorPreferences, mapWriter);
final AutojoinLists<G, A, R> autojoinLists = AutojoinListsParser.loadList(errorView, archetypeSet, projectSettings.getConfigurationDirectory());
mapModelFactory = new MapModelFactory<G, A, R>(archetypeChooserModel, autojoinLists, gameObjectFactory, gameObjectMatchers, topmostInsertionMode);
@@ -313,26 +315,31 @@
}
@NotNull
- public static GameObjectMatchers loadGameObjectMatchers(@NotNull final XmlHelper xmlHelper, @NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings) {
+ public static GameObjectMatchers loadGameObjectMatchers(@NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings) {
final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers();
final URL url;
try {
url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "GameObjectMatchers.xml");
- } catch (final FileNotFoundException ex) {
+ } catch (final IOException ex) {
errorView.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, "GameObjectMatchers.xml: " + ex.getMessage());
return gameObjectMatchers;
}
final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, url);
try {
- xmlHelper.getDocumentBuilder().setErrorHandler(new ErrorViewCollectorErrorHandler(gameObjectMatchersErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
+ final nu.xom.Document document;
+ final InputStream inputStream = url.openStream();
try {
- final GameObjectMatchersParser gameObjectMatchersParser = new GameObjectMatchersParser(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
- gameObjectMatchersParser.readGameObjectMatchers(url, gameObjectMatchers, gameObjectMatchersErrorViewCollector);
+ document = ParseUtils.readXmlStream(inputStream, "GameObjectMatchers", "GameObjectMatchers.dtd", "/system/dtd/GameObjectMatchers.dtd", new ErrorViewCollectorErrorHandler(gameObjectMatchersErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
} finally {
- xmlHelper.getDocumentBuilder().setErrorHandler(null);
+ inputStream.close();
}
+ GameObjectMatchersParser.readGameObjectMatchers(document, gameObjectMatchers, gameObjectMatchersErrorViewCollector);
} catch (final IOException ex) {
gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
+ } catch (final ParsingException ex) {
+ gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
+ } catch (final SAXException ex) {
+ gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
}
return gameObjectMatchers;
}
Modified: trunk/src/utils/build.gradle
===================================================================
--- trunk/src/utils/build.gradle 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/utils/build.gradle 2014-03-08 19:53:12 UTC (rev 9676)
@@ -8,5 +8,6 @@
compile name: 'japi-lib-util', version: 'trunk-1410', group: 'japi-lib'
compile name: 'japi-lib-xml', version: '0.1.0', group: 'japi-lib'
compile name: 'log4j', version: '1.2.13'
+ compile name: 'xom', version: '1.2.10'
testCompile name: 'junit', version: '4.2'
}
Modified: trunk/src/utils/src/main/java/net/sf/gridarta/utils/XmlHelper.java
===================================================================
--- trunk/src/utils/src/main/java/net/sf/gridarta/utils/XmlHelper.java 2014-03-08 17:01:21 UTC (rev 9675)
+++ trunk/src/utils/src/main/java/net/sf/gridarta/utils/XmlHelper.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -28,16 +28,14 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
/**
- * Little helper class for XML, holds a {@link DocumentBuilder} and an {@link
- * XPath} that are setup for Gridarta.
+ * Little helper class for XML that holds a {@link DocumentBuilder} that is
+ * setup for Gridarta.
* @author Andreas Kirschbaum
*/
public class XmlHelper {
@@ -54,11 +52,6 @@
private final DocumentBuilder documentBuilder;
/**
- * The XPath for using XPath.
- */
- private final XPath xpath;
-
- /**
* Initialize the XML engine.
* @throws ParserConfigurationException in case the xml parser couldn't be
* set up
@@ -75,7 +68,6 @@
dbf.setXIncludeAware(true);
documentBuilder = dbf.newDocumentBuilder();
documentBuilder.setEntityResolver(new GridartaEntityResolver());
- xpath = XPathFactory.newInstance().newXPath();
}
/**
@@ -87,14 +79,6 @@
}
/**
- * Return the XPath for using XPath.
- * @return the XPath
- */
- public XPath getXPath() {
- return xpath;
- }
-
- /**
* Implements an {@link EntityResolver} for looking up built-in .dtd files.
*/
private static class GridartaEntityResolver implements EntityResolver {
Added: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterable.java
===================================================================
--- trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterable.java (rev 0)
+++ trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterable.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -0,0 +1,48 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.utils.xml;
+
+import java.util.Iterator;
+import nu.xom.Element;
+import nu.xom.Elements;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Andreas Kirschbaum
+ */
+public class ElementsIterable implements Iterable<Element> {
+
+ @NotNull
+ private final Elements elements;
+
+ public ElementsIterable(@NotNull final Elements elements) {
+ this.elements = elements;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public Iterator<Element> iterator() {
+ return new ElementsIterator(elements);
+ }
+
+}
Property changes on: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterable.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterator.java
===================================================================
--- trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterator.java (rev 0)
+++ trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterator.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -0,0 +1,69 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.utils.xml;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import nu.xom.Element;
+import nu.xom.Elements;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Andreas Kirschbaum
+ */
+public class ElementsIterator implements Iterator<Element> {
+
+ @NotNull
+ private final Elements elements;
+
+ private int pos;
+
+ public ElementsIterator(@NotNull final Elements elements) {
+ this.elements = elements;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasNext() {
+ return pos < elements.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Element next() {
+ if (pos >= elements.size()) {
+ throw new NoSuchElementException();
+ }
+ return elements.get(pos++);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+}
Property changes on: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/ElementsIterator.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdEntityResolver.java
===================================================================
--- trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdEntityResolver.java (rev 0)
+++ trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdEntityResolver.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -0,0 +1,57 @@
+package net.sf.gridarta.utils.xml;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * An {@code EntityResolver} that rejects all entities except for a given DTD.
+ * This DTD is resolved against a resource.
+ * @author Andreas Kirschbaum
+ */
+public class FixedDtdEntityResolver implements EntityResolver {
+
+ /**
+ * The expected system ID.
+ */
+ @NotNull
+ private final String systemId;
+
+ /**
+ * The name of the resource to return for {@link #systemId}.
+ */
+ @NotNull
+ private final String resourceName;
+
+ /**
+ * Creates a new instance.
+ * @param systemId the expected system ID
+ * @param resourceName the name of the resource to return for {@code
+ * systemId}
+ */
+ public FixedDtdEntityResolver(@NotNull final String systemId, @NotNull final String resourceName) {
+ this.systemId = systemId;
+ this.resourceName = resourceName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public InputSource resolveEntity(@Nullable final String publicId, @NotNull final String systemId) throws SAXException, IOException {
+ if (!systemId.equals(this.systemId) && !systemId.endsWith("/" + this.systemId)) {
+ throw new SAXException("unsupported system ID '" + systemId + "'");
+ }
+ final InputStream inputStream = FixedDtdEntityResolver.class.getResourceAsStream(resourceName);
+ if (inputStream == null) {
+ throw new IOException("the resource '" + resourceName + "' does not exist");
+ }
+ return new InputSource(inputStream);
+ }
+
+}
Property changes on: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdEntityResolver.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdInputStream.java
===================================================================
--- trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdInputStream.java (rev 0)
+++ trunk/src/utils/src/main/java/net/sf/gridarta/utils/xml/FixedDtdInputStream.java 2014-03-08 19:53:12 UTC (rev 9676)
@@ -0,0 +1,199 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.utils.xml;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Injects a <!DOCTYPE...> declaration into an {@code InputStream} if it
+ * does not contain one. The input stream should contain XML.
+ * @author Andreas Kirschbaum
+ */
+public class FixedDtdInputStream extends InputStream {
+
+ /**
+ * The {@link In...
[truncated message content] |
|
From: <aki...@us...> - 2014-03-09 11:18:44
|
Revision: 9687
http://sourceforge.net/p/gridarta/code/9687
Author: akirschbaum
Date: 2014-03-09 11:18:38 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Remove unused library jdom-1.0.jar.
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/atrinik/build.gradle
trunk/src/crossfire/build.gradle
trunk/src/crossfire/crossfire.iml
trunk/src/daimonin/build.gradle
trunk/src/gridarta/gridarta.iml
trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
trunk/src/model/build.gradle
trunk/src/model/model.iml
trunk/src/plugin/plugin.iml
Removed Paths:
-------------
trunk/repo/jdom/
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/gridarta.ipr 2014-03-09 11:18:38 UTC (rev 9687)
@@ -1752,7 +1752,6 @@
<w>javasrc</w>
<w>javax</w>
<w>jcity</w>
- <w>jdom</w>
<w>jessies</w>
<w>jlfgr</w>
<w>jloc</w>
@@ -2391,13 +2390,6 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="jdom">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/repo/jdom/1.0/jdom-1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
<library name="junit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/repo/junit/4.2/junit-4.2.jar!/" />
Modified: trunk/src/atrinik/build.gradle
===================================================================
--- trunk/src/atrinik/build.gradle 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/atrinik/build.gradle 2014-03-09 11:18:38 UTC (rev 9687)
@@ -35,6 +35,7 @@
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
+ from new File(rootDir, 'repo/xom/1.2.10/xom-1.2.10.jar-LICENSE')
inputs.files configurations.runtime
doFirst {
// The following must be executed in doFirst since the configuration
Modified: trunk/src/crossfire/build.gradle
===================================================================
--- trunk/src/crossfire/build.gradle 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/crossfire/build.gradle 2014-03-09 11:18:38 UTC (rev 9687)
@@ -31,10 +31,10 @@
from new File(rootDir, 'repo/bsh/bsh-LICENSE')
from new File(rootDir, 'repo/japi-lib/japi-lib.jar-LICENSE')
from new File(rootDir, 'repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE')
- from new File(rootDir, 'repo/jdom/1.0/jdom-1.0.jar-LICENSE')
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
+ from new File(rootDir, 'repo/xom/1.2.10/xom-1.2.10.jar-LICENSE')
inputs.files configurations.runtime
doFirst {
// The following must be executed in doFirst since the configuration
Modified: trunk/src/crossfire/crossfire.iml
===================================================================
--- trunk/src/crossfire/crossfire.iml 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/crossfire/crossfire.iml 2014-03-09 11:18:38 UTC (rev 9687)
@@ -27,7 +27,6 @@
<orderEntry type="library" name="japi-lib-swing-tod" level="project" />
<orderEntry type="library" name="japi-lib-util" level="project" />
<orderEntry type="library" name="java-getopt" level="project" />
- <orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="log4j" level="project" />
</component>
Modified: trunk/src/daimonin/build.gradle
===================================================================
--- trunk/src/daimonin/build.gradle 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/daimonin/build.gradle 2014-03-09 11:18:38 UTC (rev 9687)
@@ -35,6 +35,7 @@
from new File(rootDir, 'repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE')
from new File(rootDir, 'repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE')
from new File(rootDir, 'repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE')
+ from new File(rootDir, 'repo/xom/1.2.10/xom-1.2.10.jar-LICENSE')
inputs.files configurations.runtime
doFirst {
// The following must be executed in doFirst since the configuration
Modified: trunk/src/gridarta/gridarta.iml
===================================================================
--- trunk/src/gridarta/gridarta.iml 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/gridarta/gridarta.iml 2014-03-09 11:18:38 UTC (rev 9687)
@@ -30,7 +30,6 @@
<orderEntry type="library" name="japi-lib-swing-tod" level="project" />
<orderEntry type="library" name="japi-lib-util" level="project" />
<orderEntry type="library" name="japi-lib-xml" level="project" />
- <orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="log4j" level="project" />
<orderEntry type="library" name="rsyntaxtextarea" level="project" />
Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties 2014-03-09 11:18:38 UTC (rev 9687)
@@ -982,8 +982,8 @@
license.4.file=bsh-LICENSE
license.5.title=Log4J
license.5.file=log4j-1.2.13.jar-LICENSE
-license.6.title=JDOM
-license.6.file=jdom-1.0.jar-LICENSE
+license.6.title=XOM
+license.6.file=xom-1.2.10.jar-LICENSE
license.7.title=GNU getopt
license.7.file=java-getopt-1.0.13.jar-LICENSE
license.8.title=RSyntaxTextArea
Modified: trunk/src/model/build.gradle
===================================================================
--- trunk/src/model/build.gradle 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/model/build.gradle 2014-03-09 11:18:38 UTC (rev 9687)
@@ -7,7 +7,6 @@
dependencies {
compile name: 'annotations', version: '0.0'
compile name: 'japi-lib-swing-misc', version: 'trunk-1398', group: 'japi-lib'
- compile name: 'jdom', version: '1.0'
compile name: 'log4j', version: '1.2.13'
compile name: 'xom', version: '1.2.10'
compile project(':src:utils')
Modified: trunk/src/model/model.iml
===================================================================
--- trunk/src/model/model.iml 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/model/model.iml 2014-03-09 11:18:38 UTC (rev 9687)
@@ -17,7 +17,6 @@
<orderEntry type="library" name="japi-lib-swing-misc" level="project" />
<orderEntry type="library" name="japi-lib-util" level="project" />
<orderEntry type="library" name="japi-lib-xml" level="project" />
- <orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="log4j" level="project" />
<orderEntry type="library" name="xom" level="project" />
Modified: trunk/src/plugin/plugin.iml
===================================================================
--- trunk/src/plugin/plugin.iml 2014-03-09 10:48:51 UTC (rev 9686)
+++ trunk/src/plugin/plugin.iml 2014-03-09 11:18:38 UTC (rev 9687)
@@ -16,7 +16,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="bsh-core" level="project" />
<orderEntry type="library" name="bsh-util" level="project" />
- <orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="log4j" level="project" />
<orderEntry type="library" name="xom" level="project" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-03-09 11:28:08
|
Revision: 9688
http://sourceforge.net/p/gridarta/code/9688
Author: akirschbaum
Date: 2014-03-09 11:28:03 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Remove support for building with Ant. From now on Gradle is required to build the editor from sources.
Modified Paths:
--------------
trunk/README
trunk/build-jenkins.sh
trunk/src/atrinik/ChangeLog
trunk/src/crossfire/ChangeLog
trunk/src/daimonin/ChangeLog
Removed Paths:
-------------
trunk/build.xml
Modified: trunk/README
===================================================================
--- trunk/README 2014-03-09 11:18:38 UTC (rev 9687)
+++ trunk/README 2014-03-09 11:28:03 UTC (rev 9688)
@@ -77,10 +77,6 @@
The build file to build the project with Gradle.
See also INSTALL.
-build.xml
- The build file to build the project with Ant. This file may or may not work
- anymore. The preferred way to build the project is now Gradle.
-
build/ (generated)
**/build/ (generated)
These directories contain generated files.
Modified: trunk/build-jenkins.sh
===================================================================
--- trunk/build-jenkins.sh 2014-03-09 11:18:38 UTC (rev 9687)
+++ trunk/build-jenkins.sh 2014-03-09 11:28:03 UTC (rev 9688)
@@ -4,7 +4,6 @@
unset DISPLAY
cd trunk
debuild -uc -us
-ant clean jar test checkstyle javadoc
gradle clean
rm -rf .gradle
gradle installApp check preparePublish :javadoc
Deleted: trunk/build.xml
===================================================================
--- trunk/build.xml 2014-03-09 11:18:38 UTC (rev 9687)
+++ trunk/build.xml 2014-03-09 11:28:03 UTC (rev 9688)
@@ -1,1291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- ~ Copyright (C) 2000-2011 The Gridarta Developers.
- ~
- ~ This program is free software; you can redistribute it and/or modify
- ~ it under the terms of the GNU General Public License as published by
- ~ the Free Software Foundation; either version 2 of the License, or
- ~ (at your option) any later version.
- ~
- ~ This program is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ~ GNU General Public License for more details.
- ~
- ~ You should have received a copy of the GNU General Public License along
- ~ with this program; if not, write to the Free Software Foundation, Inc.,
- ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- -->
-
-<!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "src/gridarta/src/doc/dtd/catalogForAnt.xml">]>
-<project default="jar">
-
- <description>
- Build file for Gridarta - 2D MMORPG Map Editor.
- </description>
-
- <property file="developer.properties"/>
- <property file="project.properties"/>
- <property name="build.source.encoding" value="utf-8"/>
- <property name="build.source.version" value="1.6"/>
- <property name="build.target.version" value="${build.source.version}"/>
- <property name="debug" value="true"/>
- <property name="build.developer" value="unknown"/>
- <property name="javac.fork" value="no"/>
- <property name="javac.args" value="-Xlint:all,-path,-unchecked,-fallthrough,-serial,-deprecation"/>
- <property name="user.javadoc.link" value="http://java.sun.com/javase/6/docs/api/"/>
- <property name="user.javadoc.javasrc" value="${user.javadoc.javahome}/src"/>
- <property name="user.svn.javahl" value="false"/>
- <property name="svn.baseUrl" value="https://gridarta.svn.sourceforge.net/svnroot/gridarta"/>
-
- <condition property="svnCreateBranch" value="true">
- <equals arg1="${project.version.patch}" arg2="0"/>
- </condition>
- <condition property="svn.branch.sourceUrl" value="${svn.baseUrl}/trunk">
- <equals arg1="${project.version.patch}" arg2="0"/>
- </condition>
- <condition property="svn.branch.targetUrl" value="${svn.baseUrl}/branches/${project.version.major}.${project.version.minor}">
- <equals arg1="${project.version.patch}" arg2="0"/>
- </condition>
- <condition property="svn.branch.message" value="Creating branch for version ${project.version.major}.${project.version.minor}">
- <equals arg1="${project.version.patch}" arg2="0"/>
- </condition>
- <property name="svn.tag.sourceUrl" value="${svn.baseUrl}/branches/${project.version.major}.${project.version.minor}"/>
- <property name="svn.tag.targetUrl" value="${svn.baseUrl}/tags/${project.version.major}.${project.version.minor}.${project.version.patch}"/>
- <property name="svn.tag.message" value="Creating release tag for version ${project.version.major}.${project.version.minor}.${project.version.patch}"/>
-
- <property name="build.dir" value="dest"/>
- <property name="dist.dir" value="dist"/>
- <property name="docs.dir" value="docs"/>
-
- <path id="path.class.atrinik.app">
- <pathelement location="${build.dir}/atrinik/app"/>
- </path>
- <path id="path.class.atrinik.test">
- <path refid="path.class.atrinik.app"/>
- <pathelement location="${build.dir}/atrinik/test"/>
- </path>
-
- <path id="path.class.crossfire.app">
- <pathelement location="${build.dir}/crossfire/app"/>
- </path>
- <path id="path.class.crossfire.test">
- <path refid="path.class.crossfire.app"/>
- <pathelement location="${build.dir}/crossfire/test"/>
- </path>
-
- <path id="path.class.daimonin.app">
- <pathelement location="${build.dir}/daimonin/app"/>
- </path>
- <path id="path.class.daimonin.test">
- <path refid="path.class.daimonin.app"/>
- <pathelement location="${build.dir}/daimonin/test"/>
- </path>
-
- <path id="path.class.gridarta.app">
- <pathelement location="${build.dir}/gridarta/app"/>
- </path>
- <path id="path.class.gridarta.test">
- <path refid="path.class.gridarta.app"/>
- <pathelement location="${build.dir}/gridarta/test"/>
- </path>
-
- <path id="path.class.model.app">
- <pathelement location="${build.dir}/model/app"/>
- </path>
- <path id="path.class.model.test">
- <path refid="path.class.model.app"/>
- <pathelement location="${build.dir}/model/test"/>
- </path>
-
- <path id="path.class.preferences.app">
- <pathelement location="${build.dir}/preferences/app"/>
- </path>
- <path id="path.class.preferences.test">
- <path refid="path.class.preferences.app"/>
- <pathelement location="${build.dir}/preferences/test"/>
- </path>
-
- <path id="path.class.plugin.app">
- <pathelement location="${build.dir}/plugin/app"/>
- </path>
- <path id="path.class.plugin.test">
- <path refid="path.class.plugin.app"/>
- <pathelement location="${build.dir}/plugin/test"/>
- </path>
-
- <path id="path.class.project.app">
- <pathelement location="${build.dir}/project/app"/>
- </path>
- <path id="path.class.project.test">
- <path refid="path.class.project.app"/>
- <pathelement location="${build.dir}/project/test"/>
- </path>
-
- <path id="path.class.textedit.app">
- <pathelement location="${build.dir}/textedit/app"/>
- </path>
- <path id="path.class.textedit.test">
- <path refid="path.class.textedit.app"/>
- <pathelement location="${build.dir}/textedit/test"/>
- </path>
-
- <path id="path.class.utils.app">
- <pathelement location="${build.dir}/utils/app"/>
- </path>
- <path id="path.class.utils.test">
- <path refid="path.class.utils.app"/>
- <pathelement location="${build.dir}/utils/test"/>
- </path>
-
- <path id="path.lib.annotations" location="repo/annotations/0.0/annotations-0.0.jar"/>
- <path id="path.lib.bsh-core" location="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar"/>
- <path id="path.lib.bsh-util" location="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar"/>
- <path id="path.lib.getopt" location="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
- <path id="path.lib.japi-swing-about" location="repo/japi-lib/japi-lib-swing-about/0.1.0/japi-lib-swing-about-0.1.0.jar"/>
- <path id="path.lib.japi-swing-action" location="repo/japi-lib/japi-lib-swing-action/0.1.0/japi-lib-swing-action-0.1.0.jar"/>
- <path id="path.lib.japi-swing-misc" location="repo/japi-lib/japi-lib-swing-misc/trunk-1398/japi-lib-swing-misc-trunk-1398.jar"/>
- <path id="path.lib.japi-swing-prefs" location="repo/japi-lib/japi-lib-swing-prefs/0.1.0/japi-lib-swing-prefs-0.1.0.jar"/>
- <path id="path.lib.japi-swing-tod" location="repo/japi-lib/japi-lib-swing-tod/0.1.0/japi-lib-swing-tod-0.1.0.jar"/>
- <path id="path.lib.japi-util" location="repo/japi-lib/japi-lib-util/trunk-1410/japi-lib-util-trunk-1410.jar"/>
- <path id="path.lib.japi-xml" location="repo/japi-lib/japi-lib-xml/0.1.0/japi-lib-xml-0.1.0.jar"/>
- <path id="path.lib.jdom" location="repo/jdom/1.0/jdom-1.0.jar"/>
- <path id="path.lib.log4j" location="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
- <path id="path.lib.junit" location="repo/junit/4.2/junit-4.2.jar"/>
- <path id="path.lib.rsyntaxtextarea" location="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
-
- <path id="xsltpath">
- <fileset dir="lib" includes="**/*.jar"/>
- <fileset dir="repo" includes="**/*.jar"/>
- </path>
- <taskdef name="megaxslt" classpathref="xsltpath" classname="com.hujer.ant.tasks.megaxslt.MegaXsltTask"/>
- <taskdef name="rgzip" classpath="lib/megaxslt.jar" classname="com.hujer.ant.tasks.rgzip.RGZipTask"/>
- <taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task"/>
- <taskdef name="freshmeat" classpath="repo/antmeat/0.3/antmeat-0.3.jar" classname="de.frewert.ant.freshmeat.Announcement">
- <classpath>
- <pathelement path="lib/xmlrpc-2.0.1.jar"/>
- <pathelement path="lib/commons-codec-1.3.jar"/>
- </classpath>
- </taskdef>
- <taskdef name="svn" classpath="lib/svnant.jar" classname="org.tigris.subversion.svnant.SvnTask">
- <classpath>
- <pathelement path="lib/svnClientAdapter.jar"/>
- <pathelement path="lib/jakarta-regexp-1.3.jar"/>
- </classpath>
- </taskdef>
-
- &catalogForAnt;
-
- <target name="update" if="dev.autoupdate">
- <svn javahl="${user.svn.javahl}">
- <update dir="."/>
- </svn>
- </target>
-
- <target name="clean" description="Removes all generated files.">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete file="src/gridarta/src/doc/dev/SafeCopy.java.xhtml"/>
- <delete file="src/gridarta/src/doc/dev/changelog.xml"/>
- <delete dir="${docs.dir}"/>
- <delete file="AtrinikEditor.jar"/>
- <delete file="CrossfireEditor.jar"/>
- <delete file="DaimoninEditor.jar"/>
- </target>
-
- <target name="jar" description="Creates AtrinikEditor.jar, CrossfireEditor.jar, and DaimoninEditor.jar" depends="jar-atrinik,jar-crossfire,jar-daimonin"/>
-
- <target name="jar-atrinik" description="Creates AtrinikEditor.jar" depends="compile-atrinik,init-properties">
- <jar destfile="AtrinikEditor.jar" index="true">
- <fileset dir="${build.dir}/atrinik/app"/>
- <fileset dir="${build.dir}/gridarta/app"/>
- <fileset dir="${build.dir}/model/app"/>
- <fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/plugin/app"/>
- <fileset dir="${build.dir}/project/app"/>
- <fileset dir="${build.dir}/textedit/app"/>
- <fileset dir="${build.dir}/utils/app"/>
- <fileset dir="${build.dir}" includes="build.properties"/>
- <fileset file="COPYING"/>
- <fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
- <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
- <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
- <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
- <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
- <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
- <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/>
- <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
- <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
- <manifest>
- <attribute name="Main-Class" value="net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor"/>
- <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
- </manifest>
- </jar>
- </target>
-
- <target name="jar-crossfire" description="Creates CrossfireEditor.jar" depends="compile-crossfire,init-properties">
- <jar destfile="CrossfireEditor.jar" index="true">
- <fileset dir="${build.dir}/crossfire/app"/>
- <fileset dir="${build.dir}/gridarta/app"/>
- <fileset dir="${build.dir}/model/app"/>
- <fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/plugin/app"/>
- <fileset dir="${build.dir}/project/app"/>
- <fileset dir="${build.dir}/textedit/app"/>
- <fileset dir="${build.dir}/utils/app"/>
- <fileset dir="${build.dir}" includes="build.properties"/>
- <fileset file="COPYING"/>
- <fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
- <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
- <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
- <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
- <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
- <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
- <zipfileset src="repo/jdom/1.0/jdom-1.0.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
- <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
- <manifest>
- <attribute name="Main-Class" value="net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor"/>
- <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
- </manifest>
- </jar>
- </target>
-
- <target name="jar-daimonin" description="Creates DaimoninEditor.jar" depends="compile-daimonin,init-properties">
- <jar destfile="DaimoninEditor.jar" index="true">
- <fileset dir="${build.dir}/daimonin/app"/>
- <fileset dir="${build.dir}/gridarta/app"/>
- <fileset dir="${build.dir}/model/app"/>
- <fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/plugin/app"/>
- <fileset dir="${build.dir}/project/app"/>
- <fileset dir="${build.dir}/textedit/app"/>
- <fileset dir="${build.dir}/utils/app"/>
- <fileset dir="${build.dir}" includes="build.properties"/>
- <fileset file="COPYING"/>
- <fileset file="repo/bsh/bsh-LICENSE"/>
- <fileset file="repo/japi-lib/japi-lib.jar-LICENSE"/>
- <fileset file="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar-LICENSE"/>
- <fileset file="repo/jdom/1.0/jdom-1.0.jar-LICENSE"/>
- <fileset file="repo/jlfgr/1.0/jlfgr-1.0.jar-LICENSE"/>
- <fileset file="repo/log4j/1.2.13/log4j-1.2.13.jar-LICENSE"/>
- <fileset file="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar-LICENSE"/>
- <zipfileset src="repo/bsh/bsh-classgen/2.0b4/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-commands/2.0b4/bsh-commands-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-core/2.0b4/bsh-core-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/bsh/bsh-util/2.0b4/bsh-util-2.0b4.jar" excludes="META-INF/**"/>
- <zipfileset src="repo/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
- <zipfileset src="repo/jdom/1.0/jdom-1.0.jar"/>
- <zipfileset src="repo/log4j/1.2.13/log4j-1.2.13.jar"/>
- <zipfileset src="repo/rsyntaxtextarea/1.5.1/rsyntaxtextarea-1.5.1.jar"/>
- <zipgroupfileset dir="repo/japi-lib" includes="**/japi-lib-*.jar"/>
- <manifest>
- <attribute name="Main-Class" value="net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor"/>
- <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/>
- </manifest>
- </jar>
- </target>
-
- <target name="init-properties">
- <tstamp>
- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC"/>
- </tstamp>
- <exec executable="svnversion" outputproperty="build.number" failifexecutionfails="false"/>
- <property name="build.number" value="unknown"/>
- <echoproperties destfile="${build.dir}/build.properties">
- <propertyset>
- <propertyref prefix="build.developer"/>
- <propertyref prefix="build.number"/>
- <propertyref prefix="build.tstamp"/>
- </propertyset>
- </echoproperties>
- </target>
-
- <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-project,compile-utils">
- <mkdir dir="${build.dir}/atrinik/app"/>
- <javac srcdir="src/atrinik/src/main/java" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.gridarta.app"/>
- <path refid="path.class.model.app"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.project.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-swing-prefs"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/atrinik/app">
- <fileset dir="src/atrinik/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/atrinik/test"/>
- <javac srcdir="src/atrinik/src/test/java" destdir="${build.dir}/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.atrinik.app"/>
- <path refid="path.class.gridarta.test"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.utils.test"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/atrinik/test">
- <fileset dir="src/atrinik/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-project,compile-utils">
- <mkdir dir="${build.dir}/crossfire/app"/>
- <javac srcdir="src/crossfire/src/main/java" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.gridarta.app"/>
- <path refid="path.class.model.app"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.project.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-swing-prefs"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/crossfire/app">
- <fileset dir="src/crossfire/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/crossfire/test"/>
- <javac srcdir="src/crossfire/src/test/java" destdir="${build.dir}/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.crossfire.app"/>
- <path refid="path.class.gridarta.test"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.utils.test"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/crossfire/test">
- <fileset dir="src/crossfire/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-project,compile-utils">
- <mkdir dir="${build.dir}/daimonin/app"/>
- <javac srcdir="src/daimonin/src/main/java" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.gridarta.app"/>
- <path refid="path.class.model.app"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.project.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-swing-prefs"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/daimonin/app">
- <fileset dir="src/daimonin/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/daimonin/test"/>
- <javac srcdir="src/daimonin/src/test/java" destdir="${build.dir}/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.daimonin.app"/>
- <path refid="path.class.gridarta.test"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.utils.test"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/daimonin/test">
- <fileset dir="src/daimonin/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-project,compile-textedit,compile-utils">
- <mkdir dir="${build.dir}/gridarta/app"/>
- <javac srcdir="src/gridarta/src/main/java" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.model.app"/>
- <path refid="path.class.preferences.app"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.project.app"/>
- <path refid="path.class.textedit.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.bsh-core"/>
- <path refid="path.lib.bsh-util"/>
- <path refid="path.lib.getopt"/>
- <path refid="path.lib.japi-swing-about"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-swing-prefs"/>
- <path refid="path.lib.japi-swing-tod"/>
- <path refid="path.lib.japi-util"/>
- <path refid="path.lib.jdom"/>
- <path refid="path.lib.log4j"/>
- <path refid="path.lib.rsyntaxtextarea"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/gridarta/app">
- <fileset dir="src/gridarta/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/gridarta/test"/>
- <javac srcdir="src/gridarta/src/test/java" destdir="${build.dir}/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.gridarta.app"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.preferences.test"/>
- <path refid="path.class.textedit.test"/>
- <path refid="path.class.utils.test"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/gridarta/test">
- <fileset dir="src/gridarta/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-model" description="Compiles the model module." depends="compile-utils">
- <mkdir dir="${build.dir}/model/app"/>
- <javac srcdir="src/model/src/main/java" destdir="${build.dir}/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-util"/>
- <path refid="path.lib.japi-xml"/>
- <path refid="path.lib.jdom"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/model/app">
- <fileset dir="src/model/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/model/test"/>
- <javac srcdir="src/model/src/test/java" destdir="${build.dir}/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.model.app"/>
- <path refid="path.class.utils.test"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-swing-misc"/>
- <path refid="path.lib.japi-util"/>
- <path refid="path.lib.junit"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/model/test">
- <fileset dir="src/model/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-preferences" description="Compiles the preferences module.">
- <mkdir dir="${build.dir}/preferences/app"/>
- <javac srcdir="src/preferences/src/main/java" destdir="${build.dir}/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/preferences/app">
- <fileset dir="src/preferences/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/preferences/test"/>
- <javac srcdir="src/preferences/src/test/java" destdir="${build.dir}/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.preferences.app"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/preferences/test">
- <fileset dir="src/preferences/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-plugin" description="Compiles the plugin module." depends="compile-model,compile-utils">
- <mkdir dir="${build.dir}/plugin/app"/>
- <javac srcdir="src/plugin/src/main/java" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.model.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.bsh-core"/>
- <path refid="path.lib.bsh-util"/>
- <path refid="path.lib.jdom"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/plugin/app">
- <fileset dir="src/plugin/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/plugin/test"/>
- <javac srcdir="src/plugin/src/test/java" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.model.app"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.jdom"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/plugin/test">
- <fileset dir="src/plugin/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-project" description="Compiles the project module." depends="compile-model,compile-plugin,compile-utils">
- <mkdir dir="${build.dir}/project/app"/>
- <javac srcdir="src/project/src/main/java" destdir="${build.dir}/project/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.model.app"/>
- <path refid="path.class.plugin.app"/>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/project/app">
- <fileset dir="src/project/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/project/test"/>
- <javac srcdir="src/project/src/test/java" destdir="${build.dir}/project/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.project.app"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/project/test">
- <fileset dir="src/project/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-textedit" description="Compiles the textedit module." depends="compile-utils">
- <mkdir dir="${build.dir}/textedit/app"/>
- <javac srcdir="src/textedit/src/main/java" destdir="${build.dir}/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/textedit/app">
- <fileset dir="src/textedit/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/textedit/test"/>
- <javac srcdir="src/textedit/src/test/java" destdir="${build.dir}/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.textedit.app"/>
- <path refid="path.class.utils.test"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/textedit/test">
- <fileset dir="src/textedit/src/test/resources"/>
- </copy>
- </target>
-
- <target name="compile-utils" description="Compiles the utils module.">
- <mkdir dir="${build.dir}/utils/app"/>
- <javac srcdir="src/utils/src/main/java" destdir="${build.dir}/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
- <classpath>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-util"/>
- <path refid="path.lib.japi-xml"/>
- <path refid="path.lib.log4j"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/utils/app">
- <fileset dir="src/utils/src/main/resources"/>
- </copy>
- <mkdir dir="${build.dir}/utils/test"/>
- <javac srcdir="src/utils/src/test/java" destdir="${build.dir}/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
- <classpath>
- <path refid="path.class.utils.app"/>
- <path refid="path.lib.annotations"/>
- <path refid="path.lib.japi-swing-action"/>
- <path refid="path.lib.japi-util"/>
- <path refid="path.lib.japi-xml"/>
- <path refid="path.lib.junit"/>
- </classpath>
- <compilerarg line="${javac.args}"/>
- </javac>
- <copy todir="${build.dir}/utils/test">
- <fileset dir="src/utils/src/test/resources"/>
- </copy>
- </target>
-
- <target name="doc" depends="editorialDoc,apiDoc" description="Creates project documentation."/>
-
- <target name="java2html" description="Converts documentation java sources to XHTML.">
- <taskdef name="java2html" classpath="lib/java2html.jar" classname="de.java2html.anttasks.Java2HtmlTask"/>
- <java2html srcdir="src/gridarta/src/doc" destdir="src/gridarta/src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/>
- </target>
-
- <target name="editorialDoc" description="Creates the editorial part of the project documentation." depends="java2html">
- <mkdir dir="${build.dir}/doc"/>
- <megaxslt srcdir="src/gridarta/src/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="true" ending="xhtml" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
- <xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/gridarta/src/doc/transform.xslt"/>
- <transformation stylesheet="src/gridarta/src/doc/cleanupXhtml11.xslt"/>
- </megaxslt>
- <megaxslt srcdir="${build.dir}/doc" destdir="${build.dir}/doc" includes="**/*.xhtml" validatesource="true" validatedest="false" ending="html" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
- <xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/gridarta/src/doc/xhtml2html.xslt"/>
- </megaxslt>
- <megaxslt srcdir="src/gridarta/src/doc" destdir="." includes="faq.xhtml" validatesource="true" validatedest="false" ending="" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
- <xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/gridarta/src/doc/faq2txt.xslt"/>
- </megaxslt>
- <copy file="faq" tofile="FAQ"/>
- <copy todir="${build.dir}/doc">
- <fileset dir="src/gridarta/src/doc">
- <include name="**/.htaccess"/>
- <include name="**/*.html"/>
- <include name="dtd/**/*.mod"/>
- <include name="dtd/**/*.dtd"/>
- <include name="dtd/**/*.xml"/>
- <include name="**/*.css"/>
- <include name="**/*.png"/>
- <include name="**/*.gif"/>
- <include name="robots.txt"/>
- <exclude name="**/.xvpics/*.png"/>
- </fileset>
- </copy>
- </target>
-
- <target name="apiDoc" description="Creates public javadoc documentation.">
- <mkdir dir="${build.dir}/doc/api/${project.version}"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/copyright.xhtml"/>
- <copy todir="${build.dir}/doc/api/${project.version}" file="src/gridarta/src/doc/dev/api/.htaccess"/>
- <javadoc destdir="${build.dir}/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
- <classpath>
- <fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/>
- </classpath>
- <sourcepath>
- <pathelement path="${user.javadoc.javasrc}"/>
- <path refid="path.class.atrinik.test"/>
- <path refid="path.class.crossfire.test"/>
- <path refid="path.class.daimonin.test"/>
- <path refid="path.class.gridarta.test"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.preferences.test"/>
- <path refid="path.class.plugin.test"/>
- <path refid="path.class.project.test"/>
- <path refid="path.class.textedit.test"/>
- <path refid="path.class.utils.test"/>
- </sourcepath>
- <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/project/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/project/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
- <tag name="todo" description="Todo:"/>
- <tag name="used" description="Manually marked as used." enabled="false"/>
- <tag name="fixme" description="Fixme:"/>
- <tag name="xxx" description="XXX:"/>
- <tag name="note" description="Note:"/>
- <tag name="warning" description="Warning:"/>
- <tag name="retval" description="Return Value:"/>
- <tag name="val" description="Value:"/>
- <tag name="default" description="Default Value:"/>
- <tag name="invariant" description="Invariant:"/>
- <tag name="pre" description="Precondition:"/>
- <tag name="noinspection" description="No Inspection:"/>
- </javadoc>
- </target>
-
- <target name="dist" description="Packs distribution archives." depends="distSrc,distLib,distDoc"/>
-
- <target name="distSrc" description="Packs source distribution archives.">
- <mkdir dir="${dist.dir}"/>
- <property name="distSrc" value="${dist.dir}/gridarta-${project.version}.src"/>
- <parallel>
- <tar tarfile="${distSrc}.tar">
- <tarfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/gridarta/src/**"/>
- <include name="build.xml"/>
- </tarfileset>
- </tar>
- <zip destfile="${distSrc}.zip">
- <zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/gridarta/src/**"/>
- <include name="build.xml"/>
- </zipfileset>
- </zip>
- <jar destfile="${distSrc}.jar">
- <zipfileset dir="." prefix="gridarta-${project.version}">
- <include name="src/gridarta/src/**"/>
- <include name="build.xml"/>
- </zipfileset>
- </jar>
- </parallel>
- <parallel>
- <gzip src="${distSrc}.tar" destfile="${distSrc}.tar.gz"/>
- <bzip2 src="${distSrc}.tar" destfile="${distSrc}.tar.bz2"/>
- </parallel>
- <delete file="${distSrc}.tar"/>
- </target>
-
- <target name="distLib" description="Packs library distribution archives."> <!--XXX:depends="compile"-->
- <mkdir dir="${dist.dir}"/>
- <property name="distLib" value="${dist.dir}/gridarta-${project.version}.lib"/>
- <jar destfile="${distLib}.jar">
- <zipfileset dir="${build.dir}/app"/>
- <manifest>
- <attribute name="Implementation-Title" value="Gridarta"/>
- <attribute name="Implementation-Vendor" value="The Gridarta Developers"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-URL" value="http://sourceforge.net/projects/gridarta/"/>
- </manifest>
- </jar>
- <pack200 src="${distLib}.jar" destfile="${distLib}.pack.gz" gzipoutput="true" stripdebug="true" effort="9" keepfileorder="false" modificationtime="latest" deflatehint="false"/>
- </target>
-
- <target name="distDoc" description="Packs documentation archives." depends="apiDoc">
- <mkdir dir="${dist.dir}"/>
- <property name="distDoc" value="${dist.dir}/gridarta-${project.version}.doc"/>
- <parallel>
- <tar tarfile="${distDoc}.tar">
- <tarfileset dir="${build.dir}/doc" prefix="gridarta-${project.version}">
- <include name="api/${project.version}/**"/>
- </tarfileset>
- </tar>
- <zip destfile="${distDoc}.zip">
- <zipfileset dir="${build.dir}/doc" prefix="gridarta-${project.version}">
- <include name="api/${project.version}/**"/>
- </zipfileset>
- </zip>
- <jar destfile="${distDoc}.jar">
- <zipfileset dir="${build.dir}/doc" prefix="gridarta-${project.version}">
- <include name="api/${project.version}/**"/>
- </zipfileset>
- </jar>
- </parallel>
- <parallel>
- <gzip src="${distDoc}.tar" destfile="${distDoc}.tar.gz"/>
- <bzip2 src="${distDoc}.tar" destfile="${distDoc}.tar.bz2"/>
- </parallel>
- <delete file="${distDoc}.tar"/>
- </target>
-
- <target name="checkDevMail" description="Checks whether the developer defined his / her email address." unless="developer.email">
- <fail message="You must define the property developer.email with your email address in the file developer.properties."/>
- </target>
-
- <target name="checkDevSmtp" description="Checks whether the developer defined his / her smtp host." unless="user.mail.smtp.host">
- <fail message="You must define the property user.mail.smtp.host with your smtp host address in the file developer.properties."/>
- </target>
-
- <target name="releaseDist" description="Uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist">
- <touch file="src/gridarta/src/doc/api/start.xhtml" millis="0"/>
- <megaxslt srcdir="src/gridarta/src/doc/api" destdir="src/gridarta/src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true">
- <xmlcatalog refid="commonDTDs"/>
- <parameter name="project.version" value="${project.version}"/>
- <transformation stylesheet="src/gridarta/src/doc/api/release.xslt"/>
- </megaxslt>
- <svn javahl="${user.svn.javahl}">
- <commit file="src/gridarta/src/doc/api/start.xhtml" message="Updating API link to include ${project.version}."/>
- </svn>
- <exec executable="rsync" failonerror="true">
- <arg line="-auzv -e ssh ${build.dir}/doc/api/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/api/"/>
- </exec>
- <sshexec host="${user.rsync.host}" username="${user.rsync.username}" keyfile="${user.ssh.keyfile}" command="rm ${user.rsync.dir}/htdocs/api/latest ; ln -s ${project.version} ${user.rsync.dir}/htdocs/api/latest"/>
- <ftp server="upload.sourceforge.net" userid="anonymous" password="${developer.email}" remotedir="incoming" action="put">
- <fileset dir="${dist.dir}"/>
- </ftp>
- <antcall target="svnCreateBranch"/>
- <antcall target="svnCreateTag"/>
- <antcall target="uploadDoc"/>
- </target>
-
- <target name="uploadDoc" description="Uploads the latest editorial documentation." depends="editorialDoc">
- <exec executable="rsync" failonerror="true">
- <arg line="-auzv-e ssh ${build.dir}/doc/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/"/>
- </exec>
- </target>
-
- <target name="announce" description="announce new version on freshmeat.net">
- <echo>Announcing. Press return to start announcing this release at
- FreshMeat.
- </echo>
- <input/>
- <freshmeat username="${user.freshmeat.username}" password="${user.freshmeat.password}">
- <printlicenses/>
- <printreleasefoci/>
- <publish projectname="gridarta" branchname="Default" version="${project.version}" focus="${project.focus}">
- <changes file="LatestNews"/>
- <urlblock homepage="http://gridarta.sourceforge.net/" cvs="http://svn.sourceforge.net/viewcvs.cgi/gridarta/" mailinglist="http://sourceforge.net/mailarchive/forum.php?forum=gridarta-users" tgz="http://prdownloads.sourceforge.net/gridarta/gridarta-${project.version}.src.tar.gz?download" bz2="http://prdownloads.sourceforge.net/gridarta/gridarta-${project.version}.src.tar.bz2?download" zip="http://prdownloads.sourceforge.net/gridarta/gridarta-${project.version}.src.zip?download"/>
- </publish>
- </freshmeat>
- </target>
-
- <target name="release" description="Releases a new version of Gridarta.">
- <antcall target="clean"/>
- <antcall target="releaseDist"/>
- <echo>I've uploaded the distribution archives to sourceforge. Press
- return when you're done configuring the new file releases on
- sourceforge. I will then announce the release at FreshMeat.
- </echo>
- <input/>
- <antcall target="announce"/>
- </target>
-
- <target name="svnCreateBranch" description="Creates a release branch for a new major or minor revision. This target shouldn't be invoked directly." if="svnCreateBranch">
- <svn javahl="${user.svn.javahl}">
- <copy srcUrl="${svn.branch.sourceUrl}" desturl="${svn.branch.targetUrl}" message="${svn.branch.message}"/>
- </svn>
- </target>
-
- <target name="svnCreateTag" description="Creates a release tag for a new patch revision. This target shouldn't be invoked directly.">
- <svn javahl="${user.svn.javahl}">
- <copy srcUrl="${svn.tag.sourceUrl}" desturl="${svn.tag.targetUrl}" message="${svn.tag.message}"/>
- </svn>
- </target>
-
- <target name="checkstyle" description="Runs checkstyle to style-check the source code">
- <taskdef resource="checkstyletask.properties" classpath="repo/checkstyle-all/5.0/checkstyle-all-5.0.jar"/>
- <mkdir dir="${build.dir}/doc"/>
- <checkstyle config="config/checkstyle/checkstyle.xml" failOnViolation="true">
- <formatter type="plain" tofile="${build.dir}/doc/checkstyle_report.txt"/>
- <formatter type="plain"/>
- <fileset dir="src/gridarta/src/main/java" includes="**/*.java"/>
- <fileset dir="src/gridarta/src/test/java" includes="**/*.java"/>
- <fileset dir="src/atrinik/src/main/java" includes="**/*.java"/>
- <fileset dir="src/atrinik/src/test/java" includes="**/*.java"/>
- <fileset dir="src/crossfire/src/main/java" includes="**/*.java"/>
- <fileset dir="src/crossfire/src/test/java" includes="**/*.java"/>
- <fileset dir="src/daimonin/src/main/java" includes="**/*.java"/>
- <fileset dir="src/daimonin/src/test/java" includes="**/*.java"/>
- <fileset dir="src/model/src/main/java" includes="**/*.java"/>
- <fileset dir="src/model/src/test/java" includes="**/*.java"/>
- <fileset dir="src/preferences/src/main/java" includes="**/*.java"/>
- <fileset dir="src/preferences/src/test/java" includes="**/*.java"/>
- <fileset dir="src/plugin/src/main/java" includes="**/*.java"/>
- <fileset dir="src/plugin/src/test/java" includes="**/*.java"/>
- <fileset dir="src/project/src/main/java" includes="**/*.java"/>
- <fileset dir="src/project/src/test/java" includes="**/*.java"/>
- <fileset dir="src/textedit/src/main/java" includes="**/*.java"/>
- <fileset dir="src/textedit/src/test/java" includes="**/*.java"/>
- <fileset dir="src/utils/src/main/java" includes="**/*.java"/>
- <fileset dir="src/utils/src/test/java" includes="**/*.java"/>
- </checkstyle>
- </target>
-
- <target name="mailCheckstyle" description="Mails checkstyle results to the mailing list" depends="checkstyle,checkDevMail,checkDevSmtp">
- <mail from="${developer.email}" tolist="gri...@li..." mailhost="${user.mail.smtp.host}" subject="Checkstyle violation(s) in Gridarta" files="checkstyle_report.html"/>
- </target>
-
- <target name="changelog" description="Updates the changelog">
- <exec executable="svn" output="src/gridarta/src/doc/dev/changelog.xml">
- <arg line="log -v --xml"/>
- </exec>
- <megaxslt srcdir="src/gridarta/src/doc/dev" destdir="src/gridarta/src/doc/dev" includes="changelog.xml" validatesource="false" validatedest="false" ending="xhtml" converttocanonical="true" transformerFactoryImplementationClassName="net.sf.saxon.TransformerFactoryImpl">
- <xmlcatalog refid="commonDTDs"/>
- <transformation stylesheet="src/gridarta/src/doc/dev/changelog.xslt"/>
- </megaxslt>
- </target>
-
- <target name="javadoc" depends="init-properties" description="Creates the JavaDoc documentation for the complete editor source.">
- <mkdir dir="${build.dir}/doc/dev/api"/>
- <javadoc destdir="${build.dir}/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/gridarta/src/main/java/overview.html" link="${user.javadoc.link}">
- <classpath>
- <fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/>
- <fileset dir="repo" includes="**/*.jar" excludes="*.jar-LICENSE"/>
- </classpath>
- <sourcepath>
- <pathelement path="${user.javadoc.javasrc}"/>
- <path refid="path.class.atrinik.test"/>
- <path refid="path.class.crossfire.test"/>
- <path refid="path.class.daimonin.test"/>
- <path refid="path.class.gridarta.test"/>
- <path refid="path.class.model.test"/>
- <path refid="path.class.preferences.test"/>
- <path refid="path.class.plugin.test"/>
- <path refid="path.class.project.test"/>
- <path refid="path.class.textedit.test"/>
- <path refid="path.class.utils.test"/>
- </sourcepath>
- <packageset dir="src/gridarta/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/gridarta/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/atrinik/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/atrinik/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/crossfire/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/crossfire/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/daimonin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/daimonin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/model/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/model/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/preferences/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/preferences/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/plugin/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/plugin/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/project/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/project/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/textedit/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/textedit/src/test/java" defaultexcludes="yes"/>
- <packageset dir="src/utils/src/main/java" defaultexcludes="yes"/>
- <packageset dir="src/utils/src/test/java" defaultexcludes="yes"/>
- <bottom>
- <![CDATA[<address>
- <a href="http://sourceforge.net/"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=166996&type=1" alt="SourceForge.net Logo" width="88" height="31" class="now" /></a>
- <a href="http://sourceforge.net/donate/index.php?group_id=166996"><img src="http://sourceforge.net/images/project-support.jpg" width="88" height="32" alt="Support This Project" class="now" /></a>
- <a href="http://freshmeat.net/projects/g...
[truncated message content] |
![http://sourceforge.net/images/project-support.jpg"](http://sourceforge.net/images/project-support.jpg"){kind=link}
|
From: <aki...@us...> - 2014-03-10 20:26:55
|
Revision: 9693
http://sourceforge.net/p/gridarta/code/9693
Author: akirschbaum
Date: 2014-03-10 20:26:52 +0000 (Mon, 10 Mar 2014)
Log Message:
-----------
Somewhat fix build script for .deb package. Do not build .deb package in Jenkins build.
Modified Paths:
--------------
trunk/build-jenkins.sh
trunk/debian/compat
trunk/debian/control
trunk/debian/gridarta-atrinik.install
trunk/debian/gridarta-crossfire.install
trunk/debian/gridarta-daimonin.install
trunk/debian/rules
Modified: trunk/build-jenkins.sh
===================================================================
--- trunk/build-jenkins.sh 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/build-jenkins.sh 2014-03-10 20:26:52 UTC (rev 9693)
@@ -3,7 +3,7 @@
set -e
unset DISPLAY
cd trunk
-debuild -uc -us
+#debuild -uc -us
gradle clean
rm -rf .gradle
gradle installApp check preparePublish :javadoc
Modified: trunk/debian/compat
===================================================================
--- trunk/debian/compat 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/compat 2014-03-10 20:26:52 UTC (rev 9693)
@@ -1 +1 @@
-7
+9
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/control 2014-03-10 20:26:52 UTC (rev 9693)
@@ -2,7 +2,7 @@
Section: editors
Priority: optional
Maintainer: Andreas Kirschbaum <aki...@us...>
-Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, openjdk-6-jdk | sun-java6-jdk
+Build-Depends: debhelper (>= 7.0.50~), gradle, openjdk-6-jdk | sun-java6-jdk
Standards-Version: 3.9.1
Homepage: http://gridarta.sourceforge.net/
Modified: trunk/debian/gridarta-atrinik.install
===================================================================
--- trunk/debian/gridarta-atrinik.install 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/gridarta-atrinik.install 2014-03-10 20:26:52 UTC (rev 9693)
@@ -1,3 +1,3 @@
-AtrinikEditor.jar usr/share/java
+src/atrinik/build/libs/AtrinikEditor.jar usr/share/java
misc/gridarta-atrinik usr/bin
misc/gridarta-atrinik.desktop usr/share/applications
Modified: trunk/debian/gridarta-crossfire.install
===================================================================
--- trunk/debian/gridarta-crossfire.install 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/gridarta-crossfire.install 2014-03-10 20:26:52 UTC (rev 9693)
@@ -1,3 +1,3 @@
-CrossfireEditor.jar usr/share/java
+src/crossfire/build/libs/CrossfireEditor.jar usr/share/java
misc/gridarta-crossfire usr/bin
misc/gridarta-crossfire.desktop usr/share/applications
Modified: trunk/debian/gridarta-daimonin.install
===================================================================
--- trunk/debian/gridarta-daimonin.install 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/gridarta-daimonin.install 2014-03-10 20:26:52 UTC (rev 9693)
@@ -1,3 +1,3 @@
-DaimoninEditor.jar usr/share/java
+src/daimonin/build/libs/DaimoninEditor.jar usr/share/java
misc/gridarta-daimonin usr/bin
misc/gridarta-daimonin.desktop usr/share/applications
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2014-03-09 21:22:08 UTC (rev 9692)
+++ trunk/debian/rules 2014-03-10 20:26:52 UTC (rev 9693)
@@ -7,6 +7,8 @@
%:
dh $@
+override_dh_auto_build:
+ gradle createEditorJar
+
override_dh_auto_test:
- dh_auto_test
- ant test
+ gradle check
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2014-03-11 08:21:59
|
Revision: 9695
http://sourceforge.net/p/gridarta/code/9695
Author: akirschbaum
Date: 2014-03-11 08:21:53 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
Properly load cfpython_menu.def. [Atrinik,Crossfire]
Modified Paths:
--------------
trunk/gridarta.ipr
trunk/src/atrinik/ChangeLog
trunk/src/crossfire/ChangeLog
trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2014-03-10 20:51:07 UTC (rev 9694)
+++ trunk/gridarta.ipr 2014-03-11 08:21:53 UTC (rev 9695)
@@ -232,6 +232,7 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
<entry name="?*.txt" />
+ <entry name="?*.def" />
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
Modified: trunk/src/atrinik/ChangeLog
===================================================================
--- trunk/src/atrinik/ChangeLog 2014-03-10 20:51:07 UTC (rev 9694)
+++ trunk/src/atrinik/ChangeLog 2014-03-11 08:21:53 UTC (rev 9695)
@@ -1,3 +1,7 @@
+2014-03-11 Andreas Kirschbaum
+
+ * Properly load cfpython_menu.def.
+
2014-03-10 Andreas Kirschbaum
* Remember new map path when using "save as" to save a map. Also
Modified: trunk/src/crossfire/ChangeLog
===================================================================
--- trunk/src/crossfire/ChangeLog 2014-03-10 20:51:07 UTC (rev 9694)
+++ trunk/src/crossfire/ChangeLog 2014-03-11 08:21:53 UTC (rev 9695)
@@ -1,3 +1,7 @@
+2014-03-11 Andreas Kirschbaum
+
+ * Properly load cfpython_menu.def.
+
2014-03-10 Andreas Kirschbaum
* Remember new map path when using "save as" to save a map. Also
Modified: trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2014-03-10 20:51:07 UTC (rev 9694)
+++ trunk/src/textedit/src/main/java/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2014-03-11 08:21:53 UTC (rev 9695)
@@ -23,14 +23,11 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -59,7 +56,7 @@
* Python menu definitions.
*/
@NotNull
- private static final String PYTHON_MENU_FILE = "cfpython_menu.def";
+ private static final String PYTHON_MENU_FILE = "/cfpython_menu.def";
/**
* The Logger for printing log messages.
@@ -132,17 +129,14 @@
* Load the list of CFPython commands from the data file.
*/
private static void loadCommandList() {
- final URL url;
try {
- url = IOUtils.getResource(null, PYTHON_MENU_FILE);
- } catch (final FileNotFoundException ex) {
- LOG.error("File '" + PYTHON_MENU_FILE + "': " + ex.getMessage());
- return;
- }
- final List<String> cmdList = new ArrayList<String>(); // temporary list to store commands
- try {
- final InputStream inputStream = url.openStream();
+ final InputStream inputStream = CFPythonPopup.class.getResourceAsStream(PYTHON_MENU_FILE);
+ if (inputStream == null) {
+ LOG.error("Resource '" + PYTHON_MENU_FILE + "' not found");
+ return;
+ }
try {
+ final List<String> cmdList = new ArrayList<String>(); // temporary list to store commands
final Reader reader = new InputStreamReader(inputStream, IOUtils.MAP_ENCODING);
try {
final BufferedReader bufferedReader = new BufferedReader(reader);
@@ -161,7 +155,7 @@
if (k > 0) {
cmdList.add(line.substring(0, k) + "()");
} else {
- LOG.error("Parse error in " + url + ":");
+ LOG.error("Parse error in " + PYTHON_MENU_FILE + ":");
LOG.error(" \"" + line + "\" missing '()'");
cmdList.add(line + "()"); // that line is probably garbage, but will work
}
@@ -182,14 +176,10 @@
} finally {
inputStream.close();
}
- } catch (final FileNotFoundException ex) {
- LOG.error("File '" + url + "' not found: " + ex.getMessage());
- } catch (final EOFException ignored) {
- // expected exception, do not handle: end of file/spell struct reached
} catch (final UnsupportedEncodingException ex) {
- LOG.error("Cannot decode file '" + url + "': " + ex.getMessage());
+ LOG.error("Cannot decode file '" + PYTHON_MENU_FILE + "': " + ex.getMessage());
} catch (final IOException ex) {
- LOG.error("Cannot read file '" + url + "': " + ex.getMessage());
+ LOG.error("Cannot read file '" + PYTHON_MENU_FILE + "': " + ex.getMessage());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X