editor: fix id handling when editing scenes and actors

Author: bladecoder

adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Project.java

@@ -161,15 +161,11 @@ public void notifyPropertyChange(String property) {
 	}
 
 	public void setSelectedScene(Scene scn) {
-		Scene old = null;
-
-		old = selectedScene;
-
 		selectedScene = scn;
 		selectedActor = null;
 		selectedFA = null;
 
-		firePropertyChange(NOTIFY_SCENE_SELECTED, old, selectedScene);
+		firePropertyChange(NOTIFY_SCENE_SELECTED, null, selectedScene);
 	}
 
 	public void setSelectedActor(BaseActor a) {

adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java

@@ -42,6 +42,7 @@
 import com.bladecoder.engineeditor.ui.components.InputPanel;
 import com.bladecoder.engineeditor.ui.components.InputPanelFactory;
 import com.bladecoder.engineeditor.ui.components.OptionsInputPanel;
+import com.bladecoder.engineeditor.utils.ElementUtils;
 
 public class EditActorDialog extends EditModelDialog<Scene, BaseActor> {
 
@@ -291,9 +292,12 @@ protected void inputsToModel(boolean create) {
 				verts[7] = 0f;
 				bbox.dirty();
 			}
+		} else {
+			// remove to allow id, zindex and layer change
+			parent.removeActor(e);
 		}
 
-		e.setId(id.getText());
+		e.setId(ElementUtils.getCheckedId(id.getText(), parent.getActors().keySet().toArray(new String[0])));
 		e.setVisible(Boolean.parseBoolean(visible.getText()));
 
 		if(e instanceof InteractiveActor) {
@@ -359,10 +363,6 @@ protected void inputsToModel(boolean create) {
 			}
 		}
 
-		if(!create) {
-			parent.removeActor(e);
-		}
-		
 		parent.addActor(e);
 
 		if(e instanceof InteractiveActor) {