diff --git a/Mage/nbproject/project.properties b/Mage/nbproject/project.properties index c1f03d85c0f..5cce6656875 100644 --- a/Mage/nbproject/project.properties +++ b/Mage/nbproject/project.properties @@ -1,66 +1,72 @@ -application.title=Mage -application.vendor=BetaSteward_at_googlemail.com -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/Mage.jar -dist.javadoc.dir=${dist.dir}/javadoc -excludes= -includes=** -jar.compress=false -javac.classpath= -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -main.class= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -project.license=bsd -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +application.title=Mage +application.vendor=BetaSteward_at_googlemail.com +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/Mage.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +includes=** +jar.compress=false +javac.classpath= +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +project.license=bsd +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/Mage/nbproject/project.xml b/Mage/nbproject/project.xml index 0feb5ef256d..15e44e7c6c6 100644 --- a/Mage/nbproject/project.xml +++ b/Mage/nbproject/project.xml @@ -1,17 +1,16 @@ - - - org.netbeans.modules.java.j2seproject - - - Mage - - - - - - - - - - - + + + org.netbeans.modules.java.j2seproject + + + Mage + + + + + + + + + + diff --git a/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java b/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java index 491149a66c4..33be76c5cec 100644 --- a/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java +++ b/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java @@ -1,70 +1,70 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. 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 following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 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 - * 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 - * 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. - * - * 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 - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.abilities.effects.common; - -import mage.abilities.Ability; -import mage.filter.FilterPermanent; -import mage.game.Game; -import mage.game.events.GameEvent; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect { - - FilterPermanent filter; - - public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) { - this.filter = filter; - } - - public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) { - super(effect); - this.filter = effect.filter.copy(); - } - - @Override - public EntersBattlefieldTappedUnlessControlsEffect copy() { - return new EntersBattlefieldTappedUnlessControlsEffect(this); - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0) - return apply(game, source); - return false; - } - - @Override - public String getText(Ability source) { - return super.getText(source) + " unless you control a " + filter.getMessage(); - } - -} +///* +// * Copyright 2010 BetaSteward_at_googlemail.com. 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 following disclaimer in the documentation and/or other materials +// * provided with the distribution. +// * +// * 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 +// * 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 +// * 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. +// * +// * 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 +// * or implied, of BetaSteward_at_googlemail.com. +// */ +// +//package mage.abilities.effects.common; +// +//import mage.abilities.Ability; +//import mage.filter.FilterPermanent; +//import mage.game.Game; +//import mage.game.events.GameEvent; +// +///** +// * +// * @author BetaSteward_at_googlemail.com +// */ +//public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect { +// +// FilterPermanent filter; +// +// public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) { +// this.filter = filter; +// } +// +// public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) { +// super(effect); +// this.filter = effect.filter.copy(); +// } +// +// @Override +// public EntersBattlefieldTappedUnlessControlsEffect copy() { +// return new EntersBattlefieldTappedUnlessControlsEffect(this); +// } +// +// @Override +// public boolean replaceEvent(GameEvent event, Ability source, Game game) { +// if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0) +// return apply(game, source); +// return false; +// } +// +// @Override +// public String getText(Ability source) { +// return super.getText(source) + " unless you control a " + filter.getMessage(); +// } +// +//}