Author: tchemit Date: 2010-03-24 10:27:06 +0100 (Wed, 24 Mar 2010) New Revision: 1804 Log: fix NPE Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-03-24 00:38:41 UTC (rev 1803) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-03-24 09:27:06 UTC (rev 1804) @@ -389,7 +389,7 @@ for (int i = getRowCount() - 1; i > -1; i--) { SwingValidatorMessage error = data.get(i); - if (error.getValidator().equals(validator) && + if (validator.equals(error.getValidator()) && error.getScope() == scope && error.getFieldName().equals(field.getName()) && messagesToDel.contains(error.getMessage())) { @@ -416,7 +416,7 @@ for (int i = getRowCount() - 1; i > -1; i--) { SwingValidatorMessage error = data.get(i); - if (error.getValidator().equals(validator) && + if (validator.equals(error.getValidator()) && error.getScope() == scope && error.getFieldName().equals(fieldName) && messagesToDel.contains(error.getMessage())) { @@ -439,7 +439,7 @@ for (int i = getRowCount() - 1; i > -1; i--) { SwingValidatorMessage error = data.get(i); - if (error.getEditor().equals(editor) && + if (editor.equals(error.getEditor()) && (scope == null || error.getScope() == scope) && error.getFieldName().equals(fieldName)) { // remove the message