Author: tchemit Date: 2012-07-04 18:12:58 +0200 (Wed, 04 Jul 2012) New Revision: 2380 Url: http://nuiton.org/repositories/revision/jaxx/2380 Log: fixes #2161: Can't use 'errors' id for SwingValidatorMessageTableModel Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2012-07-04 16:12:58 UTC (rev 2380) @@ -71,12 +71,10 @@ public static final String ERROR_LIST_ATTRIBUTE = "errorList"; public static final String ERROR_TABLE_ATTRIBUTE = "errorTable"; - //TODO-TC20091024 should change this default value to errorListModel - public static final String ERROR_LIST_MODEL_DEFAULT = "errors"; - //TODO-TC20091024 should change this default value to errorTableModel + public static final String ERROR_LIST_MODEL_DEFAULT = "errorListModel"; - public static final String ERROR_TABLE_MODEL_DEFAULT = "errors2"; + public static final String ERROR_TABLE_MODEL_DEFAULT = "errorTableModel"; public static final String ERROR_LIST_DEFAULT = "errorList"; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2012-07-04 16:12:58 UTC (rev 2380) @@ -57,10 +57,8 @@ <Identity id='identity'/> <!-- errors model --> - <!-- Not existing :) --> - <!--jaxx.runtime.validator.gwt.GWTValidatorMessageListModel id='errors'--> - <SwingValidatorMessageListModel id='errors' - onContentsChanged='ok.setEnabled(errors.isEmpty())'/> + <SwingValidatorMessageListModel id='errorListModel' + onContentsChanged='ok.setEnabled(errorListModel.isEmpty())'/> <!-- validators --> <BeanValidator id='validator' bean='model1' @@ -353,7 +351,7 @@ layout='{new GridLayout()}' height='200' width='500'> <JScrollPane> - <JList id='errorList' model='{errors}' + <JList id='errorList' model='{errorListModel}' cellRenderer='{new SwingValidatorMessageListRenderer()}'/> </JScrollPane> </JPanel> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2012-07-04 16:12:58 UTC (rev 2380) @@ -58,8 +58,8 @@ <Identity id='identity'/> <!-- errors model --> - <SwingValidatorMessageTableModel id='errors2' - onTableChanged='ok.setEnabled(errors2.getRowCount()==0)'/> + <SwingValidatorMessageTableModel id='errorTableModel' + onTableChanged='ok.setEnabled(errorTableModel.getRowCount()==0)'/> <!-- validators --> <BeanValidator id='validator' bean='model1' @@ -354,7 +354,7 @@ layout='{new GridLayout()}' height='200' width='500'> <JScrollPane columnHeaderView='{errorTable.getTableHeader()}'> - <JTable id='errorTable' model='{errors2}' rowSelectionAllowed='true' + <JTable id='errorTable' model='{errorTableModel}' rowSelectionAllowed='true' autoCreateRowSorter='true' autoResizeMode='2' cellSelectionEnabled='false' selectionMode='0'/>