Fix EditActionDialog for custom actions.

Author: bladecoder

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

@@ -23,8 +23,8 @@
 import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.FocusListener;
 import com.bladecoder.engine.actions.Action;
 import com.bladecoder.engine.actions.ActionFactory;
 import com.bladecoder.engine.actions.Param;
@@ -73,12 +73,19 @@ public void changed(ChangeEvent event, Actor actor) {
 			}
 		});
 
-		((TextField) classPanel.getField()).addListener(new FocusListener() {
-			@Override
-			public void keyboardFocusChanged(FocusEvent event, Actor actor, boolean focused) {
-				if (!event.isFocused())
-					setAction();
-			}
+//		((TextField) classPanel.getField()).addListener(new FocusListener() {
+//			@Override
+//			public void keyboardFocusChanged(FocusEvent event, Actor actor, boolean focused) {
+//				if (!event.isFocused())
+//					setAction();
+//			}
+//		});
+		
+		((TextField) classPanel.getField()).setTextFieldListener(new TextFieldListener() {
+		    @Override
+		    public void keyTyped(TextField textField, char key) {
+		    	setAction();
+		    }
 		});
 
 		if (e != null) {
@@ -113,8 +120,17 @@ private void setAction() {
 
 		if (id.equals(CUSTOM_ACTION_STR)) {
 			addInputPanel(classPanel);
-			if (classPanel != null && !classPanel.getText().trim().isEmpty())
+			if (classPanel != null && classPanel.getText() != null && !classPanel.getText().trim().isEmpty())
 				tmp = ActionFactory.createByClass(classPanel.getText(), null);
+			
+			if(tmp == null) {
+				classPanel.setError(true);
+			} else {
+				classPanel.setError(false);
+			}
+			
+			getStage().setKeyboardFocus(classPanel.getField());
+			
 			setInfo(CUSTOM_INFO);
 		} else {
 			tmp = ActionFactory.create(id, null);
@@ -145,6 +161,8 @@ private void setAction() {
 					i[j].getCell(i[j].getField()).fillX();
 				}
 			}
+		} else {
+			i = new InputPanel[0];
 		}
 
 		// ((ScrollPane)(getContentTable().getCells().get(1).getActor())).setWidget(getCenterPanel());
@@ -183,11 +201,13 @@ protected void inputsToModel(boolean create) {
 				}
 
 				ActionUtils.setParam(e, i[j].getTitle(), v);
-				Ctx.project.setModified();
+				
 			} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
 				EditorLogger.error(e.getMessage());
 			}
 		}
+		
+		Ctx.project.setModified();
 	}
 
 	@Override
@@ -208,4 +228,17 @@ protected void modelToInputs() {
 			}
 		}
 	}
+	
+	@Override
+	protected boolean validateFields() {
+		
+		String id = actionPanel.getText();
+
+		if (id.equals(CUSTOM_ACTION_STR) && e == null) {
+			if(ActionFactory.createByClass(classPanel.getText(), null) == null)
+				return false;
+		}
+		
+		return super.validateFields();
+	}
 }

blade-engine/src/com/bladecoder/engine/model/Verb.java

@@ -35,6 +35,8 @@ public class Verb implements VerbRunner, Serializable {
 	public static final String GOTO_VERB = "goto";
 	public static final String TEST_VERB = "test";
 	public static final String INIT_VERB = "init";
+	public static final String INIT_NEW_GAME_VERB = "initNewGame";
+	public static final String INIT_SAVED_GAME_VERB = "initSavedGame";
 
 	private String id;
 	private String state;

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -234,14 +234,14 @@ public void update(float delta) {
 				initGame = false;
 
 				// Call world init verbs. Check for SAVED_GAME_VERSION property to know if new or loaded game.
-				if(customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) == null && verbs.getVerb("initNewGame", null, null) != null)
-					verbs.runVerb("initNewGame", null, null);
-				else if(customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) != null && verbs.getVerb("initSavedGame", null, null) != null)
-					verbs.runVerb("initSavedGame", null, null);
+				if(customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) == null && verbs.getVerb(Verb.INIT_NEW_GAME_VERB, null, null) != null)
+					verbs.runVerb(Verb.INIT_NEW_GAME_VERB, null, null);
+				else if(customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) != null && verbs.getVerb(Verb.INIT_SAVED_GAME_VERB, null, null) != null)
+					verbs.runVerb(Verb.INIT_SAVED_GAME_VERB, null, null);
 
 				// If in test mode run 'test' verb
-				if (testScene != null && testScene.equals(currentScene.getId()) && currentScene.getVerb("test") != null)
-					currentScene.runVerb("test");
+				if (testScene != null && testScene.equals(currentScene.getId()) && currentScene.getVerb(Verb.TEST_VERB) != null)
+					currentScene.runVerb(Verb.TEST_VERB);
 			}
 
 			// call 'init' verb only when arrives from setCurrentScene and not