Author: scabanovich Date: 2011-08-23 20:02:47 -0400 (Tue, 23 Aug 2011) New Revision: 34195 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java Log: JBIDE-9198 https://issues.jboss.org/browse/JBIDE-9198 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java 2011-08-23 23:08:06 UTC (rev 34194) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/AddJSFNatureActionDelegate.java 2011-08-24 00:02:47 UTC (rev 34195) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.ui.util.ExtensionPointUtils; import org.eclipse.jface.action.IAction; @@ -37,7 +38,14 @@ import org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard; public class AddJSFNatureActionDelegate extends AddNatureActionDelegate { + boolean showDialog = true; + public AddJSFNatureActionDelegate() {} + + public AddJSFNatureActionDelegate(boolean showDialog) { + this.showDialog = showDialog; + } + protected IWizard getWizard(IProject project) { ImportProjectWizard wizard = (ImportProjectWizard)ExtensionPointUtils.findImportWizardsItem( JSFModelPlugin.PLUGIN_ID, @@ -97,8 +105,12 @@ wc.addProjectFacet(jsf); } - PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), project, FacetsPropertyPage.ID, new String[] {FacetsPropertyPage.ID}, null); - dialog.open(); + if(!showDialog) { + wc.commitChanges(new NullProgressMonitor()); + } else { + PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), project, FacetsPropertyPage.ID, new String[] {FacetsPropertyPage.ID}, null); + dialog.open(); + } SharedWorkingCopyManager.releaseWorkingCopy(fp); } catch (CoreException e) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-23 23:08:06 UTC (rev 34194) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-24 00:02:47 UTC (rev 34195) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.jsf.ui.JsfUIMessages; import org.jboss.tools.jsf.ui.editor.check.wizards.AddJSFCapabilitiesWizard; @@ -53,9 +54,8 @@ @Override protected void skipButtonPressed() { try { - project.setPersistentProperty( - ProjectNaturesChecker.IS_JSF_NATURES_CHECK_NEED, - Boolean.toString(!isRemember)); + String value = !isRemember ? "yes" : "no"; + Preference.SHOW_NATURE_WARNING.setValue(value); } catch (CoreException e) { } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-23 23:08:06 UTC (rev 34194) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-24 00:02:47 UTC (rev 34195) @@ -30,6 +30,7 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.views.markers.MarkerSupportInternalUtilities; import org.eclipse.ui.views.markers.internal.MarkerMessages; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.jsf.ui.JsfUIMessages; import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.editor.check.wizards.QuickFixWizard; @@ -118,9 +119,8 @@ @Override protected void skipButtonPressed() { try { - project.setPersistentProperty( - ProjectNaturesChecker.IS_KB_NATURES_CHECK_NEED, - Boolean.toString(!isRemember)); + String value = !isRemember ? "yes" : "no"; + Preference.SHOW_NATURE_WARNING.setValue(value); } catch (CoreException e) { } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-23 23:08:06 UTC (rev 34194) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-24 00:02:47 UTC (rev 34195) @@ -25,6 +25,7 @@ import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.model.options.Preference; import org.jboss.tools.common.reporting.ProblemReportingHelper; import org.jboss.tools.jsf.ui.JsfUIMessages; import org.jboss.tools.jst.jsp.JspEditorPlugin; @@ -43,10 +44,6 @@ private ProjectNaturesPartListener partListener = new ProjectNaturesPartListener(); private static final String SEARCH_CLASS = "javax.faces.webapp.FacesServlet"; //$NON-NLS-1$ - public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName( - "", JsfUIMessages.IS_JSF_NATURE_CHECK_NEED); //$NON-NLS-1$ - public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName( - "", JsfUIMessages.IS_KB_NATURE_CHECK_NEED); //$NON-NLS-1$ public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName( "", JsfUIMessages.IS_JSF_CHECK_NEED); //$NON-NLS-1$ private Set<IProject> projectsCollection; @@ -86,9 +83,7 @@ public void checkNatures(IProject project) throws CoreException { if (project != null && project.isAccessible()) { addProject(project); - updateProjectPersistentProperties(project); - boolean isKBNaturesCheck = Boolean.parseBoolean(project - .getPersistentProperty(IS_KB_NATURES_CHECK_NEED)); + boolean isKBNaturesCheck = Preference.SHOW_NATURE_WARNING.getValue().equals("yes"); KbProject.checkKBBuilderInstalled(project); String missingNature = checkMissingNatures(project); if (missingNature != null) { @@ -131,19 +126,6 @@ } } - private void updateProjectPersistentProperties(IProject project) - throws CoreException { - if (project.isAccessible()) { - updateProjectJSFPersistents(project); - if (project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) == null) { - project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, Boolean.TRUE.toString()); - } - if (project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) == null) { - project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, Boolean.TRUE.toString()); - } - } - } - public IProject getProject(IProject project) { return projectsCollection.contains(project) ? project : null; }