diff --git a/src/opensesim/gui/AssetEditor/AssetListDialog.java b/src/opensesim/gui/AssetEditor/AssetListDialog.java index f7133f8..3665453 100644 --- a/src/opensesim/gui/AssetEditor/AssetListDialog.java +++ b/src/opensesim/gui/AssetEditor/AssetListDialog.java @@ -25,16 +25,9 @@ */ package opensesim.gui.AssetEditor; -import com.sun.rowset.internal.Row; -import java.awt.Frame; -import java.awt.Window; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import javax.swing.JFrame; -import javax.swing.SwingUtilities; import opensesim.gui.util.EscDialog; -import opensesim.sesim.Assets.BasicAsset; -import opensesim.util.IDGenerator.Id; + import org.json.JSONObject; /** diff --git a/src/opensesim/sesim/AssetPair.java b/src/opensesim/sesim/AssetPair.java index 4faddc9..4cfee73 100644 --- a/src/opensesim/sesim/AssetPair.java +++ b/src/opensesim/sesim/AssetPair.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.SortedSet; import java.util.TreeSet; import opensesim.AbstractAsset; -import opensesim.sesim.Assets.BasicAsset; + import opensesim.sesim.interfaces.Asset; /** diff --git a/src/opensesim/sesim/Assets/BasicAsset.java b/src/opensesim/sesim/Assets/BasicAsset.java deleted file mode 100644 index 3d38c82..0000000 --- a/src/opensesim/sesim/Assets/BasicAsset.java +++ /dev/null @@ -1,60 +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.Assets; - - -import javax.swing.JPanel; -import opensesim.AbstractAsset; - -/** - * Defines an asset - * - * @author 7u83 - */ -public class BasicAsset extends AbstractAsset { - - public String getTypeName() { - return "Basic from Abstract"; - } - - - public JPanel getEditGui() { - return null; - } - - - - - - - - - - - - - -}