Removed interfaces Asset. Refactoring

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=

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;

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;

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;

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;

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;
 
 /**
  *

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;

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;

src/opensesim/sesim/interfaces/Asset.java

@@ -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<Id, Asset> assetsById = new HashMap<>();
-    static HashMap<String, Asset> 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);
-}

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;

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;