Compare commits

..

No commits in common. "27c08eee3949d17a6d8bead0b2e92c255acf161f" and "7359e15a541a45dbea25ef4fba31ed0ea396b152" have entirely different histories.

12 changed files with 44 additions and 18 deletions

View File

@ -1,4 +1,4 @@
#Sat, 25 Jul 2020 01:09:41 +0200 #Sat, 25 Jul 2020 00:02:41 +0200
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.processors.list= annotation.processing.processors.list=

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;
import opensesim.world.GodWorld; import opensesim.world.GodWorld;

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;
import opensesim.world.GodWorld; import opensesim.world.GodWorld;

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;
import opensesim.world.GodWorld; import opensesim.world.GodWorld;

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import javax.swing.JPanel; import javax.swing.JPanel;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
/** /**
* *

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;
import opensesim.world.GodWorld; import opensesim.world.GodWorld;

View File

@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.sesim.assets; package opensesim.sesim.Assets;
import opensesim.world.AbstractAsset; import opensesim.world.AbstractAsset;
import opensesim.world.GodWorld; import opensesim.world.GodWorld;

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020, tube * Copyright (c) 2018, 7u83 <7u83@mail.ru>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -23,14 +23,40 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
package opensesim.cli; 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 tube * @author 7u83 <7u83@mail.ru>
*/ */
public class Main { public interface Asset extends Configurable {
public static void main(String[] args){
} 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);
} }

View File

@ -26,8 +26,8 @@
package opensesim.world; package opensesim.world;
import java.util.Map; import java.util.Map;
import opensesim.sesim.assets.CurrencyAsset; import opensesim.sesim.Assets.CurrencyAsset;
import opensesim.sesim.assets.DummyAsset; import opensesim.sesim.Assets.DummyAsset;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;

View File

@ -26,7 +26,7 @@
package opensesim.world; package opensesim.world;
import java.util.Set; import java.util.Set;
import opensesim.sesim.assets.CurrencyAsset; import opensesim.sesim.Assets.CurrencyAsset;
import opensesim.util.scheduler.EventListener; import opensesim.util.scheduler.EventListener;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;