From 18b8c0cde574588dc619df07b0568f8006559d7d Mon Sep 17 00:00:00 2001 From: snowleo Date: Fri, 13 May 2011 22:13:10 +0000 Subject: Register included inside Essentials with different packagename to prevent recursion. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1444 e251c2fe-e539-e718-e476-b85c1f46cddb --- BuildAll/nbproject/build-impl.xml | 28 ---------------------- BuildAll/nbproject/genfiles.properties | 6 ++--- BuildAll/nbproject/project.properties | 8 +------ BuildAll/nbproject/project.xml | 16 ------------- .../src/com/earth2me/essentials/Essentials.java | 2 +- Essentials/src/com/earth2me/essentials/User.java | 2 +- .../com/essentials/register/payment/Method.java | 2 +- .../register/payment/MethodBOSEconomy.java | 2 +- .../essentials/register/payment/MethodEEco.java | 2 +- .../essentials/register/payment/MethodiCo4.java | 2 +- .../essentials/register/payment/MethodiCo5.java | 2 +- .../com/essentials/register/payment/Methods.java | 2 +- 12 files changed, 12 insertions(+), 62 deletions(-) diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index ee88b5f5d..2d4272990 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -650,20 +650,6 @@ is divided into following sections: - - - - - - - - - - - - - - @@ -1149,20 +1135,6 @@ is divided into following sections: - - - - - - - - - - - - - - diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index c22044da0..b2e08c5de 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=80b9b3a4 +build.xml.data.CRC32=c4188209 build.xml.script.CRC32=7a797370 build.xml.stylesheet.CRC32=28e38971@1.43.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=80b9b3a4 -nbproject/build-impl.xml.script.CRC32=3170ac34 +nbproject/build-impl.xml.data.CRC32=c4188209 +nbproject/build-impl.xml.script.CRC32=73a4865f nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index ddfc41bca..ca7ee69ad 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -35,9 +35,7 @@ javac.classpath=\ ${reference.EssentialsGroupManager.jar}:\ ${reference.EssentialsProtect.jar}:\ ${reference.EssentialsSpawn.jar}:\ - ${reference.EssentialsGeoIP.jar}:\ - ${reference.EssentialsiConomyBridge.jar}:\ - ${reference.EssentialsiConomyBridge5.jar} + ${reference.EssentialsGeoIP.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -71,8 +69,6 @@ project.EssentialsChat=../EssentialsChat project.EssentialsGeoIP=../EssentialsGeoIP project.EssentialsGroupBridge=../EssentialsGroupBridge project.EssentialsGroupManager=../EssentialsGroupManager -project.EssentialsiConomyBridge=../EssentialsiConomyBridge -project.EssentialsiConomyBridge5=../EssentialsiConomyBridge5 project.EssentialsProtect=../EssentialsProtect project.EssentialsSpawn=../EssentialsSpawn reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar @@ -80,8 +76,6 @@ reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar -reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar -reference.EssentialsiConomyBridge5.jar=${project.EssentialsiConomyBridge5}/dist/EssentialsiConomyBridge5.jar reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar run.classpath=\ diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml index ec38f6408..e00554632 100644 --- a/BuildAll/nbproject/project.xml +++ b/BuildAll/nbproject/project.xml @@ -71,22 +71,6 @@ clean jar - - EssentialsiConomyBridge - jar - - jar - clean - jar - - - EssentialsiConomyBridge5 - jar - - jar - clean - jar - diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 4af52b662..e9f0871ab 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -26,7 +26,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import com.nijikokun.register.payment.Methods; +import com.essentials.register.payment.Methods; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.bukkit.command.PluginCommand; diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index c9ec16d2d..5613ffe49 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -1,7 +1,7 @@ package com.earth2me.essentials; import com.earth2me.essentials.commands.IEssentialsCommand; -import com.nijikokun.register.payment.Method; +import com.essentials.register.payment.Method; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.logging.Logger; diff --git a/Register/src/com/essentials/register/payment/Method.java b/Register/src/com/essentials/register/payment/Method.java index 935a9bb00..cc0182877 100644 --- a/Register/src/com/essentials/register/payment/Method.java +++ b/Register/src/com/essentials/register/payment/Method.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; public interface Method { public Object getPlugin(); diff --git a/Register/src/com/essentials/register/payment/MethodBOSEconomy.java b/Register/src/com/essentials/register/payment/MethodBOSEconomy.java index 7e0babe68..1e67156e6 100644 --- a/Register/src/com/essentials/register/payment/MethodBOSEconomy.java +++ b/Register/src/com/essentials/register/payment/MethodBOSEconomy.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; import cosine.boseconomy.BOSEconomy; diff --git a/Register/src/com/essentials/register/payment/MethodEEco.java b/Register/src/com/essentials/register/payment/MethodEEco.java index e8e52a93d..47494e49c 100644 --- a/Register/src/com/essentials/register/payment/MethodEEco.java +++ b/Register/src/com/essentials/register/payment/MethodEEco.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.api.Economy; diff --git a/Register/src/com/essentials/register/payment/MethodiCo4.java b/Register/src/com/essentials/register/payment/MethodiCo4.java index 47448deae..42c80c3bc 100644 --- a/Register/src/com/essentials/register/payment/MethodiCo4.java +++ b/Register/src/com/essentials/register/payment/MethodiCo4.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; import com.nijiko.coelho.iConomy.iConomy; import com.nijiko.coelho.iConomy.system.Account; diff --git a/Register/src/com/essentials/register/payment/MethodiCo5.java b/Register/src/com/essentials/register/payment/MethodiCo5.java index 1927d9fcf..c1634fcb5 100644 --- a/Register/src/com/essentials/register/payment/MethodiCo5.java +++ b/Register/src/com/essentials/register/payment/MethodiCo5.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; import com.iConomy.iConomy; import com.iConomy.system.Account; diff --git a/Register/src/com/essentials/register/payment/Methods.java b/Register/src/com/essentials/register/payment/Methods.java index 7cf340940..f7b3ef353 100644 --- a/Register/src/com/essentials/register/payment/Methods.java +++ b/Register/src/com/essentials/register/payment/Methods.java @@ -1,4 +1,4 @@ -package com.nijikokun.register.payment; +package com.essentials.register.payment; import com.iConomy.iConomy; import cosine.boseconomy.BOSEconomy; -- cgit v1.2.3