Author: snjeza Date: 2012-05-23 15:48:52 -0400 (Wed, 23 May 2012) New Revision: 41312 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java Log: JBIDE-11727 - explore providing an .project_example.xml file in root of quickstarts distributions for easy loading/detection in jboss tools Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -69,7 +69,7 @@ public static String ProjectExamplesPreferencePage_Output_directory; public static String ProjectExamplesPreferencePage_Remove; public static String ProjectExamplesPreferencePage_Show_experimental_sites; - public static String ProjectExamplesPreferencePage_Show_server_sites; + public static String ProjectExamplesPreferencePage_Show_runtime_sites; public static String ProjectExamplesPreferencePage_Show_invalid_sites; public static String ProjectExamplesPreferencePage_Sites; public static String ProjectExamplesPreferencePage_Use_default_workspace_location; @@ -96,7 +96,7 @@ public static String SiteDialog_URL; public static String Sites_Plugin_provided_sites; public static String Sites_User_sites; - public static String Sites_Server_sites; + public static String Sites_Runtime_sites; public static String InvalideSite; public static String WTPRuntimeFix_Invalid_WTP_runtime_fix; static { Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -163,10 +163,10 @@ public static final String ALL_RUNTIMES = Messages.ProjectExamplesActivator_All; public static final String SHOW_EXPERIMENTAL_SITES = "showExperimentalSites"; //$NON-NLS-1$ - public static final String SHOW_SERVER_SITES = "showServerSites"; //$NON-NLS-1$ + public static final String SHOW_RUNTIME_SITES = "showRuntimeSites"; //$NON-NLS-1$ public static final String USER_SITES = "userSites"; //$NON-NLS-1$ public static final boolean SHOW_EXPERIMENTAL_SITES_VALUE = false; - public static final boolean SHOW_SERVER_SITES_VALUE = false; + public static final boolean SHOW_RUNTIME_SITES_VALUE = false; public static final String SHOW_INVALID_SITES = "invalidSites"; //$NON-NLS-1$ public static final boolean SHOW_INVALID_SITES_VALUE = true; public static final String MAVEN_ARCHETYPE = "mavenArchetype"; //$NON-NLS-1$ Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2012-05-23 19:48:52 UTC (rev 41312) @@ -56,7 +56,7 @@ ProjectExamplesPreferencePage_Output_directory=Output directory ProjectExamplesPreferencePage_Remove=Remove ProjectExamplesPreferencePage_Show_experimental_sites=Show experimental sites -ProjectExamplesPreferencePage_Show_server_sites=Show server sites +ProjectExamplesPreferencePage_Show_runtime_sites=Show runtime sites ProjectExamplesPreferencePage_Show_invalid_sites=Show invalid sites ProjectExamplesPreferencePage_Sites=Sites ProjectExamplesPreferencePage_Use_default_workspace_location=Use default location @@ -84,6 +84,6 @@ SiteDialog_URL=URL: Sites_Plugin_provided_sites=Plugin provided sites Sites_User_sites=User sites -Sites_Server_sites=Server sites +Sites_Runtime_sites=Runtime sites WTPRuntimeFix_Invalid_WTP_runtime_fix=Invalid WTP runtime fix in {0}. InvalideSite=Invalid site: {0},url={1} Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -145,11 +145,11 @@ return pluginSites; } - public static Set<IProjectExampleSite> getServerSites() { + public static Set<IProjectExampleSite> getRuntimeSites() { Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); IPreferenceStore store = ProjectExamplesActivator.getDefault() .getPreferenceStore(); - if (!store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)) { + if (!store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)) { return sites; } IServer[] servers = ServerCore.getServers(); @@ -261,7 +261,7 @@ Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); sites.addAll(getPluginSites()); sites.addAll(getUserSites()); - sites.addAll(getServerSites()); + sites.addAll(getRuntimeSites()); return sites; } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -56,7 +56,7 @@ public static final String ID = "org.jboss.tools.project.examples.preferences.projectExamplesPreferencePage"; //$NON-NLS-1$ private Button showExperimentalSites; - private Button showServerSites; + private Button showRuntimeSites; private Sites sites; private TreeViewer viewer; private ProjectExampleSite selectedSite; @@ -146,9 +146,9 @@ showExperimentalSites.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites); showExperimentalSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES)); - showServerSites = new Button(composite,SWT.CHECK); - showServerSites.setText(Messages.ProjectExamplesPreferencePage_Show_server_sites); - showServerSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)); + showRuntimeSites = new Button(composite,SWT.CHECK); + showRuntimeSites.setText(Messages.ProjectExamplesPreferencePage_Show_runtime_sites); + showRuntimeSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)); showInvalidSites = new Button(composite,SWT.CHECK); showInvalidSites.setText(Messages.ProjectExamplesPreferencePage_Show_invalid_sites); @@ -286,12 +286,12 @@ showQuickFix.setSelection(ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE); showExperimentalSites.setSelection(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES_VALUE); - showServerSites.setSelection(ProjectExamplesActivator.SHOW_SERVER_SITES_VALUE); + showRuntimeSites.setSelection(ProjectExamplesActivator.SHOW_RUNTIME_SITES_VALUE); showInvalidSites.setSelection(ProjectExamplesActivator.SHOW_INVALID_SITES_VALUE); isWorkspace.setSelection(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE); outputDirectoryText.setText(""); //$NON-NLS-1$ sites.getUserSites().clear(); - sites.getServerSites().clear(); + sites.getRuntimeSites().clear(); storePreferences(); super.performDefaults(); } @@ -309,7 +309,7 @@ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection()); store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, showExperimentalSites.getSelection()); - store.setValue(ProjectExamplesActivator.SHOW_SERVER_SITES, showServerSites.getSelection()); + store.setValue(ProjectExamplesActivator.SHOW_RUNTIME_SITES, showRuntimeSites.getSelection()); store.setValue(ProjectExamplesActivator.SHOW_INVALID_SITES, showInvalidSites.getSelection()); store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT, isWorkspace.getSelection()); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -49,8 +49,8 @@ ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE); node.putBoolean( - ProjectExamplesActivator.SHOW_SERVER_SITES, - ProjectExamplesActivator.SHOW_SERVER_SITES_VALUE); + ProjectExamplesActivator.SHOW_RUNTIME_SITES, + ProjectExamplesActivator.SHOW_RUNTIME_SITES_VALUE); } } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -27,7 +27,7 @@ public class Sites { private SiteCategory[] siteCategories; private SiteCategory userSite; - private SiteCategory serverSite; + private SiteCategory runtimeSite; private Set<IProjectExampleSite> sites; public SiteCategory[] getSiteCategories() { @@ -44,15 +44,15 @@ pluginSite.setSites(pluginSites); siteCategories[1]=pluginSite; - serverSite = new SiteCategory(Messages.Sites_Server_sites); - Set<IProjectExampleSite> serverSites = ProjectExampleUtil.getServerSites(); - serverSite.setSites(serverSites); - siteCategories[2]= serverSite; + runtimeSite = new SiteCategory(Messages.Sites_Runtime_sites); + Set<IProjectExampleSite> runtimeSites = ProjectExampleUtil.getRuntimeSites(); + runtimeSite.setSites(runtimeSites); + siteCategories[2]= runtimeSite; sites = new HashSet<IProjectExampleSite>(); sites.addAll(pluginSites); sites.addAll(userSites); - sites.addAll(serverSites); + sites.addAll(runtimeSites); } return siteCategories; } @@ -75,7 +75,7 @@ return userSite.getSites(); } - public Set<IProjectExampleSite> getServerSites() { - return serverSite.getSites(); + public Set<IProjectExampleSite> getRuntimeSites() { + return runtimeSite.getSites(); } } \ No newline at end of file Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -113,8 +113,8 @@ gd = new GridData(SWT.FILL, SWT.BEGINNING, false, false); gd.horizontalSpan = 2; serverButton.setLayoutData(gd); - serverButton.setText(Messages.ProjectExamplesPreferencePage_Show_server_sites); - serverButton.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)); + serverButton.setText(Messages.ProjectExamplesPreferencePage_Show_runtime_sites); + serverButton.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)); new Label(siteComposite,SWT.NONE).setText(Messages.NewProjectExamplesWizardPage_Site); siteCombo = new Combo(siteComposite,SWT.READ_ONLY); @@ -266,7 +266,7 @@ @Override public void widgetSelected(SelectionEvent e) { IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore(); - store.setValue(ProjectExamplesActivator.SHOW_SERVER_SITES, serverButton.getSelection()); + store.setValue(ProjectExamplesActivator.SHOW_RUNTIME_SITES, serverButton.getSelection()); //Store current combo selections String selectedRuntime = targetRuntimeTypesCombo.getText();