[jbosstools-commits] JBoss Tools SVN: r16314 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration: validate and 1 other directory.

Author: DartPeng Date: 2009-07-01 05:59:51 -0400 (Wed, 01 Jul 2009) New Revision: 16314 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java Log: JBIDE-4540 Smooks validation runs too slowly , change the validator interface to fix this problem. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonDataConfiguraitonWizardPage.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -282,11 +282,11 @@ gd = new GridData(GridData.FILL_HORIZONTAL); - addButton = new Button(buttonComposite, SWT.BORDER); + addButton = new Button(buttonComposite, SWT.NONE); addButton.setLayoutData(gd); addButton.setText("Add"); - removeButton = new Button(buttonComposite, SWT.BORDER); + removeButton = new Button(buttonComposite, SWT.NONE); removeButton.setLayoutData(gd); removeButton.setText("Remove"); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -53,19 +53,6 @@ */ @Override public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { - idList.clear(); - Resource resource = editingDomain.getResourceSet().getResources().get(0); - Object obj = resource.getContents().get(0); - if (obj instanceof DocumentRoot) { - SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList(); - List<String> ids = SmooksUIUtils.getBeanIdStringList(listType); - if (ids != null){ - idList.addAll(ids); - } - } - if (idList.isEmpty()) { - // return null; - } return super.validate(selectedObjects, editingDomain); } @@ -96,4 +83,20 @@ return super.validateModel(model, editingDomain); } + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { + idList.clear(); + Resource resource = editingDomain.getResourceSet().getResources().get(0); + Object obj = resource.getContents().get(0); + if (obj instanceof DocumentRoot) { + SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList(); + List<String> ids = SmooksUIUtils.getBeanIdStringList(listType); + if (ids != null) { + idList.addAll(ids); + } + } + if (idList.isEmpty()) { + // return + } + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ClassFieldEditorValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -91,4 +91,9 @@ public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { return validate(selectedObjects); } + + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { + // TODO Auto-generated method stub + + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -41,11 +41,6 @@ */ @Override public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { - beanIdList.clear(); - findDuplicatedBeanId(selectedObjects , new ArrayList<String>()); - if(beanIdList.isEmpty()){ - return null; - } List<Diagnostic> list = new ArrayList<Diagnostic>(); validateModel(selectedObjects, list);//, editingDomain) return list; @@ -141,4 +136,12 @@ } } } + + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { + beanIdList.clear(); + findDuplicatedBeanId(selectedObjects , new ArrayList<String>()); + if(beanIdList.isEmpty()){ + return ; + } + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ISmooksValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -21,5 +21,8 @@ * */ public interface ISmooksValidator { + + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain); + public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -74,36 +74,6 @@ */ @Override public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { - list.clear(); - Resource resource = editingDomain.getResourceSet().getResources().get(0); - if (resource.getContents().isEmpty()) { - return super.validate(selectedObjects, editingDomain); - } - Object obj = resource.getContents().get(0); - SmooksResourceListType listType = null; - if (obj instanceof DocumentRoot) { - listType = ((DocumentRoot) obj).getSmooksResourceList(); - IResource r = SmooksUIUtils.getResource(listType); - IFile file = null; - if (r instanceof IFile) { - file = (IFile) r; - } - final IFile ff = file; - String extName = ff.getName() + ".ext"; - - IFile extFile = ff.getParent().getFile(new Path(extName)); - try { - extType = SmooksUIUtils.loadSmooksGraphicsExt(extFile); - } catch (IOException e) { - // ignore - } - } - if (extType != null) { - List<Object> l = SelectoreSelectionDialog.generateInputData(extType, listType); - if (l != null) { - list.addAll(l); - } - } return super.validate(selectedObjects, editingDomain); } @@ -249,4 +219,37 @@ return null; } + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { + list.clear(); + Resource resource = editingDomain.getResourceSet().getResources().get(0); + if (resource.getContents().isEmpty()) { + return; + } + Object obj = resource.getContents().get(0); + SmooksResourceListType listType = null; + if (obj instanceof DocumentRoot) { + listType = ((DocumentRoot) obj).getSmooksResourceList(); + IResource r = SmooksUIUtils.getResource(listType); + IFile file = null; + if (r instanceof IFile) { + file = (IFile) r; + } + final IFile ff = file; + String extName = ff.getName() + ".ext"; + + IFile extFile = ff.getParent().getFile(new Path(extName)); + try { + extType = SmooksUIUtils.loadSmooksGraphicsExt(extFile); + } catch (IOException e) { + // ignore + } + } + if (extType != null) { + List<Object> l = SelectoreSelectionDialog.generateInputData(extType, listType); + if (l != null) { + list.addAll(l); + } + } + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-01 09:50:30 UTC (rev 16313) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-01 09:59:51 UTC (rev 16314) @@ -166,6 +166,7 @@ list.add(diagnostic); for (Iterator<?> iterator = this.validatorList.iterator(); iterator.hasNext();) { ISmooksValidator validator = (ISmooksValidator) iterator.next(); + validator.initValidator(selectedObjects, domain); List<Diagnostic> d = validator.validate(selectedObjects, domain); if (d != null) { for (Iterator<?> iterator2 = d.iterator(); iterator2.hasNext();) { @@ -324,4 +325,9 @@ public void validate(IValidationContext helper, IReporter reporter) throws ValidationException { } + + public void initValidator(Collection<?> selectedObjects, EditingDomain editingDomain) { + // TODO Auto-generated method stub + + } }