External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 03:39:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed compile for me, revert pls if I do something wrong

Browse source
This commit is contained in:
Loki 2010-10-06 10:31:53 +00:00
parent ee0fb21ae4
commit 017e02aedc
3 changed files with 158 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

138
Mage/nbproject/project.properties
View file

@ -1,66 +1,72 @@
application.title=Mage annotation.processing.enabled=true
application.vendor=BetaSteward_at_googlemail.com annotation.processing.enabled.in.editor=false
build.classes.dir=${build.dir}/classes annotation.processing.run.all.processors=true
build.classes.excludes=**/*.java,**/*.form application.title=Mage
# This directory is removed when the project is cleaned: application.vendor=BetaSteward_at_googlemail.com
build.dir=build build.classes.dir=${build.dir}/classes
build.generated.dir=${build.dir}/generated build.classes.excludes=**/*.java,**/*.form
build.generated.sources.dir=${build.dir}/generated-sources # This directory is removed when the project is cleaned:
# Only compile against the classpath explicitly listed here: build.dir=build
build.sysclasspath=ignore build.generated.dir=${build.dir}/generated
build.test.classes.dir=${build.dir}/test/classes build.generated.sources.dir=${build.dir}/generated-sources
build.test.results.dir=${build.dir}/test/results # Only compile against the classpath explicitly listed here:
# Uncomment to specify the preferred debugger connection transport: build.sysclasspath=ignore
#debug.transport=dt_socket build.test.classes.dir=${build.dir}/test/classes
debug.classpath=\ build.test.results.dir=${build.dir}/test/results
${run.classpath} # Uncomment to specify the preferred debugger connection transport:
debug.test.classpath=\ #debug.transport=dt_socket
${run.test.classpath} debug.classpath=\
# This directory is removed when the project is cleaned: ${run.classpath}
dist.dir=dist debug.test.classpath=\
dist.jar=${dist.dir}/Mage.jar ${run.test.classpath}
dist.javadoc.dir=${dist.dir}/javadoc # This directory is removed when the project is cleaned:
excludes= dist.dir=dist
includes=** dist.jar=${dist.dir}/Mage.jar
jar.compress=false dist.javadoc.dir=${dist.dir}/javadoc
javac.classpath= endorsed.classpath=
# Space-separated list of extra javac options excludes=
javac.compilerargs= includes=**
javac.deprecation=false jar.compress=false
javac.source=1.6 javac.classpath=
javac.target=1.6 # Space-separated list of extra javac options
javac.test.classpath=\ javac.compilerargs=
${javac.classpath}:\ javac.deprecation=false
${build.classes.dir}:\ javac.processorpath=\
${libs.junit.classpath}:\ ${javac.classpath}
${libs.junit_4.classpath} javac.source=1.6
javadoc.additionalparam= javac.target=1.6
javadoc.author=false javac.test.classpath=\
javadoc.encoding=${source.encoding} ${javac.classpath}:\
javadoc.noindex=false ${build.classes.dir}:\
javadoc.nonavbar=false ${libs.junit.classpath}:\
javadoc.notree=false ${libs.junit_4.classpath}
javadoc.private=false javadoc.additionalparam=
javadoc.splitindex=true javadoc.author=false
javadoc.use=true javadoc.encoding=${source.encoding}
javadoc.version=false javadoc.noindex=false
javadoc.windowtitle= javadoc.nonavbar=false
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" javadoc.notree=false
main.class= javadoc.private=false
manifest.file=manifest.mf javadoc.splitindex=true
meta.inf.dir=${src.dir}/META-INF javadoc.use=true
platform.active=default_platform javadoc.version=false
project.license=bsd javadoc.windowtitle=
run.classpath=\ jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
${javac.classpath}:\ main.class=
${build.classes.dir} manifest.file=manifest.mf
# Space-separated list of JVM arguments used when running the project meta.inf.dir=${src.dir}/META-INF
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value platform.active=default_platform
# or test-sys-prop.name=value to set system properties for unit tests): project.license=bsd
run.jvmargs= run.classpath=\
run.test.classpath=\ ${javac.classpath}:\
${javac.test.classpath}:\ ${build.classes.dir}
${build.test.classes.dir} # Space-separated list of JVM arguments used when running the project
source.encoding=UTF-8 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
src.dir=src # or test-sys-prop.name=value to set system properties for unit tests):
test.src.dir=test run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test

33
Mage/nbproject/project.xml
View file

@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Mage</name> <name>Mage</name>
<explicit-platform explicit-source-supported="true"/> <source-roots>
<source-roots> <root id="src.dir"/>
<root id="src.dir"/> </source-roots>
</source-roots> <test-roots>
<test-roots> <root id="test.src.dir"/>
<root id="test.src.dir"/> </test-roots>
</test-roots> </data>
</data> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/> </configuration>
</configuration> </project>
</project>

140
Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java
View file

@ -1,70 +1,70 @@
/* ///*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. // * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* // *
* Redistribution and use in source and binary forms, with or without modification, are // * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: // * permitted provided that the following conditions are met:
* // *
* 1. Redistributions of source code must retain the above copyright notice, this list of // * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. // * conditions and the following disclaimer.
* // *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list // * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials // * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. // * provided with the distribution.
* // *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED // * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR // * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR // * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 // * 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 // * 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 // * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* // *
* The views and conclusions contained in the software and documentation are those of the // * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed // * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. // * or implied, of BetaSteward_at_googlemail.com.
*/ // */
//
package mage.abilities.effects.common; //package mage.abilities.effects.common;
//
import mage.abilities.Ability; //import mage.abilities.Ability;
import mage.filter.FilterPermanent; //import mage.filter.FilterPermanent;
import mage.game.Game; //import mage.game.Game;
import mage.game.events.GameEvent; //import mage.game.events.GameEvent;
//
/** ///**
* // *
* @author BetaSteward_at_googlemail.com // * @author BetaSteward_at_googlemail.com
*/ // */
public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect { //public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect {
//
FilterPermanent filter; // FilterPermanent filter;
//
public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) { // public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) {
this.filter = filter; // this.filter = filter;
} // }
//
public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) { // public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) {
super(effect); // super(effect);
this.filter = effect.filter.copy(); // this.filter = effect.filter.copy();
} // }
//
@Override // @Override
public EntersBattlefieldTappedUnlessControlsEffect copy() { // public EntersBattlefieldTappedUnlessControlsEffect copy() {
return new EntersBattlefieldTappedUnlessControlsEffect(this); // return new EntersBattlefieldTappedUnlessControlsEffect(this);
} // }
//
@Override // @Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) { // public boolean replaceEvent(GameEvent event, Ability source, Game game) {
if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0) // if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0)
return apply(game, source); // return apply(game, source);
return false; // return false;
} // }
//
@Override // @Override
public String getText(Ability source) { // public String getText(Ability source) {
return super.getText(source) + " unless you control a " + filter.getMessage(); // return super.getText(source) + " unless you control a " + filter.getMessage();
} // }
//
} //}