diff --git a/nbproject/project.properties b/nbproject/project.properties index 13e803a..25adfda 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Sat, 25 Jul 2020 00:53:51 +0200 +#Sat, 25 Jul 2020 01:09:41 +0200 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/src/opensesim/sesim/Assets/CryptoCurrency.java b/src/opensesim/sesim/assets/CryptoCurrency.java similarity index 98% rename from src/opensesim/sesim/Assets/CryptoCurrency.java rename to src/opensesim/sesim/assets/CryptoCurrency.java index 9c89ab7..7dfcd97 100644 --- a/src/opensesim/sesim/Assets/CryptoCurrency.java +++ b/src/opensesim/sesim/assets/CryptoCurrency.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import opensesim.world.AbstractAsset; import opensesim.world.GodWorld; diff --git a/src/opensesim/sesim/Assets/CurrencyAsset.java b/src/opensesim/sesim/assets/CurrencyAsset.java similarity index 98% rename from src/opensesim/sesim/Assets/CurrencyAsset.java rename to src/opensesim/sesim/assets/CurrencyAsset.java index d0310cb..d5831b4 100644 --- a/src/opensesim/sesim/Assets/CurrencyAsset.java +++ b/src/opensesim/sesim/assets/CurrencyAsset.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import opensesim.world.AbstractAsset; import opensesim.world.GodWorld; diff --git a/src/opensesim/sesim/Assets/DummyAsset.java b/src/opensesim/sesim/assets/DummyAsset.java similarity index 98% rename from src/opensesim/sesim/Assets/DummyAsset.java rename to src/opensesim/sesim/assets/DummyAsset.java index c2dfb9b..070a69e 100644 --- a/src/opensesim/sesim/Assets/DummyAsset.java +++ b/src/opensesim/sesim/assets/DummyAsset.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import opensesim.world.AbstractAsset; import opensesim.world.GodWorld; diff --git a/src/opensesim/sesim/Assets/FurtureAsset.java b/src/opensesim/sesim/assets/FurtureAsset.java similarity index 98% rename from src/opensesim/sesim/Assets/FurtureAsset.java rename to src/opensesim/sesim/assets/FurtureAsset.java index 1ea8d60..9d7c1dd 100644 --- a/src/opensesim/sesim/Assets/FurtureAsset.java +++ b/src/opensesim/sesim/assets/FurtureAsset.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import javax.swing.JPanel; import opensesim.world.AbstractAsset; diff --git a/src/opensesim/sesim/Assets/FutureAssetEditGui.form b/src/opensesim/sesim/assets/FutureAssetEditGui.form similarity index 100% rename from src/opensesim/sesim/Assets/FutureAssetEditGui.form rename to src/opensesim/sesim/assets/FutureAssetEditGui.form diff --git a/src/opensesim/sesim/Assets/FutureAssetEditGui.java b/src/opensesim/sesim/assets/FutureAssetEditGui.java similarity index 99% rename from src/opensesim/sesim/Assets/FutureAssetEditGui.java rename to src/opensesim/sesim/assets/FutureAssetEditGui.java index 6dcdfe6..27fe5b7 100644 --- a/src/opensesim/sesim/Assets/FutureAssetEditGui.java +++ b/src/opensesim/sesim/assets/FutureAssetEditGui.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; /** * diff --git a/src/opensesim/sesim/Assets/StockAssett.java b/src/opensesim/sesim/assets/StockAssett.java similarity index 98% rename from src/opensesim/sesim/Assets/StockAssett.java rename to src/opensesim/sesim/assets/StockAssett.java index 79880bf..b7a06e5 100644 --- a/src/opensesim/sesim/Assets/StockAssett.java +++ b/src/opensesim/sesim/assets/StockAssett.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import opensesim.world.AbstractAsset; import opensesim.world.GodWorld; diff --git a/src/opensesim/sesim/Assets/WarrentAsset.java b/src/opensesim/sesim/assets/WarrentAsset.java similarity index 98% rename from src/opensesim/sesim/Assets/WarrentAsset.java rename to src/opensesim/sesim/assets/WarrentAsset.java index e298227..3f8aaa5 100644 --- a/src/opensesim/sesim/Assets/WarrentAsset.java +++ b/src/opensesim/sesim/assets/WarrentAsset.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package opensesim.sesim.Assets; +package opensesim.sesim.assets; import opensesim.world.AbstractAsset; import opensesim.world.GodWorld; diff --git a/src/opensesim/sesim/interfaces/Asset.java b/src/opensesim/sesim/interfaces/Asset.java deleted file mode 100644 index 15a0411..0000000 --- a/src/opensesim/sesim/interfaces/Asset.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2018, 7u83 <7u83@mail.ru> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER 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. - */ -package opensesim.sesim.interfaces; - -import java.util.HashMap; -import javax.swing.JPanel; -import opensesim.world.RealWorld; -import opensesim.util.idgenerator.IDGenerator; -import opensesim.util.idgenerator.Id; - -/** - * - * @author 7u83 <7u83@mail.ru> - */ -public interface Asset extends Configurable { - - static HashMap assetsById = new HashMap<>(); - static HashMap assetsBySymbol = new HashMap<>(); - static IDGenerator assetIdGenerator = new IDGenerator(); - - public String getSymbol(); - - public Id getID(); - - public Id setID(Id id); - - public JPanel getEditGui(); - - /** - * Indicate if this asset can act as currency - * - * @return true if currency, false no. - */ - public boolean isCurrency(); - - public String getTypeName(); - - // public Asset(Id); -} diff --git a/test/opensesim/world/AccountTest.java b/test/opensesim/world/AccountTest.java index b21e884..020b98f 100644 --- a/test/opensesim/world/AccountTest.java +++ b/test/opensesim/world/AccountTest.java @@ -26,8 +26,8 @@ package opensesim.world; import java.util.Map; -import opensesim.sesim.Assets.CurrencyAsset; -import opensesim.sesim.Assets.DummyAsset; +import opensesim.sesim.assets.CurrencyAsset; +import opensesim.sesim.assets.DummyAsset; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/test/opensesim/world/TradingEngineTest.java b/test/opensesim/world/TradingEngineTest.java index e3909f7..3375557 100644 --- a/test/opensesim/world/TradingEngineTest.java +++ b/test/opensesim/world/TradingEngineTest.java @@ -26,7 +26,7 @@ package opensesim.world; import java.util.Set; -import opensesim.sesim.Assets.CurrencyAsset; +import opensesim.sesim.assets.CurrencyAsset; import opensesim.util.scheduler.EventListener; import org.junit.After; import org.junit.AfterClass;