|
@@ -34,6 +34,7 @@ public class ObjectController {
|
|
* Adds Element into a Object
|
|
* Adds Element into a Object
|
|
*/
|
|
*/
|
|
public void addElement(HolonObject object, HolonElement element) {
|
|
public void addElement(HolonObject object, HolonElement element) {
|
|
|
|
+ object.getEleIdx().put(element.getEleName(), object.getElements().size());
|
|
object.getElements().add(element);
|
|
object.getElements().add(element);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -71,7 +72,7 @@ public class ObjectController {
|
|
* @param element
|
|
* @param element
|
|
*/
|
|
*/
|
|
public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
|
|
public void addElementIntoCategoryObject(String category, String object, HolonElement element) {
|
|
- addElement((HolonObject) sC.searchHolonObject(object, sC.searchCategory(category).getObjects()), element);
|
|
|
|
|
|
+ addElement((HolonObject) sC.searchCategoryObject(sC.searchCategory(category), object), element);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -85,6 +86,7 @@ public class ObjectController {
|
|
*/
|
|
*/
|
|
public void addNewElementIntoCategoryObject(String category, String object, String element, int amount,
|
|
public void addNewElementIntoCategoryObject(String category, String object, String element, int amount,
|
|
float energy) {
|
|
float energy) {
|
|
|
|
+
|
|
HolonElement ele = new HolonElement(element, amount, energy);
|
|
HolonElement ele = new HolonElement(element, amount, energy);
|
|
ele.setSav(category);
|
|
ele.setSav(category);
|
|
ele.setObj(object);
|
|
ele.setObj(object);
|
|
@@ -100,6 +102,8 @@ public class ObjectController {
|
|
*/
|
|
*/
|
|
public void deleteElement(HolonObject obj, HolonElement ele) {
|
|
public void deleteElement(HolonObject obj, HolonElement ele) {
|
|
obj.getElements().remove(ele);
|
|
obj.getElements().remove(ele);
|
|
|
|
+ obj.getEleIdx().remove(ele.getEleName());
|
|
|
|
+ sC.decIdx(ele.getEleName(), obj.getEleIdx());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -127,7 +131,7 @@ public class ObjectController {
|
|
*/
|
|
*/
|
|
public void deleteElementInCategory(String cat, String obj, String ele, int amount) {
|
|
public void deleteElementInCategory(String cat, String obj, String ele, int amount) {
|
|
Category category = sC.searchCategory(cat);
|
|
Category category = sC.searchCategory(cat);
|
|
- HolonObject object = (HolonObject) sC.searchHolonObject(obj, category.getObjects());
|
|
|
|
|
|
+ HolonObject object = (HolonObject) sC.searchCategoryObject(category, obj);
|
|
HolonElement element = sC.searchHolonElement(object, ele);
|
|
HolonElement element = sC.searchHolonElement(object, ele);
|
|
|
|
|
|
deleteElement(object, element);
|
|
deleteElement(object, element);
|