editor: fix dialog id collision testing.

Author: bladecoder

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

@@ -22,6 +22,7 @@
 import com.bladecoder.engineeditor.ui.components.EditModelDialog;
 import com.bladecoder.engineeditor.ui.components.InputPanel;
 import com.bladecoder.engineeditor.ui.components.InputPanelFactory;
+import com.bladecoder.engineeditor.utils.ElementUtils;
 
 public class EditDialogDialog extends EditModelDialog<CharacterActor, Dialog> {
 	public static final String INFO = "Actors can have several dialogs defined. Dialogs have a tree of options to choose";
@@ -44,13 +45,13 @@ protected void inputsToModel(boolean create) {
 
 		if(create) {
 			e = new Dialog();
+		} else {
+			parent.getDialogs().remove(e.getId());
 		}
 
-		e.setId(id.getText());
+		e.setId(ElementUtils.getCheckedId(id.getText(), parent.getDialogs().keySet().toArray(new String[0])));
 
-		if(create) {
-			parent.addDialog(e);
-		}
+		parent.addDialog(e);
 
 		// TODO UNDO OP
 //		UndoOp undoOp = new UndoAddElement(doc, e);

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

@@ -20,7 +20,6 @@
 import java.util.Arrays;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engine.model.Dialog;
 import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.SoundFX;
 import com.bladecoder.engineeditor.Ctx;
@@ -40,7 +39,7 @@ public SoundList(Skin skin) {
 		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
-				if (evt.getNewValue() instanceof Dialog && !(evt.getSource() instanceof EditDialogDialog) && parent instanceof InteractiveActor) {
+				if (evt.getNewValue() instanceof SoundFX && !(evt.getSource() instanceof EditSoundDialog) && parent instanceof InteractiveActor) {
 					addElements(parent, Arrays.asList(parent.getSounds().values().toArray(new SoundFX[0])));
 				}
 			}