Author: dgolovin Date: 2007-07-25 21:18:09 -0400 (Wed, 25 Jul 2007) New Revision: 2662 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java Log: http://jira.jboss.org/jira/browse/EXIN-221 bug fixing Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-07-25 18:48:08 UTC (rev 2661) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-07-26 01:18:09 UTC (rev 2662) @@ -70,7 +70,7 @@ "JBoss Seam Home Folder:","C:\\java\\jboss-seam-1.2.1.GA"); IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE.createComboEditor( ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, - "Deploy as:",Arrays.asList(new String[]{"war","ear"}),"war"); + "Deploy as:",Arrays.asList(new String[]{"war","ear"}),"war",false); // Database group IFieldEditor jBossAsDbTypeEditor = IFieldEditorFactory.INSTANCE.createComboEditor( Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java 2007-07-25 18:48:08 UTC (rev 2661) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SwtFieldEditorFactory.java 2007-07-26 01:18:09 UTC (rev 2662) @@ -56,6 +56,15 @@ /** * */ + public ITaggedFieldEditor createComboEditor(String name, String label, + List values, Object defaultValue, boolean flat) { + TaggedComboFieldEditor editor = new TaggedComboFieldEditor(name,label,values, defaultValue,flat); + return editor; + } + + /** + * + */ public IFieldEditor createTextEditor(String name, String label, String defaultValue) { CompositeEditor editor = new CompositeEditor(name,label, defaultValue); editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-07-25 18:48:08 UTC (rev 2661) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-07-26 01:18:09 UTC (rev 2662) @@ -201,7 +201,8 @@ project = (IProject)contextArray[1]; } - String classDecl = "class " + value + " {}"; + // to allow qualified names for component use import statement as target + String classDecl = "import " + value.toString() +"; class Dummy {}"; ASTParser parser= ASTParser.newParser(AST.JLS3); parser.setSource(classDecl.toCharArray()); parser.setProject(JavaCore.create(project)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2007-07-25 18:48:08 UTC (rev 2661) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2007-07-26 01:18:09 UTC (rev 2662) @@ -26,6 +26,7 @@ * @return */ IFieldEditor createTextEditor(String name, String label, String defaultValue); + /** * * @param name TODO @@ -35,6 +36,17 @@ * @return */ ITaggedFieldEditor createComboEditor(String name, String label, List values, Object defaultValue); + + /** + * + * @param name TODO + * @param label + * @param values + * @param defaultValue + * @return + */ + ITaggedFieldEditor createComboEditor(String name, String label, List values, Object defaultValue, boolean flat); + /** * Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-07-25 18:48:08 UTC (rev 2661) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-07-26 01:18:09 UTC (rev 2662) @@ -49,28 +49,31 @@ */ @Override public boolean performFinish() { - try { - + // TODO lock only current project, not entire workspace - getContainer().run(false,false, new WorkspaceModifyOperation(){ - @Override - protected void execute(IProgressMonitor monitor) - throws CoreException, InvocationTargetException, - InterruptedException { - IUndoableOperation operation = getOperation(); - IOperationHistory operationHistory = workbench.getOperationSupport().getOperationHistory(); - IUndoContext undoContext = workbench.getOperationSupport().getUndoContext(); - operation.addContext(undoContext); - try { - operationHistory.execute(operation, monitor, (IAdaptable)getPages()[0]); - } catch (ExecutionException e) { - SeamCorePlugin.getPluginLog().logError(e); + try { + getContainer().run(false,false, new WorkspaceModifyOperation(){ + @Override + protected void execute(IProgressMonitor monitor) + throws CoreException, InvocationTargetException, + InterruptedException { + IUndoableOperation operation = getOperation(); + IOperationHistory operationHistory = workbench.getOperationSupport().getOperationHistory(); + IUndoContext undoContext = workbench.getOperationSupport().getUndoContext(); + operation.addContext(undoContext); + try { + operationHistory.execute(operation, monitor, (IAdaptable)getPages()[0]); + } catch (ExecutionException e) { + SeamCorePlugin.getPluginLog().logError(e); + } } - } - }); - } catch (Exception e) { - SeamCorePlugin.getPluginLog().logError(e); - } + }); + } catch (InvocationTargetException e) { + SeamCorePlugin.getPluginLog().logError(e); + } catch (InterruptedException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + return true; }