[jbosstools-commits] JBoss Tools SVN: r38432 - in trunk: download.jboss.org/jbosstools/examples and 13 other directories.

Author: snjeza Date: 2012-02-04 19:36:38 -0500 (Sat, 04 Feb 2012) New Revision: 38432 Added: trunk/download.jboss.org/jbosstools/examples/Copy of project-examples-category-jbds-3.3.xml trunk/download.jboss.org/jbosstools/examples/project-examples-category-3.... trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... trunk/examples/plugins/org.jboss.tools.project.examples/schema/categories.exsd trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleCategory.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java Removed: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Category.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java Modified: trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 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/dialog/FixDialog.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerContentProvider.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/PluginFix.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/ProjectExamplesFix.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/SeamRuntimeFix.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.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/Sites.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/SiteFilter.java trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/SiteTest.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java Log: JBIDE-10658 find place where description for category should live Modified: trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -32,8 +32,8 @@ import org.jboss.tools.central.jobs.RefreshNewsJob; import org.jboss.tools.central.jobs.RefreshTutorialsJob; import org.jboss.tools.central.model.FeedsEntry; -import org.jboss.tools.project.examples.model.Category; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExampleCategory; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; import org.junit.AfterClass; @@ -77,7 +77,7 @@ public void testTutorials() throws Exception { Job.getJobManager().join(JBossCentralActivator.JBOSS_CENTRAL_FAMILY, new NullProgressMonitor()); - Map<Category, List<Project>> categories = RefreshTutorialsJob.INSTANCE + Map<ProjectExampleCategory, List<ProjectExample>> categories = RefreshTutorialsJob.INSTANCE .getTutorialCategories(); assertTrue("No one tutorial is found", categories.size() > 0); } Added: trunk/download.jboss.org/jbosstools/examples/Copy of project-examples-category-jbds-3.3.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/Copy of project-examples-category-jbds-3.3.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/examples/Copy of project-examples-category-jbds-3.3.xml 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<categories> + + <category name="JBoss AS 7 Quickstarts" + description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts." + priority="1" /> + + <category name="Java EE 6 Quickstarts" + priority="2" /> + +</categories> \ No newline at end of file Added: trunk/download.jboss.org/jbosstools/examples/project-examples-category-3.... =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-category-3.... (rev 0) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-3.... 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<categories> + + <category name="JBoss Quickstarts" + description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts." + priority="1" /> + + <category name="Java EE 6 Quickstarts" + priority="2" /> + +</categories> \ No newline at end of file Added: trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... (rev 0) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<categories> + +</categories> \ No newline at end of file Added: trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... (rev 0) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<categories> + +</categories> \ No newline at end of file Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml =================================================================== --- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2012-02-05 00:36:38 UTC (rev 38432) @@ -41,6 +41,7 @@ <project> <category>JBoss Quickstarts</category> <name>helloworld</name> + <priority>1</priority> <included-projects>jboss-as-helloworld</included-projects> <shortDescription>Helloworld</shortDescription> <description> @@ -130,6 +131,7 @@ <project> <category>JBoss Quickstarts</category> <name>login</name> + <priority>2</priority> <included-projects>jboss-as-login</included-projects> <shortDescription>Login</shortDescription> <description> @@ -173,6 +175,7 @@ <project> <category>JBoss Quickstarts</category> <name>numberguess</name> + <priority>3</priority> <included-projects>jboss-as-numberguess</included-projects> <shortDescription>Numberguess</shortDescription> <description> @@ -216,6 +219,7 @@ <project> <category>JBoss Quickstarts</category> <name>kitchensink</name> + <priority>4</priority> <included-projects>jboss-as-kitchensink</included-projects> <shortDescription>Kitchensink</shortDescription> <description> @@ -259,6 +263,7 @@ <project> <category>JBoss Quickstarts</category> <name>poh5-helloworld</name> + <priority>5</priority> <included-projects>poh5-helloworld</included-projects> <shortDescription>HTML5</shortDescription> <description>This example demonstrates the use of *CDI 1.0* and *JAX-RS* in *JBoss AS 7* using the Plain Old HTML5 (POH5) architecture. Modified: trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml =================================================================== --- trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.community.project.examples/plugin.xml 2012-02-05 00:36:38 UTC (rev 38432) @@ -36,4 +36,10 @@ <url>http://download.jboss.org/jbosstools/examples/project-examples-mav... <experimental>false</experimental> </extension> + + <extension + point="org.jboss.tools.project.examples.categories" + name="Project Examples Categories"> + <url>http://download.jboss.org/jbosstools/examples/project-examples-cat... + </extension> </plugin> Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.properties 2012-02-05 00:36:38 UTC (rev 38432) @@ -5,4 +5,5 @@ Project_Examples_wizard = Project Examples Project_Examples_command =Project Examples... ProjectExamples=Project Examples file -Project_Examples = Project Examples \ No newline at end of file +Project_Examples = Project Examples +ProjectExampleCategories = Project Examples categories \ No newline at end of file Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-05 00:36:38 UTC (rev 38432) @@ -2,6 +2,7 @@ <?eclipse version="3.2"?> <plugin> <extension-point id="projectExamplesXml" name="%ProjectExamples" schema="schema/projectExamplesXml.exsd"/> + <extension-point id="categories" name="%ProjectExampleCategories" schema="schema/categories.exsd"/> <extension-point id="importProjectExamples" name="Import Project Examples" schema="schema/importProjectExample.exsd"/> <extension point="org.eclipse.ui.newWizards"> @@ -75,5 +76,11 @@ <url>http://download.jboss.org/jbosstools/examples/project-examples-sha... <experimental>false</experimental> </extension> + + <extension + point="org.jboss.tools.project.examples.categories" + name="Project Examples Categories"> + <url>http://download.jboss.org/jbosstools/examples/project-examples-cat... + </extension> </plugin> Added: trunk/examples/plugins/org.jboss.tools.project.examples/schema/categories.exsd =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/schema/categories.exsd (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/schema/categories.exsd 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,103 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.jboss.tools.project.examples" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.tools.project.examples" id="categories" name="Project Examples Categories"/> + </appInfo> + <documentation> + Adds a new Project Examples Category xml file + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence> + <element ref="url"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="url"> + <complexType> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + 3.0.0 + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + &lt;extension + point=&quot;org.jboss.tools.project.examples.projectExamplesXml&quot;&gt; + &lt;url&gt;file:/C:/test/projectExamples.xml&lt;/url&gt; +&lt;/extension&gt; + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + JBoss by Red Hat + </documentation> + </annotation> + +</schema> 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-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -97,9 +97,9 @@ import org.jboss.tools.project.examples.fixes.SeamRuntimeFix; import org.jboss.tools.project.examples.fixes.WTPRuntimeFix; import org.jboss.tools.project.examples.model.IImportProjectExample; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.jboss.tools.project.examples.wizard.ImportDefaultProjectExample; import org.jboss.tools.project.examples.wizard.NewProjectExamplesJob; import org.osgi.framework.BundleContext; @@ -216,9 +216,9 @@ return context; } - public static List<IMarker> getMarkers(List<Project> projects) { + public static List<IMarker> getMarkers(List<ProjectExample> projects) { List<IMarker> markers = new ArrayList<IMarker>(); - for (Project project : projects) { + for (ProjectExample project : projects) { try { if (project.getIncludedProjects() == null) { String projectName = project.getName(); @@ -255,7 +255,7 @@ return markers; } - public static IProject[] getEclipseProject(Project project, + public static IProject[] getEclipseProject(ProjectExample project, ProjectFix fix) { String pName = fix.getProperties().get( ProjectFix.ECLIPSE_PROJECTS); @@ -288,7 +288,7 @@ return projects.toArray(new IProject[0]); } - protected static String replace(String name, Project project) { + protected static String replace(String name, ProjectExample project) { List<String> includedProjects = project.getIncludedProjects(); if (includedProjects != null) { int i = 0; @@ -341,7 +341,7 @@ } } - public static void fix(Project project, IProgressMonitor monitor) { + public static void fix(ProjectExample project, IProgressMonitor monitor) { List<ProjectFix> fixes = project.getFixes(); for (ProjectFix fix:fixes) { ProjectExamplesFix projectExamplesFix = ProjectExamplesFixFactory.getProjectFix(fix); @@ -363,7 +363,7 @@ } } - public static boolean downloadProject(Project project, IProgressMonitor monitor) { + public static boolean downloadProject(ProjectExample project, IProgressMonitor monitor) { if (project.isURLRequired()) { String urlString = project.getUrl(); String name = project.getName(); @@ -374,7 +374,7 @@ ProjectExamplesActivator.log(e); return false; } - File file = ProjectUtil.getProjectExamplesFile(url, name, + File file = ProjectExampleUtil.getProjectExamplesFile(url, name, ".zip", monitor); //$NON-NLS-1$ if (file == null) { return false; @@ -384,11 +384,11 @@ return true; } - public static void openWelcome(List<Project> projects) { + public static void openWelcome(List<ProjectExample> projects) { if (projects == null) { return; } - for(final Project project:projects) { + for(final ProjectExample project:projects) { fixWelcome(project); if (project.isWelcome()) { String urlString = project.getWelcomeURL(); @@ -418,7 +418,7 @@ Display.getDefault().asyncExec(new Runnable() { public void run() { - if (ProjectUtil.CHEATSHEETS.equals(project.getType())) { + if (ProjectExampleUtil.CHEATSHEETS.equals(project.getType())) { CheatSheetView view = ViewUtilities.showCheatSheetView(); if (view == null) { return; @@ -478,7 +478,7 @@ } } - private static void fixWelcome(Project project) { + private static void fixWelcome(ProjectExample project) { if (project == null || project.isWelcome()) { return; } @@ -486,7 +486,7 @@ } - protected static void checkCheatsheet(Project project) { + protected static void checkCheatsheet(ProjectExample project) { List<String> includedProjects = project.getIncludedProjects(); if (includedProjects == null || includedProjects.size() <= 0) { return; @@ -501,29 +501,29 @@ continue; } if (checkCheatsheet(project, eclipseProject, PERIOD_CHEATSHEET_XML, - ProjectUtil.CHEATSHEETS)) { + ProjectExampleUtil.CHEATSHEETS)) { return; } if (checkCheatsheet(project, eclipseProject, CHEATSHEET_XML, - ProjectUtil.CHEATSHEETS)) { + ProjectExampleUtil.CHEATSHEETS)) { return; } if (checkCheatsheet(project, eclipseProject, README_HTML, - ProjectUtil.EDITOR)) { + ProjectExampleUtil.EDITOR)) { return; } if (checkCheatsheet(project, eclipseProject, README_MD, - ProjectUtil.EDITOR)) { + ProjectExampleUtil.EDITOR)) { return; } if (checkCheatsheet(project, eclipseProject, README_TXT, - ProjectUtil.EDITOR)) { + ProjectExampleUtil.EDITOR)) { return; } } } - private static boolean checkCheatsheet(Project project, + private static boolean checkCheatsheet(ProjectExample project, IProject eclipseProject, String path, String type) { IResource cheatsheet = eclipseProject.findMember(path); if (cheatsheet != null && cheatsheet.exists() && cheatsheet.getType() == IResource.FILE) { @@ -602,7 +602,7 @@ } } - public static boolean canFix(Project project,ProjectFix fix) { + public static boolean canFix(ProjectExample project,ProjectFix fix) { String type = fix.getType(); if (ProjectFix.PLUGIN_TYPE.equals(type)) { return new PluginFix().canFix(project, fix); @@ -619,7 +619,7 @@ return true; } - public static void updatePerspective(List<Project> projects) { + public static void updatePerspective(List<ProjectExample> projects) { if (projects == null || projects.size() != 1) { return; } @@ -816,7 +816,7 @@ page.setPerspective(persp); } - public static void showQuickFix(final List<Project> projects) { + public static void showQuickFix(final List<ProjectExample> projects) { Display.getDefault().asyncExec(new Runnable() { @@ -832,7 +832,7 @@ } public static void importProjectExamples( - final List<Project> selectedProjects, final boolean showQuickFix) { + final List<ProjectExample> selectedProjects, final boolean showQuickFix) { final NewProjectExamplesJob workspaceJob = new NewProjectExamplesJob( Messages.NewProjectExamplesWizard_Downloading, selectedProjects); workspaceJob.setUser(true); @@ -850,7 +850,7 @@ if (!workspaceJob.getResult().isOK()) { return; } - List<Project> projects = workspaceJob.getProjects(); + List<ProjectExample> projects = workspaceJob.getProjects(); try { ProjectExamplesActivator.updatePerspective(projects); ProjectExamplesActivator.waitForBuildAndValidation Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/FixDialog.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/FixDialog.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/FixDialog.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.jboss.tools.project.examples.Messages; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizardPage; @@ -72,8 +72,8 @@ fixes = new ArrayList<ProjectFix>(); while (iterator.hasNext()) { Object object = iterator.next(); - if (object instanceof Project) { - Project project = (Project) object; + if (object instanceof ProjectExample) { + ProjectExample project = (ProjectExample) object; fixes.addAll(project.getUnsatisfiedFixes()); } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerContentProvider.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerContentProvider.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerContentProvider.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @author snjeza @@ -24,9 +24,9 @@ */ public class MarkerContentProvider implements IStructuredContentProvider { - private List<Project> projects; + private List<ProjectExample> projects; - public MarkerContentProvider(List<Project> projects) { + public MarkerContentProvider(List<ProjectExample> projects) { this.projects = projects; } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -69,7 +69,7 @@ import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.dialog.xpl.QuickFixWizard; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @author snjeza @@ -79,7 +79,7 @@ private static final String QUICK_FIX = Messages.MarkerDialog_Quick_Fix; private static final IMarkerResolution[] EMPTY_ARRAY = new IMarkerResolution[0]; - private List<Project> projects; + private List<ProjectExample> projects; private Image _dlgTitleImage; private Button quickFixButton; private Button finishButton; @@ -100,7 +100,7 @@ } - public MarkerDialog(Shell parentShell, List<Project> projects) { + public MarkerDialog(Shell parentShell, List<ProjectExample> projects) { super(parentShell); this.projects = projects; setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER @@ -222,7 +222,7 @@ try { quickFixButton.setSelection(false); openQuickFixWizard(selected); - for (Project project : projects) { + for (ProjectExample project : projects) { if (project.getIncludedProjects() == null) { buildProject(project.getName()); } else { Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/PluginFix.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/PluginFix.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/PluginFix.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; import org.osgi.framework.Bundle; @@ -26,7 +26,7 @@ */ public class PluginFix implements ProjectExamplesFix { - public boolean canFix(Project project, ProjectFix fix) { + public boolean canFix(ProjectExample project, ProjectFix fix) { if (!ProjectFix.PLUGIN_TYPE.equals(fix.getType())) { return false; } @@ -39,7 +39,7 @@ return bundle != null; } - public boolean fix(Project project, ProjectFix fix, + public boolean fix(ProjectExample project, ProjectFix fix, IProgressMonitor monitor) { // can't be fixed return false; Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/ProjectExamplesFix.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/ProjectExamplesFix.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/ProjectExamplesFix.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -11,7 +11,7 @@ package org.jboss.tools.project.examples.fixes; import org.eclipse.core.runtime.IProgressMonitor; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; /** @@ -21,6 +21,6 @@ */ public interface ProjectExamplesFix { - boolean canFix(Project project, ProjectFix fix); - boolean fix(Project project, ProjectFix fix, IProgressMonitor monitor); + boolean canFix(ProjectExample project, ProjectFix fix); + boolean fix(ProjectExample project, ProjectFix fix, IProgressMonitor monitor); } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/SeamRuntimeFix.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/SeamRuntimeFix.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/SeamRuntimeFix.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamRuntime; @@ -33,14 +33,14 @@ */ public class SeamRuntimeFix implements ProjectExamplesFix { - public boolean canFix(Project project, ProjectFix fix) { + public boolean canFix(ProjectExample project, ProjectFix fix) { if (!ProjectFix.SEAM_RUNTIME.equals(fix.getType())) { return false; } return getBestRuntime(project, fix) != null; } - private SeamRuntime getBestRuntime(Project project, ProjectFix fix) { + private SeamRuntime getBestRuntime(ProjectExample project, ProjectFix fix) { String allowedVersions = fix.getProperties().get(ProjectFix.ALLOWED_VERSIONS); if (allowedVersions == null) { ProjectExamplesActivator.log(NLS.bind(Messages.SeamRuntimeFix_Invalid_seam_runtime_fix, project.getName())); @@ -69,7 +69,7 @@ return null; } - public boolean fix(Project project, ProjectFix fix, + public boolean fix(ProjectExample project, ProjectFix fix, IProgressMonitor monitor) { if (!canFix(project, fix)) { return false; @@ -88,7 +88,7 @@ return ret; } - private boolean fix(Project project, ProjectFix fix, + private boolean fix(ProjectExample project, ProjectFix fix, IProject eclipseProject) { IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(eclipseProject); String seamRuntimeName = prefs.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, null); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -44,7 +44,7 @@ import org.jboss.tools.portlet.core.internal.PortletRuntimeComponentProvider; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; /** @@ -65,14 +65,14 @@ private static final String REQUIRED_COMPONENTS = "required-components"; //$NON-NLS-1$ private static final IPath ESB_SERVER_SUPPLIED_CONTAINER_PATH = new Path("org.jboss.esb.runtime.classpath/server.supplied"); //$NON-NLS-1$ - public boolean canFix(Project project, ProjectFix fix) { + public boolean canFix(ProjectExample project, ProjectFix fix) { if (!ProjectFix.WTP_RUNTIME.equals(fix.getType())) { return false; } return getBestRuntime(project, fix) != null; } - public boolean fix(Project project, ProjectFix fix, + public boolean fix(ProjectExample project, ProjectFix fix, IProgressMonitor monitor) { if (!canFix(project, fix)) { return false; @@ -114,7 +114,7 @@ return ret; } - private void fixNonFacetedEsbProject(Project project, ProjectFix fix, + private void fixNonFacetedEsbProject(ProjectExample project, ProjectFix fix, IProject eclipseProject) throws JavaModelException { IRuntime runtime = getBestRuntime(project, fix); if (runtime != null) { @@ -176,7 +176,7 @@ } } - private IRuntime getBestRuntime(Project project, ProjectFix fix) { + private IRuntime getBestRuntime(ProjectExample project, ProjectFix fix) { String allowedTypes = fix.getProperties().get( ProjectFix.ALLOWED_TYPES); if (allowedTypes == null) { Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -45,7 +45,7 @@ } @Override - public void fix(Project project, IProgressMonitor monitor) { + public void fix(ProjectExample project, IProgressMonitor monitor) { ProjectExamplesActivator.fix(project, monitor); } Deleted: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Category.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Category.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Category.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -1,121 +0,0 @@ -/************************************************************************************* - * Copyright (c) 2008-2011 Red Hat, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * JBoss by Red Hat - Initial implementation. - ************************************************************************************/ -package org.jboss.tools.project.examples.model; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.project.examples.Messages; - -/** - * @author snjeza - * - */ -public class Category implements ProjectModelElement, Comparable<Category> { - - private String name; - private List<Project> projects = new ArrayList<Project>(); - private IProjectExampleSite site; - public static Category OTHER = new Category(Messages.Category_Other); - - public Category(String name) { - super(); - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List<Project> getProjects() { - return projects; - } - - public void setProjects(List<Project> projects) { - this.projects = projects; - } - - public String getDescription() { - return getName(); - } - - public String getShortDescription() { - return getName(); - } - - public IProjectExampleSite getSite() { - return site; - } - - @Override - public void setSite(IProjectExampleSite site) { - this.site = site; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((site == null) ? 0 : site.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Category other = (Category) obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (site == null) { - if (other.site != null) - return false; - } else if (!site.equals(other.site)) - return false; - return true; - } - - @Override - public String toString() { - return getName(); - } - - @Override - public int compareTo(Category o) { - if (o == null) { - return 1; - } - //TODO use priorities - String otherName = o.getName(); - if (name == otherName) { - return 0; - } - if (name == null) { - return -1; - } - if (otherName == null) { - return 1; - } - return name.compareTo(otherName); - } -} Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -22,10 +22,10 @@ */ public interface IImportProjectExample { - boolean importProject(Project projectDescription, File file, + boolean importProject(ProjectExample projectDescription, File file, IProgressMonitor monitor) throws Exception; - void fix(Project project, IProgressMonitor monitor); + void fix(ProjectExample project, IProgressMonitor monitor); void setName(String name); Deleted: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -1,304 +0,0 @@ -/************************************************************************************* - * Copyright (c) 2008-2011 Red Hat, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * JBoss by Red Hat - Initial implementation. - ************************************************************************************/ -package org.jboss.tools.project.examples.model; - -import java.io.File; -import java.math.BigDecimal; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.jboss.tools.project.examples.ProjectExamplesActivator; - -/** - * @author snjeza - * - */ -public class Project implements ProjectModelElement { - - private static final String SEP = "/"; //$NON-NLS-1$ - private static String[] PREFIXES = { "file:" , "http:", "https:" , "ftp:" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - private String name; - private String shortDescription; - private String description; - private String url; - private long size; - private Category category; - private List<String> includedProjects; - private boolean welcome; - private String type; - private String welcomeURL; - private List<ProjectFix> fixes = new ArrayList<ProjectFix>(); - private List<ProjectFix> unsatisfiedFixes; - private String perspectiveId; - private String importType; - private String importTypeDescription; - private ArchetypeModel archetypeModel = new ArchetypeModel(); - private File file; - private IProjectExampleSite site; - private String defaultProfiles =""; //$NON-NLS-1$ - private Set<String> tags; - private String iconPath; - - public Project() { - name=""; //$NON-NLS-1$ - shortDescription=""; //$NON-NLS-1$ - description=""; //$NON-NLS-1$ - url=""; //$NON-NLS-1$ - welcome=false; - perspectiveId = null; - importType = null; - setCategory(Category.OTHER); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getShortDescription() { - return shortDescription; - } - - public void setShortDescription(String shortDescription) { - this.shortDescription = shortDescription; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUrl() { - if (url == null) { - return url; - } - url = url.trim(); - for (String prefix:PREFIXES) { - if (url.startsWith(prefix)) { - return url; - } - } - if (site == null) { - return url; - } - URL siteURL = site.getUrl(); - if (siteURL == null) { - return url; - } - String urlString = siteURL.toString(); - if (urlString.endsWith(SEP)) { - urlString = urlString.substring(0, urlString.length() - 1); - } else { - int index = urlString.lastIndexOf(SEP); - if (index > 0) { - urlString = urlString.substring(0, index); - } - } - if (url.startsWith(SEP)) { - return urlString + url; - } - return urlString + SEP + url; - } - - public void setUrl(String url) { - this.url = url; - } - - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public String getSizeAsText() { - String sizeString = ""; //$NON-NLS-1$ - BigDecimal sizeDecimal = new BigDecimal(size); - BigDecimal MB = new BigDecimal(1024*1024); - BigDecimal KB = new BigDecimal(1024); - if (sizeDecimal.compareTo(MB) > 0) { - sizeString = String.format("%5.2fM", sizeDecimal.divide(MB)); //$NON-NLS-1$ - } else if (sizeDecimal.compareTo(KB) > 0) { - sizeString = String.format("%5.2fK", sizeDecimal.divide(KB)); //$NON-NLS-1$ - } else { - sizeString = String.format("%d", size); //$NON-NLS-1$ - } - return sizeString; - } - - public List<String> getIncludedProjects() { - return includedProjects; - } - - public void setIncludedProjects(List<String> includedProjects) { - this.includedProjects = includedProjects; - } - - public boolean isWelcome() { - return welcome; - } - - public void setWelcome(boolean welcome) { - this.welcome = welcome; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getWelcomeURL() { - return welcomeURL; - } - - public void setWelcomeURL(String welcomeURL) { - this.welcomeURL = welcomeURL; - } - - public IProjectExampleSite getSite() { - /*if (site == null) { - if (getUrl().startsWith("http://anonsvn.jboss.org")) { //$NON-NLS-1$ - site = Messages.Project_JBoss_Tools_Team_from_jboss_org; - } else if (getUrl().startsWith("file:")) { //$NON-NLS-1$ - site = Messages.Project_Local; - } else { - site = Messages.Project_Unknown; - } - }*/ - return site; - } - - public void setSite(IProjectExampleSite site) { - this.site = site; - } - - public List<ProjectFix> getFixes() { - return fixes; - } - - public void setFixes(List<ProjectFix> fixes) { - this.fixes = fixes; - } - - public List<ProjectFix> getUnsatisfiedFixes() { - return unsatisfiedFixes; - } - - public void setUnsatisfiedFixes(List<ProjectFix> unsatisfiedFixes) { - this.unsatisfiedFixes = unsatisfiedFixes; - } - - public String getPerspectiveId() { - return perspectiveId; - } - - public void setPerspectiveId(String perspectiveId) { - this.perspectiveId = perspectiveId; - } - - public String getImportType() { - return importType; - } - - public void setImportType(String importType) { - this.importType = importType; - } - - public String getImportTypeDescription() { - return importTypeDescription; - } - - public void setImportTypeDescription(String importTypeDescription) { - this.importTypeDescription = importTypeDescription; - } - - public ArchetypeModel getArchetypeModel() { - return archetypeModel; - } - - public boolean isURLRequired() { - return !ProjectExamplesActivator.MAVEN_ARCHETYPE.equals(importType); - } - - public File getFile() { - return file; - } - - public void setFile(File file) { - this.file = file; - } - - public String getDefaultProfiles() { - return defaultProfiles; - } - - public void setDefaultProfiles(String defaultProfiles) { - this.defaultProfiles = defaultProfiles; - } - - @Override - public String toString() { - return getName(); - } - - public void setTags(Set<String> tags) { - this.tags = tags; - } - - public Set<String> getTags() { - if (tags == null) { - tags = new HashSet<String>(); - } - return tags; - } - - public boolean hasTags(String ... tags) { - if (!getTags().isEmpty() - && tags != null && tags.length > 0) { - for (String tag : tags) { - if (!getTags().contains(tag)) { - return false; - } - } - return true; - } - return false; - } - - public void setIconPath(String path) { - this.iconPath = path; - } - - public String getIconPath() { - return iconPath; - } -} Copied: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java (from rev 37935, trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java) =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,337 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.project.examples.model; + +import java.io.File; +import java.math.BigDecimal; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.jboss.tools.project.examples.ProjectExamplesActivator; + +/** + * @author snjeza + * + */ +public class ProjectExample implements ProjectModelElement, + Comparable<ProjectExample> { + + private static final String SEP = "/"; //$NON-NLS-1$ + private static String[] PREFIXES = { "file:", "http:", "https:", "ftp:" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + private String name; + private String shortDescription; + private String description; + private String url; + private long size; + private ProjectExampleCategory category; + private List<String> includedProjects; + private boolean welcome; + private String type; + private String welcomeURL; + private List<ProjectFix> fixes = new ArrayList<ProjectFix>(); + private List<ProjectFix> unsatisfiedFixes; + private String perspectiveId; + private String importType; + private String importTypeDescription; + private ArchetypeModel archetypeModel = new ArchetypeModel(); + private File file; + private IProjectExampleSite site; + private String defaultProfiles = ""; //$NON-NLS-1$ + private int priority; + private Set<String> tags; + private String iconPath; + + public ProjectExample() { + name = ""; //$NON-NLS-1$ + shortDescription = ""; //$NON-NLS-1$ + description = ""; //$NON-NLS-1$ + url = ""; //$NON-NLS-1$ + welcome = false; + perspectiveId = null; + importType = null; + setCategory(ProjectExampleCategory.OTHER); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getShortDescription() { + return shortDescription; + } + + public void setShortDescription(String shortDescription) { + this.shortDescription = shortDescription; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getUrl() { + if (url == null) { + return url; + } + url = url.trim(); + for (String prefix : PREFIXES) { + if (url.startsWith(prefix)) { + return url; + } + } + if (site == null) { + return url; + } + URL siteURL = site.getUrl(); + if (siteURL == null) { + return url; + } + String urlString = siteURL.toString(); + if (urlString.endsWith(SEP)) { + urlString = urlString.substring(0, urlString.length() - 1); + } else { + int index = urlString.lastIndexOf(SEP); + if (index > 0) { + urlString = urlString.substring(0, index); + } + } + if (url.startsWith(SEP)) { + return urlString + url; + } + return urlString + SEP + url; + } + + public void setUrl(String url) { + this.url = url; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public ProjectExampleCategory getCategory() { + return category; + } + + public void setCategory(ProjectExampleCategory category) { + this.category = category; + } + + public String getSizeAsText() { + String sizeString = ""; //$NON-NLS-1$ + BigDecimal sizeDecimal = new BigDecimal(size); + BigDecimal MB = new BigDecimal(1024 * 1024); + BigDecimal KB = new BigDecimal(1024); + if (sizeDecimal.compareTo(MB) > 0) { + sizeString = String.format("%5.2fM", sizeDecimal.divide(MB)); //$NON-NLS-1$ + } else if (sizeDecimal.compareTo(KB) > 0) { + sizeString = String.format("%5.2fK", sizeDecimal.divide(KB)); //$NON-NLS-1$ + } else { + sizeString = String.format("%d", size); //$NON-NLS-1$ + } + return sizeString; + } + + public List<String> getIncludedProjects() { + return includedProjects; + } + + public void setIncludedProjects(List<String> includedProjects) { + this.includedProjects = includedProjects; + } + + public boolean isWelcome() { + return welcome; + } + + public void setWelcome(boolean welcome) { + this.welcome = welcome; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getWelcomeURL() { + return welcomeURL; + } + + public void setWelcomeURL(String welcomeURL) { + this.welcomeURL = welcomeURL; + } + + public IProjectExampleSite getSite() { + /* + * if (site == null) { if + * (getUrl().startsWith("http://anonsvn.jboss.org")) { //$NON-NLS-1$ + * site = Messages.Project_JBoss_Tools_Team_from_jboss_org; } else if + * (getUrl().startsWith("file:")) { //$NON-NLS-1$ site = + * Messages.Project_Local; } else { site = Messages.Project_Unknown; } } + */ + return site; + } + + public void setSite(IProjectExampleSite site) { + this.site = site; + } + + public List<ProjectFix> getFixes() { + return fixes; + } + + public void setFixes(List<ProjectFix> fixes) { + this.fixes = fixes; + } + + public List<ProjectFix> getUnsatisfiedFixes() { + return unsatisfiedFixes; + } + + public void setUnsatisfiedFixes(List<ProjectFix> unsatisfiedFixes) { + this.unsatisfiedFixes = unsatisfiedFixes; + } + + public String getPerspectiveId() { + return perspectiveId; + } + + public void setPerspectiveId(String perspectiveId) { + this.perspectiveId = perspectiveId; + } + + public String getImportType() { + return importType; + } + + public void setImportType(String importType) { + this.importType = importType; + } + + public String getImportTypeDescription() { + return importTypeDescription; + } + + public void setImportTypeDescription(String importTypeDescription) { + this.importTypeDescription = importTypeDescription; + } + + public ArchetypeModel getArchetypeModel() { + return archetypeModel; + } + + public boolean isURLRequired() { + return !ProjectExamplesActivator.MAVEN_ARCHETYPE.equals(importType); + } + + public File getFile() { + return file; + } + + public void setFile(File file) { + this.file = file; + } + + public String getDefaultProfiles() { + return defaultProfiles; + } + + public void setDefaultProfiles(String defaultProfiles) { + this.defaultProfiles = defaultProfiles; + } + + @Override + public String toString() { + return getName(); + } + + public void setTags(Set<String> tags) { + this.tags = tags; + } + + public Set<String> getTags() { + if (tags == null) { + tags = new HashSet<String>(); + } + return tags; + } + + public boolean hasTags(String... tags) { + if (!getTags().isEmpty() && tags != null && tags.length > 0) { + for (String tag : tags) { + if (!getTags().contains(tag)) { + return false; + } + } + return true; + } + return false; + } + + public void setIconPath(String path) { + this.iconPath = path; + } + + public String getIconPath() { + return iconPath; + } + + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + this.priority = priority; + } + + @Override + public int compareTo(ProjectExample o) { + if (o == null) { + return -1; + } + ProjectExampleCategory otherCategory = o.getCategory(); + if (otherCategory == null && this.category == null) { + return 0; + } + if (this.category != null) { + if (this.category.compareTo(otherCategory) != 0) { + return this.category.compareTo(otherCategory); + } + int other = o.getPriority(); + if (other < this.priority) + return 1; + else if (other > this.priority) + return -1; + if (name == null) { + return -1; + } + return name.compareTo(o.getName()); + } + return -1; + } +} Copied: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleCategory.java (from rev 37935, trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Category.java) =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleCategory.java (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleCategory.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,133 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.project.examples.model; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.project.examples.Messages; + +/** + * @author snjeza + * + */ +public class ProjectExampleCategory implements ProjectModelElement, Comparable<ProjectExampleCategory> { + + private String name; + private List<ProjectExample> projects = new ArrayList<ProjectExample>(); + private IProjectExampleSite site; + private String description; + private int priority; + public static ProjectExampleCategory OTHER = new ProjectExampleCategory(Messages.Category_Other); + + public ProjectExampleCategory(String name) { + super(); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List<ProjectExample> getProjects() { + return projects; + } + + public void setProjects(List<ProjectExample> projects) { + this.projects = projects; + } + + public String getDescription() { + return description; + } + + public String getShortDescription() { + return getName(); + } + + public IProjectExampleSite getSite() { + return site; + } + + @Override + public void setSite(IProjectExampleSite site) { + this.site = site; + } + + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + this.priority = priority; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((site == null) ? 0 : site.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ProjectExampleCategory other = (ProjectExampleCategory) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (site == null) { + if (other.site != null) + return false; + } else if (!site.equals(other.site)) + return false; + return true; + } + + @Override + public int compareTo(ProjectExampleCategory o) { + if (o == null) + return 1; + int other = o.getPriority(); + if (other < this.priority) + return 1; + else if (other > this.priority) + return -1; + if (name == null) + return -1; + return name.compareTo(o.getName()); + } + + @Override + public String toString() { + return "ProjectExampleCategory [name=" + name + ", description=" //$NON-NLS-1$ //$NON-NLS-2$ + + description + ", site=" + site + ", priority=" + priority //$NON-NLS-1$//$NON-NLS-2$ + + "]"; //$NON-NLS-1$ + } + +} Copied: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java (from rev 38378, trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java) =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -0,0 +1,798 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.project.examples.model; + +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.project.examples.Messages; +import org.jboss.tools.project.examples.ProjectExamplesActivator; +import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.helpers.DefaultHandler; + +/** + * @author snjeza + * + */ +public class ProjectExampleUtil { + + private static final String URL = "url"; //$NON-NLS-1$ + + private static final String NAME = "name"; //$NON-NLS-1$ + + private static final String SITES = "sites"; //$NON-NLS-1$ + + private static final String SITE = "site"; //$NON-NLS-1$ + + public static final String EDITOR = "editor"; //$NON-NLS-1$ + + public static final String CHEATSHEETS = "cheatsheets"; //$NON-NLS-1$ + + public static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$ + + public static final String PROTOCOL_PLATFORM = "platform"; //$NON-NLS-1$ + + private static final String PROJECT_EXAMPLES_XML_EXTENSION_ID = "org.jboss.tools.project.examples.projectExamplesXml"; //$NON-NLS-1$ + + private static final String PROJECT_EXAMPLES_CATEGORIES_EXTENSION_ID = "org.jboss.tools.project.examples.categories"; //$NON-NLS-1$ + + private static String URL_EXT = URL; + + private static String EXPERIMENTAL_EXT = "experimental"; //$NON-NLS-1$ + + private static Set<IProjectExampleSite> pluginSites; + + private static HashSet<IProjectExampleSite> invalidSites = new HashSet<IProjectExampleSite>(); + + private static HashSet<URL> categoryUrls; + + private ProjectExampleUtil() { + } + + public static Set<IProjectExampleSite> getPluginSites() { + if (pluginSites == null) { + pluginSites = new HashSet<IProjectExampleSite>(); + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IExtensionPoint extensionPoint = registry + .getExtensionPoint(PROJECT_EXAMPLES_XML_EXTENSION_ID); + IExtension[] extensions = extensionPoint.getExtensions(); + for (int i = 0; i < extensions.length; i++) { + IExtension extension = extensions[i]; + IConfigurationElement[] configurationElements = extension + .getConfigurationElements(); + IProjectExampleSite site = new ProjectExampleSite(); + site.setName(extension.getLabel()); + for (int j = 0; j < configurationElements.length; j++) { + IConfigurationElement configurationElement = configurationElements[j]; + if (URL_EXT.equals(configurationElement.getName())) { + String urlString = configurationElement.getValue(); + URL url = getURL(urlString); + if (url != null) { + site.setUrl(url); + } + } else if (EXPERIMENTAL_EXT.equals(configurationElement + .getName())) { + String experimental = configurationElement.getValue(); + if ("true".equals(experimental)) { //$NON-NLS-1$ + site.setExperimental(true); + } + } + } + if (site.getUrl() != null) { + pluginSites.add(site); + } + } + + } + return pluginSites; + } + + public static Set<IProjectExampleSite> getUserSites() { + Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); + ProjectExampleSite site = getSite(getProjectExamplesXml()); + if (site != null) { + sites.add(site); + } + IPreferenceStore store = ProjectExamplesActivator.getDefault() + .getPreferenceStore(); + String sitesAsXml = store + .getString(ProjectExamplesActivator.USER_SITES); + if (sitesAsXml != null && sitesAsXml.trim().length() > 0) { + Element rootElement = parseDocument(sitesAsXml); + if (!rootElement.getNodeName().equals(SITES)) { + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_preferences); + return sites; + } + NodeList list = rootElement.getChildNodes(); + int length = list.getLength(); + for (int i = 0; i < length; ++i) { + Node node = list.item(i); + short type = node.getNodeType(); + if (type == Node.ELEMENT_NODE) { + Element entry = (Element) node; + if (entry.getNodeName().equals(SITE)) { + String name = entry.getAttribute(NAME); + String urlString = entry.getAttribute(URL); + if (name != null && name.trim().length() > 0 + && urlString != null + && urlString.trim().length() > 0) { + URL url = null; + try { + url = new URL(urlString); + } catch (MalformedURLException e) { + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_preferences); + continue; + } + site = new ProjectExampleSite(); + site.setName(name); + site.setUrl(url); + site.setExperimental(true); + site.setEditable(true); + sites.add(site); + } + } + } + } + } + return sites; + } + + private static Set<IProjectExampleSite> getSites() { + Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); + sites.addAll(getPluginSites()); + sites.addAll(getUserSites()); + return sites; + } + + private static ProjectExampleSite getSite(String url) { + if (url != null) { + ProjectExampleSite site = new ProjectExampleSite(); + try { + site.setUrl(new URL(url)); + } catch (MalformedURLException e) { + ProjectExamplesActivator.log(e); + return null; + } + site.setExperimental(true); + site.setName(Messages.ProjectUtil_Test); + return site; + } + return null; + } + + private static URL getURL(String urlString) { + if (urlString != null && urlString.trim().length() > 0) { + urlString = urlString.trim(); + try { + URL url = new URL(urlString); + return url; + } catch (MalformedURLException e) { + ProjectExamplesActivator.log(e); + } + } + return null; + } + + public static List<ProjectExampleCategory> getProjects( + IProgressMonitor monitor) { + return getProjects(getSites(), monitor); + } + + public static List<ProjectExampleCategory> getProjects( + Set<IProjectExampleSite> sites, IProgressMonitor monitor) { + monitor.setTaskName(Messages.ProjectUtil_Parsing_project_description_files); + + List<ProjectExampleCategory> list = new ArrayList<ProjectExampleCategory>(); + invalidSites.clear(); + ProjectExampleCategory other = ProjectExampleCategory.OTHER; + try { + boolean showExperimentalSites = ProjectExamplesActivator + .getDefault() + .getPreferenceStore() + .getBoolean( + ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES); + for (IProjectExampleSite site : sites) { + if (!showExperimentalSites && site.isExperimental()) { + continue; + } + if (monitor.isCanceled()) { + invalidSites.add(site); + continue; + } + File file = getProjectExamplesFile(site.getUrl(), + "projectExamples", ".xml", monitor); //$NON-NLS-1$ //$NON-NLS-2$ + if (monitor.isCanceled()) { + invalidSites.add(site); + continue; + } + if (file == null || !file.exists() || !file.isFile()) { + ProjectExamplesActivator.log(NLS.bind( + Messages.ProjectUtil_Invalid_URL, site.getUrl() + .toString())); + invalidSites.add(site); + continue; + } + + DocumentBuilderFactory dbf = DocumentBuilderFactory + .newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document doc = db.parse(file); + NodeList projects = doc.getElementsByTagName("project"); //$NON-NLS-1$ + int len = projects.getLength(); + for (int i = 0; i < len; i++) { + Node node = projects.item(i); + ProjectExample project = new ProjectExample(); + project.setSite(site); + ProjectExampleCategory category = other; + if (node.getNodeType() == Node.ELEMENT_NODE) { + Element element = (Element) node; + NodeList children = element.getChildNodes(); + int cLen = children.getLength(); + for (int j = 0; j < cLen; j++) { + Node cNode = children.item(j); + if (cNode.getNodeType() == Node.ELEMENT_NODE) { + Element child = (Element) cNode; + String nodeName = child.getNodeName(); + if (nodeName.equals("fixes")) { //$NON-NLS-1$ + parseFixes(project, child); + } + + else if (nodeName.equals("category")) { //$NON-NLS-1$ + String value = getContent(child); + boolean found = false; + for (ProjectExampleCategory cat : list) { + if (cat.getSite() == null) { + cat.setSite(site); + } + if (cat.getName().equals(value) + && site.getName() + .equals(cat.getSite() + .getName())) { + category = cat; + found = true; + break; + } + } + if (!found) { + category = new ProjectExampleCategory( + value); + category.setSite(site); + list.add(category); + } + project.setCategory(category); + category.getProjects().add(project); + } else if (nodeName.equals(NAME)) { + project.setName(getContent(child)); + } else if (nodeName.equals("priority")) { //$NON-NLS-1$ + String value = getContent(child); + if (value != null) { + try { + project.setPriority(new Integer( + value).intValue()); + } catch (Exception e) { + ProjectExamplesActivator.log(e); + } + } + } else if (nodeName.equals("shortDescription")) { //$NON-NLS-1$ + project.setShortDescription(getContent(child)); + } else if (nodeName.equals("description")) { //$NON-NLS-1$ + project.setDescription(getContent(child)); + } else if (nodeName.equals(URL)) { + project.setUrl(getContent(child)); + } else if (nodeName.equals("perspectiveId")) { //$NON-NLS-1$ + project.setPerspectiveId(getContent(child)); + } else if (nodeName.equals("importType")) { //$NON-NLS-1$ + project.setImportType(getContent(child)); + } else if (nodeName + .equals("importTypeDescription")) { //$NON-NLS-1$ + project.setImportTypeDescription(getContent(child)); + } else if (nodeName.equals("size")) { //$NON-NLS-1$ + long size = 0; + try { + size = new Long(getContent(child)); + } catch (Exception ignored) { + } + project.setSize(size); + } else if (nodeName.equals("included-projects")) { //$NON-NLS-1$ + String includedProjects = getContent(child); + if (includedProjects != null) { + includedProjects = includedProjects + .trim(); + StringTokenizer tokenizer = new StringTokenizer( + includedProjects, ","); //$NON-NLS-1$ + List<String> projectList = new ArrayList<String>(); + while (tokenizer.hasMoreTokens()) { + projectList.add(tokenizer + .nextToken().trim()); + } + project.setIncludedProjects(projectList); + } + } else if (nodeName + .equals("defaultMavenProfiles")) { //$NON-NLS-1$ + project.setDefaultProfiles(getContent(child)); + } else if (nodeName.equals("welcome")) { //$NON-NLS-1$ + project.setWelcome(true); + String attribute = child + .getAttribute("type"); //$NON-NLS-1$ + if (attribute != null + && CHEATSHEETS.equals(attribute + .trim())) { + project.setType(attribute.trim()); + } else { + project.setType(EDITOR); + } + attribute = child.getAttribute(URL); + if (attribute == null + || attribute.trim().length() <= 0) { + project.setWelcome(false); + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_welcome_element); + } else { + project.setWelcomeURL(attribute.trim()); + } + } else if (nodeName.equals("mavenArchetype")) { //$NON-NLS-1$ + parseMavenArchetype(project, child); + } else if (nodeName.equals("tags")) { //$NON-NLS-1$ + parseTags(project, child); + } else if (nodeName.equals("icon")) { //$NON-NLS-1$ + String path = child.getAttribute("path"); //$NON-NLS-1$ + if (path != null) { + project.setIconPath(path); + } + } + } + } + } + } + } + } catch (Exception e) { + ProjectExamplesActivator.log(e); + } + list.add(other); + handleCategories(list, monitor); + return list; + } + + public static Set<URL> getCategoryURLs() { + if (categoryUrls == null) { + categoryUrls = new HashSet<URL>(); + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IExtensionPoint extensionPoint = registry + .getExtensionPoint(PROJECT_EXAMPLES_CATEGORIES_EXTENSION_ID); + IExtension[] extensions = extensionPoint.getExtensions(); + for (int i = 0; i < extensions.length; i++) { + IExtension extension = extensions[i]; + IConfigurationElement[] configurationElements = extension + .getConfigurationElements(); + + for (int j = 0; j < configurationElements.length; j++) { + IConfigurationElement configurationElement = configurationElements[j]; + if (URL_EXT.equals(configurationElement.getName())) { + String urlString = configurationElement.getValue(); + URL url = getURL(urlString); + if (url != null) { + categoryUrls.add(url); + } + } + } + } + + } + return categoryUrls; + } + + private static void handleCategories(List<ProjectExampleCategory> list, IProgressMonitor monitor) { + Set<URL> urls = getCategoryURLs(); + for (URL url:urls) { + File file = getProjectExamplesFile(url, + "categories", ".xml", monitor); //$NON-NLS-1$ //$NON-NLS-2$ + if (monitor.isCanceled()) { + return; + } + if (file == null || !file.exists() || !file.isFile()) { + ProjectExamplesActivator.log(NLS.bind( + Messages.ProjectUtil_Invalid_URL, url + .toString())); + continue; + } + + DocumentBuilderFactory dbf = DocumentBuilderFactory + .newInstance(); + Document doc; + try { + DocumentBuilder db = dbf.newDocumentBuilder(); + doc = db.parse(file); + } catch (Exception e1) { + ProjectExamplesActivator.log(e1.getMessage()); + continue; + } + NodeList categoryNodes = doc.getElementsByTagName("category"); //$NON-NLS-1$ + int len = categoryNodes.getLength(); + for (int i = 0; i < len; i++) { + Node node = categoryNodes.item(i); + NamedNodeMap attributes = node.getAttributes(); + if (attributes == null) { + continue; + } + String name = getAttributeValue(attributes, NAME); + if (name == null) { + continue; + } + String description = getAttributeValue(attributes, "description"); //$NON-NLS-1$ + int priority = 0; + try { + priority = new Integer(getAttributeValue(attributes, "priority")).intValue(); //$NON-NLS-1$ + } catch (Exception e) { + ProjectExamplesActivator.log(e); + } + if (description != null || priority > 0) { + for (ProjectExampleCategory projectExampleCategory:list) { + if (name.equals(projectExampleCategory.getName())) { + projectExampleCategory.setDescription(description); + projectExampleCategory.setPriority(priority); + continue; + } + } + } + } + } + } + + private static String getAttributeValue(NamedNodeMap attributes, String name) { + String value = null; + Node node = attributes.getNamedItem(name); + if (node != null) { + value = node.getNodeValue(); + } + return value; + } + + private static void parseTags(ProjectExample project, Element tagElement) { + String tagsValue = tagElement.getTextContent(); + if (tagsValue != null) { + StringTokenizer tokenizer = new StringTokenizer(tagsValue.trim(), + ",");//$NON-NLS-1$ + Set<String> tags = new HashSet<String>(); + while (tokenizer.hasMoreTokens()) { + String tag = tokenizer.nextToken().trim(); + if (tag.length() > 0) { + tags.add(tag); + } + } + project.setTags(tags); + } + } + + private static void parseFixes(ProjectExample project, Element node) { + NodeList children = node.getChildNodes(); + int cLen = children.getLength(); + for (int i = 0; i < cLen; i++) { + Node cNode = children.item(i); + if (cNode.getNodeType() == Node.ELEMENT_NODE) { + Element child = (Element) cNode; + String nodeName = child.getNodeName(); + if (nodeName.equals("fix")) { //$NON-NLS-1$ + parseFix(project, child); + } + } + } + } + + private static void parseMavenArchetype(ProjectExample project, Element node) { + NodeList children = node.getChildNodes(); + int cLen = children.getLength(); + ArchetypeModel archetypeModel = project.getArchetypeModel(); + for (int i = 0; i < cLen; i++) { + Node cNode = children.item(i); + if (cNode.getNodeType() == Node.ELEMENT_NODE) { + Element child = (Element) cNode; + String nodeName = child.getNodeName(); + if (nodeName.equals("archetypeGroupId")) { //$NON-NLS-1$ + archetypeModel.setArchetypeGroupId(getContent(child)); + } else if (nodeName.equals("archetypeArtifactId")) { //$NON-NLS-1$ + archetypeModel.setArchetypeArtifactId(getContent(child)); + } else if (nodeName.equals("archetypeVersion")) { //$NON-NLS-1$ + archetypeModel.setArchetypeVersion(getContent(child)); + } else if (nodeName.equals("archetypeRepository")) { //$NON-NLS-1$ + archetypeModel.setArchetypeRepository(getContent(child)); + } else if (nodeName.equals("groupId")) { //$NON-NLS-1$ + archetypeModel.setGroupId(getContent(child)); + } else if (nodeName.equals("artifactId")) { //$NON-NLS-1$ + archetypeModel.setArtifactId(getContent(child)); + } else if (nodeName.equals("version")) { //$NON-NLS-1$ + archetypeModel.setVersion(getContent(child)); + } else if (nodeName.equals("javaPackage")) { //$NON-NLS-1$ + archetypeModel.setJavaPackage(getContent(child)); + } else if (nodeName.equals("properties")) { //$NON-NLS-1$ + parseProperties(project, child); + } + } + } + } + + private static void parseProperties(ProjectExample project, Element node) { + NodeList children = node.getChildNodes(); + int cLen = children.getLength(); + for (int i = 0; i < cLen; i++) { + Node cNode = children.item(i); + if (cNode.getNodeType() == Node.ELEMENT_NODE) { + Element child = (Element) cNode; + String nodeName = child.getNodeName(); + if (nodeName.equals("property")) { //$NON-NLS-1$ + String key = child.getAttribute("name"); //$NON-NLS-1$ + if (key == null || key.trim().length() <= 0) { + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_property); + return; + } + String value = child.getAttribute("value"); //$NON-NLS-1$ + if (value == null || value.trim().length() <= 0) { + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_property); + return; + } + project.getArchetypeModel().addProperty(key, value); + } + } + } + } + + private static void parseFix(ProjectExample project, Element node) { + String type = node.getAttribute("type"); //$NON-NLS-1$ + if (type == null || type.trim().length() <= 0) { + ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_fix); + return; + } + ProjectFix fix = new ProjectFix(); + fix.setType(type); + NodeList children = node.getChildNodes(); + int cLen = children.getLength(); + for (int i = 0; i < cLen; i++) { + Node cNode = children.item(i); + if (cNode.getNodeType() == Node.ELEMENT_NODE) { + Element child = (Element) cNode; + String nodeName = child.getNodeName(); + if (nodeName.equals("property")) { //$NON-NLS-1$ + String name = child.getAttribute("name"); //$NON-NLS-1$ + if (name == null || name.trim().length() <= 0) { + ProjectExamplesActivator + .log(Messages.ProjectUtil_Invalid_property); + return; + } + String value = getContent(child); + fix.getProperties().put(name, value); + } + } + } + project.getFixes().add(fix); + } + + private static String getProjectExamplesXml() { + String projectXML = System + .getProperty("org.jboss.tools.project.examples.xml"); //$NON-NLS-1$ + if (projectXML != null && projectXML.length() > 0) { + return projectXML; + } + return null; + } + + private static String getContent(Element child) { + String value = child.getTextContent(); + if (value == null) { + value = ""; //$NON-NLS-1$ + } + return value.trim(); + } + + public static File getProjectExamplesFile(URL url, String prefix, + String suffix, IProgressMonitor monitor) { + File file = null; + if (PROTOCOL_FILE.equals(url.getProtocol()) + || PROTOCOL_PLATFORM.equalsIgnoreCase(url.getProtocol())) { + try { + // assume all illegal characters have been properly encoded, so + // use URI class to unencode + file = new File(new URI(url.toExternalForm())); + } catch (Exception e) { + // URL contains unencoded characters + file = new File(url.getFile()); + } + if (!file.exists()) + return null; + } else { + try { + if (monitor.isCanceled()) { + return null; + } + long urlModified = -1; + file = getFile(url); + try { + urlModified = ECFExamplesTransport.getInstance() + .getLastModified(url); + } catch (CoreException e) { + if (file.exists()) { + return file; + } + } + if (urlModified == 0) { + if (file.exists()) { + return file; + } + } + if (file.exists()) { + long modified = file.lastModified(); + if (urlModified == modified) { + return file; + } + } + // file = File.createTempFile(prefix, suffix); + // file.deleteOnExit(); + file.getParentFile().mkdirs(); + if (monitor.isCanceled()) { + return null; + } + BufferedOutputStream destination = new BufferedOutputStream( + new FileOutputStream(file)); + if (monitor.isCanceled()) { + return null; + } + IStatus result = getTransport().download(prefix, + url.toExternalForm(), destination, monitor); + if (!result.isOK()) { + ProjectExamplesActivator.getDefault().getLog().log(result); + return null; + } else { + if (file.exists()) { + file.setLastModified(urlModified); + } + } + } catch (FileNotFoundException e) { + ProjectExamplesActivator.log(e); + return null; + } + } + return file; + } + + private static File getFile(java.net.URL url2) { + IPath location = ProjectExamplesActivator.getDefault() + .getStateLocation(); + File root = location.toFile(); + String urlFile = url2.getFile(); + File file = new File(root, urlFile); + return file; + } + + private static ECFExamplesTransport getTransport() { + return ECFExamplesTransport.getInstance(); + } + + public static Document getDocument() throws ParserConfigurationException { + DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = dfactory.newDocumentBuilder(); + Document doc = docBuilder.newDocument(); + return doc; + } + + public static String getAsXML(Set<IProjectExampleSite> sites) + throws ParserConfigurationException, TransformerException, + UnsupportedEncodingException { + if (sites == null || sites.size() == 0) { + return ""; //$NON-NLS-1$ + } + Document doc = getDocument(); + Element sitesElement = doc.createElement(SITES); + doc.appendChild(sitesElement); + for (IProjectExampleSite site : sites) { + Element siteElement = doc.createElement(SITE); + siteElement.setAttribute(NAME, site.getName()); + siteElement.setAttribute(URL, site.getUrl().toString()); + sitesElement.appendChild(siteElement); + } + ByteArrayOutputStream s = new ByteArrayOutputStream(); + TransformerFactory factory = TransformerFactory.newInstance(); + Transformer transformer = factory.newTransformer(); + transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ + DOMSource source = new DOMSource(doc); + StreamResult outputTarget = new StreamResult(s); + transformer.transform(source, outputTarget); + return s.toString("UTF8"); //$NON-NLS-1$ + } + + public static Element parseDocument(String document) { + Element root = null; + InputStream stream = null; + try { + DocumentBuilder parser = DocumentBuilderFactory.newInstance() + .newDocumentBuilder(); + parser.setErrorHandler(new DefaultHandler()); + stream = new ByteArrayInputStream(document.getBytes("UTF8")); //$NON-NLS-1$ + root = parser.parse(stream).getDocumentElement(); + } catch (Exception e) { + ProjectExamplesActivator.log(e); + } finally { + try { + if (stream != null) { + stream.close(); + } + } catch (IOException e) { + ProjectExamplesActivator.log(e); + } + } + return root; + } + + public static HashSet<IProjectExampleSite> getInvalidSites() { + return invalidSites; + } + + public static List<ProjectExample> getProjectsByTags( + Collection<ProjectExampleCategory> categories, String... tags) { + if (categories == null) { + return null; + } + List<ProjectExample> selection = new ArrayList<ProjectExample>(); + for (ProjectExampleCategory c : categories) { + for (ProjectExample p : c.getProjects()) { + if (p.hasTags(tags) && !selection.contains(p)) { + selection.add(p); + } + } + } + return selection; + } + +} Deleted: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -1,674 +0,0 @@ -/************************************************************************************* - * Copyright (c) 2008-2011 Red Hat, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * JBoss by Red Hat - Initial implementation. - ************************************************************************************/ -package org.jboss.tools.project.examples.model; - -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.osgi.util.NLS; -import org.jboss.tools.project.examples.Messages; -import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.helpers.DefaultHandler; - -/** - * @author snjeza - * - */ -public class ProjectUtil { - - private static final String URL = "url"; //$NON-NLS-1$ - - private static final String NAME = "name"; //$NON-NLS-1$ - - private static final String SITES = "sites"; //$NON-NLS-1$ - - private static final String SITE = "site"; //$NON-NLS-1$ - - public static final String EDITOR = "editor"; //$NON-NLS-1$ - - public static final String CHEATSHEETS = "cheatsheets"; //$NON-NLS-1$ - - public static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$ - - public static final String PROTOCOL_PLATFORM = "platform"; //$NON-NLS-1$ - - private static final String PROJECT_EXAMPLES_XML_EXTENSION_ID = "org.jboss.tools.project.examples.projectExamplesXml"; //$NON-NLS-1$ - - private static String URL_EXT = URL; - - private static String EXPERIMENTAL_EXT = "experimental"; //$NON-NLS-1$ - - private static Set<IProjectExampleSite> pluginSites; - - private static HashSet<IProjectExampleSite> invalidSites = new HashSet<IProjectExampleSite>(); - - private ProjectUtil() { - } - - public static Set<IProjectExampleSite> getPluginSites() { - if (pluginSites == null) { - pluginSites = new HashSet<IProjectExampleSite>(); - IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = registry - .getExtensionPoint(PROJECT_EXAMPLES_XML_EXTENSION_ID); - IExtension[] extensions = extensionPoint.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IExtension extension = extensions[i]; - IConfigurationElement[] configurationElements = extension - .getConfigurationElements(); - IProjectExampleSite site = new ProjectExampleSite(); - site.setName(extension.getLabel()); - for (int j = 0; j < configurationElements.length; j++) { - IConfigurationElement configurationElement = configurationElements[j]; - if (URL_EXT.equals(configurationElement.getName())) { - String urlString = configurationElement.getValue(); - URL url = getURL(urlString); - if (url != null) { - site.setUrl(url); - } - } else if (EXPERIMENTAL_EXT.equals(configurationElement.getName())) { - String experimental = configurationElement.getValue(); - if ("true".equals(experimental)) { //$NON-NLS-1$ - site.setExperimental(true); - } - } - } - if (site.getUrl() != null) { - pluginSites.add(site); - } - } - - } - return pluginSites; - } - - public static Set<IProjectExampleSite> getUserSites() { - Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); - ProjectExampleSite site = getSite(getProjectExamplesXml()); - if (site != null) { - sites.add(site); - } - IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore(); - String sitesAsXml = store.getString(ProjectExamplesActivator.USER_SITES); - if (sitesAsXml != null && sitesAsXml.trim().length() > 0) { - Element rootElement = parseDocument(sitesAsXml); - if (!rootElement.getNodeName().equals(SITES)) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_preferences); - return sites; - } - NodeList list = rootElement.getChildNodes(); - int length = list.getLength(); - for (int i = 0; i < length; ++i) { - Node node = list.item(i); - short type = node.getNodeType(); - if (type == Node.ELEMENT_NODE) { - Element entry = (Element) node; - if(entry.getNodeName().equals(SITE)){ - String name = entry.getAttribute(NAME); - String urlString = entry.getAttribute(URL); - if (name != null && name.trim().length() > 0 && urlString != null && urlString.trim().length() > 0) { - URL url = null; - try { - url = new URL(urlString); - } catch (MalformedURLException e) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_preferences); - continue; - } - site = new ProjectExampleSite(); - site.setName(name); - site.setUrl(url); - site.setExperimental(true); - site.setEditable(true); - sites.add(site); - } - } - } - } - } - return sites; - } - - private static Set<IProjectExampleSite> getSites() { - Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); - sites.addAll(getPluginSites()); - sites.addAll(getUserSites()); - return sites; - } - - private static ProjectExampleSite getSite(String url) { - if (url != null) { - ProjectExampleSite site = new ProjectExampleSite(); - try { - site.setUrl(new URL(url)); - } catch (MalformedURLException e) { - ProjectExamplesActivator.log(e); - return null; - } - site.setExperimental(true); - site.setName(Messages.ProjectUtil_Test); - return site; - } - return null; - } - - private static URL getURL(String urlString) { - if (urlString != null && urlString.trim().length() > 0) { - urlString = urlString.trim(); - try { - URL url = new URL(urlString); - return url; - } catch (MalformedURLException e) { - ProjectExamplesActivator.log(e); - } - } - return null; - } - - public static List<Category> getProjects(IProgressMonitor monitor) { - return getProjects(getSites(), monitor); - } - - public static List<Category> getProjects(Set<IProjectExampleSite> sites, IProgressMonitor monitor) { - monitor.setTaskName(Messages.ProjectUtil_Parsing_project_description_files); - - List<Category> list = new ArrayList<Category>(); - invalidSites.clear(); - Category other = Category.OTHER; - try { - boolean showExperimentalSites = ProjectExamplesActivator.getDefault().getPreferenceStore().getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES); - for (IProjectExampleSite site : sites) { - if (!showExperimentalSites && site.isExperimental()) { - continue; - } - if (monitor.isCanceled()) { - invalidSites.add(site); - continue; - } - File file = getProjectExamplesFile(site.getUrl(), - "projectExamples", ".xml", monitor); //$NON-NLS-1$ //$NON-NLS-2$ - if (monitor.isCanceled()) { - invalidSites.add(site); - continue; - } - if (file == null || !file.exists() || !file.isFile()) { - ProjectExamplesActivator.log(NLS.bind(Messages.ProjectUtil_Invalid_URL,site.getUrl().toString())); - invalidSites.add(site); - continue; - } - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document doc = db.parse(file); - NodeList projects = doc.getElementsByTagName("project"); //$NON-NLS-1$ - int len = projects.getLength(); - for (int i = 0; i < len; i++) { - Node node = projects.item(i); - Project project = new Project(); - project.setSite(site); - Category category = other; - if (node.getNodeType() == Node.ELEMENT_NODE) { - Element element = (Element) node; - NodeList children = element.getChildNodes(); - int cLen = children.getLength(); - for (int j = 0; j < cLen; j++) { - Node cNode = children.item(j); - if (cNode.getNodeType() == Node.ELEMENT_NODE) { - Element child = (Element) cNode; - String nodeName = child.getNodeName(); - if (nodeName.equals("fixes")) { //$NON-NLS-1$ - parseFixes(project, child); - } - - else if (nodeName.equals("category")) { //$NON-NLS-1$ - String value = getContent(child); - boolean found = false; - for (Category cat : list) { - if (cat.getSite() == null) { - cat.setSite(site); - } - if (cat.getName().equals(value) && site.getName().equals(cat.getSite().getName())) { - category = cat; - found = true; - break; - } - } - if (!found) { - category = new Category(value); - category.setSite(site); - list.add(category); - } - project.setCategory(category); - category.getProjects().add(project); - } - else if (nodeName.equals(NAME)) { - project.setName(getContent(child)); - } - else if (nodeName.equals("shortDescription")) { //$NON-NLS-1$ - project - .setShortDescription(getContent(child)); - } - else if (nodeName.equals("description")) { //$NON-NLS-1$ - project.setDescription(getContent(child)); - } - else if (nodeName.equals(URL)) { - project.setUrl(getContent(child)); - } - else if (nodeName.equals("perspectiveId")) { //$NON-NLS-1$ - project.setPerspectiveId(getContent(child)); - } - else if (nodeName.equals("importType")) { //$NON-NLS-1$ - project.setImportType(getContent(child)); - } - else if (nodeName.equals("importTypeDescription")) { //$NON-NLS-1$ - project.setImportTypeDescription(getContent(child)); - } - else if (nodeName.equals("size")) { //$NON-NLS-1$ - long size = 0; - try { - size = new Long(getContent(child)); - } catch (Exception ignored) { - } - project.setSize(size); - } - else if (nodeName.equals("included-projects")) { //$NON-NLS-1$ - String includedProjects = getContent(child); - if (includedProjects != null) { - includedProjects = includedProjects - .trim(); - StringTokenizer tokenizer = new StringTokenizer( - includedProjects, ","); //$NON-NLS-1$ - List<String> projectList = new ArrayList<String>(); - while (tokenizer.hasMoreTokens()) { - projectList.add(tokenizer.nextToken().trim()); - } - project.setIncludedProjects(projectList); - } - } - else if (nodeName.equals("defaultMavenProfiles")) { //$NON-NLS-1$ - project.setDefaultProfiles(getContent(child)); - } - else if (nodeName.equals("welcome")) { //$NON-NLS-1$ - project.setWelcome(true); - String attribute = child.getAttribute("type"); //$NON-NLS-1$ - if (attribute != null && CHEATSHEETS.equals(attribute.trim())) { - project.setType(attribute.trim()); - } else { - project.setType(EDITOR); - } - attribute = child.getAttribute(URL); - if (attribute == null || attribute.trim().length() <= 0) { - project.setWelcome(false); - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_welcome_element); - } else { - project.setWelcomeURL(attribute.trim()); - } - } - else if (nodeName.equals("mavenArchetype")) { //$NON-NLS-1$ - parseMavenArchetype(project, child); - } - else if (nodeName.equals("tags")) { //$NON-NLS-1$ - parseTags(project, child); - } - else if (nodeName.equals("icon")) { //$NON-NLS-1$ - String path = child.getAttribute("path"); - if (path != null) { - project.setIconPath(path); - } - } - } - } - } - } - } - } catch (Exception e) { - ProjectExamplesActivator.log(e); - } - list.add(other); - return list; - } - - private static void parseTags(Project project, Element tagElement) { - String tagsValue = tagElement.getTextContent(); - if (tagsValue != null) { - StringTokenizer tokenizer = new StringTokenizer(tagsValue.trim(), ",");//$NON-NLS-1$ - Set<String> tags = new HashSet<String>(); - while (tokenizer.hasMoreTokens()) { - String tag = tokenizer.nextToken().trim(); - if (tag.length() > 0) { - tags.add(tag); - } - } - project.setTags(tags); - } - } - - private static void parseFixes(Project project, Element node) { - NodeList children = node.getChildNodes(); - int cLen = children.getLength(); - for (int i = 0; i < cLen; i++) { - Node cNode = children.item(i); - if (cNode.getNodeType() == Node.ELEMENT_NODE) { - Element child = (Element) cNode; - String nodeName = child.getNodeName(); - if (nodeName.equals("fix")) { //$NON-NLS-1$ - parseFix(project, child); - } - } - } - } - - private static void parseMavenArchetype(Project project, Element node) { - NodeList children = node.getChildNodes(); - int cLen = children.getLength(); - ArchetypeModel archetypeModel = project.getArchetypeModel(); - for (int i = 0; i < cLen; i++) { - Node cNode = children.item(i); - if (cNode.getNodeType() == Node.ELEMENT_NODE) { - Element child = (Element) cNode; - String nodeName = child.getNodeName(); - if (nodeName.equals("archetypeGroupId")) { //$NON-NLS-1$ - archetypeModel.setArchetypeGroupId(getContent(child)); - } - else if (nodeName.equals("archetypeArtifactId")) { //$NON-NLS-1$ - archetypeModel.setArchetypeArtifactId(getContent(child)); - } - else if (nodeName.equals("archetypeVersion")) { //$NON-NLS-1$ - archetypeModel.setArchetypeVersion(getContent(child)); - } - else if (nodeName.equals("archetypeRepository")) { //$NON-NLS-1$ - archetypeModel.setArchetypeRepository(getContent(child)); - } - else if (nodeName.equals("groupId")) { //$NON-NLS-1$ - archetypeModel.setGroupId(getContent(child)); - } - else if (nodeName.equals("artifactId")) { //$NON-NLS-1$ - archetypeModel.setArtifactId(getContent(child)); - } - else if (nodeName.equals("version")) { //$NON-NLS-1$ - archetypeModel.setVersion(getContent(child)); - } - else if (nodeName.equals("javaPackage")) { //$NON-NLS-1$ - archetypeModel.setJavaPackage(getContent(child)); - } - else if (nodeName.equals("properties")) { //$NON-NLS-1$ - parseProperties(project, child); - } - } - } - } - - private static void parseProperties(Project project, Element node) { - NodeList children = node.getChildNodes(); - int cLen = children.getLength(); - for (int i = 0; i < cLen; i++) { - Node cNode = children.item(i); - if (cNode.getNodeType() == Node.ELEMENT_NODE) { - Element child = (Element) cNode; - String nodeName = child.getNodeName(); - if (nodeName.equals("property")) { //$NON-NLS-1$ - String key = child.getAttribute("name"); //$NON-NLS-1$ - if (key == null || key.trim().length() <= 0) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_property); - return; - } - String value = child.getAttribute("value"); //$NON-NLS-1$ - if (value == null || value.trim().length() <= 0) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_property); - return; - } - project.getArchetypeModel().addProperty(key, value); - } - } - } - } - - private static void parseFix(Project project, Element node) { - String type = node.getAttribute("type"); //$NON-NLS-1$ - if (type == null || type.trim().length() <= 0) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_fix); - return; - } - ProjectFix fix = new ProjectFix(); - fix.setType(type); - NodeList children = node.getChildNodes(); - int cLen = children.getLength(); - for (int i = 0; i < cLen; i++) { - Node cNode = children.item(i); - if (cNode.getNodeType() == Node.ELEMENT_NODE) { - Element child = (Element) cNode; - String nodeName = child.getNodeName(); - if (nodeName.equals("property")) { //$NON-NLS-1$ - String name = child.getAttribute("name"); //$NON-NLS-1$ - if (name == null || name.trim().length() <= 0) { - ProjectExamplesActivator.log(Messages.ProjectUtil_Invalid_property); - return; - } - String value = getContent(child); - fix.getProperties().put(name, value); - } - } - } - project.getFixes().add(fix); - } - - private static String getProjectExamplesXml() { - String projectXML = System.getProperty("org.jboss.tools.project.examples.xml"); //$NON-NLS-1$ - if (projectXML != null && projectXML.length() > 0) { - return projectXML; - } - return null; - } - - private static String getContent(Element child) { - String value = child.getTextContent(); - if (value == null) { - value = ""; //$NON-NLS-1$ - } - return value.trim(); - } - - public static File getProjectExamplesFile(URL url, String prefix, - String suffix, IProgressMonitor monitor) { - File file = null; - if (PROTOCOL_FILE.equals(url.getProtocol()) || PROTOCOL_PLATFORM.equalsIgnoreCase(url.getProtocol())) { - try { - // assume all illegal characters have been properly encoded, so - // use URI class to unencode - file = new File(new URI(url.toExternalForm())); - } catch (Exception e) { - // URL contains unencoded characters - file = new File(url.getFile()); - } - if (!file.exists()) - return null; - } else { - try { - if (monitor.isCanceled()) { - return null; - } - long urlModified = -1; - file = getFile(url); - try { - urlModified = ECFExamplesTransport.getInstance().getLastModified(url); - } catch (CoreException e) { - if (file.exists()) { - return file; - } - } - if (urlModified == 0) { - if (file.exists()) { - return file; - } - } - if (file.exists()) { - long modified = file.lastModified(); - if (urlModified == modified) { - return file; - } - } - //file = File.createTempFile(prefix, suffix); - //file.deleteOnExit(); - file.getParentFile().mkdirs(); - if (monitor.isCanceled()) { - return null; - } - BufferedOutputStream destination = new BufferedOutputStream( - new FileOutputStream(file)); - if (monitor.isCanceled()) { - return null; - } - IStatus result = getTransport().download(prefix, - url.toExternalForm(), destination, monitor); - if (!result.isOK()) { - ProjectExamplesActivator.getDefault().getLog().log(result); - return null; - } else { - if (file.exists()) { - file.setLastModified(urlModified); - } - } - } catch (FileNotFoundException e) { - ProjectExamplesActivator.log(e); - return null; - } - } - return file; - } - - private static File getFile(java.net.URL url2) { - IPath location = ProjectExamplesActivator.getDefault().getStateLocation(); - File root = location.toFile(); - String urlFile = url2.getFile(); - File file = new File(root, urlFile); - return file; - } - - private static ECFExamplesTransport getTransport() { - return ECFExamplesTransport.getInstance(); - } - - public static Document getDocument() throws ParserConfigurationException { - DocumentBuilderFactory dfactory= DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder= dfactory.newDocumentBuilder(); - Document doc= docBuilder.newDocument(); - return doc; - } - - public static String getAsXML(Set<IProjectExampleSite> sites) - throws ParserConfigurationException, TransformerException, - UnsupportedEncodingException { - if (sites == null || sites.size() == 0) { - return ""; //$NON-NLS-1$ - } - Document doc = getDocument(); - Element sitesElement = doc.createElement(SITES); - doc.appendChild(sitesElement); - for (IProjectExampleSite site : sites) { - Element siteElement = doc.createElement(SITE); - siteElement.setAttribute(NAME, site.getName()); - siteElement.setAttribute(URL, site.getUrl().toString()); - sitesElement.appendChild(siteElement); - } - ByteArrayOutputStream s = new ByteArrayOutputStream(); - TransformerFactory factory = TransformerFactory.newInstance(); - Transformer transformer = factory.newTransformer(); - transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$ - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ - DOMSource source = new DOMSource(doc); - StreamResult outputTarget = new StreamResult(s); - transformer.transform(source, outputTarget); - return s.toString("UTF8"); //$NON-NLS-1$ - } - - public static Element parseDocument(String document) { - Element root = null; - InputStream stream = null; - try{ - DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - parser.setErrorHandler(new DefaultHandler()); - stream = new ByteArrayInputStream(document.getBytes("UTF8")); //$NON-NLS-1$ - root = parser.parse(stream).getDocumentElement(); - } catch (Exception e) { - ProjectExamplesActivator.log(e); - } finally { - try{ - if (stream != null) { - stream.close(); - } - } catch(IOException e) { - ProjectExamplesActivator.log(e); - } - } - return root; - } - - public static HashSet<IProjectExampleSite> getInvalidSites() { - return invalidSites; - } - - public static List<Project> getProjectsByTags(Collection<Category> categories, String ... tags) { - if (categories == null) { - return null; - } - List<Project> selection = new ArrayList<Project>(); - for (Category c : categories) { - for (Project p : c.getProjects()) { - if (p.hasTags(tags) && !selection.contains(p)) { - selection.add(p); - } - } - } - return selection; - } -} 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-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -43,7 +43,7 @@ import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.IProjectExampleSite; import org.jboss.tools.project.examples.model.ProjectExampleSite; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.jboss.tools.project.examples.model.SiteCategory; /** @@ -286,7 +286,7 @@ store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY, value); } try { - String userSites = ProjectUtil.getAsXML(sites.getUserSites()); + String userSites = ProjectExampleUtil.getAsXML(sites.getUserSites()); store.setValue(ProjectExamplesActivator.USER_SITES, userSites); } catch (Exception e) { ProjectExamplesActivator.log(e); 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-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -16,7 +16,7 @@ import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.model.IProjectExampleSite; import org.jboss.tools.project.examples.model.ProjectExampleSite; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.jboss.tools.project.examples.model.SiteCategory; /** @@ -33,11 +33,11 @@ if (siteCategories == null) { siteCategories = new SiteCategory[2]; userSite = new SiteCategory(Messages.Sites_User_sites); - Set<IProjectExampleSite> userSites = ProjectUtil.getUserSites(); + Set<IProjectExampleSite> userSites = ProjectExampleUtil.getUserSites(); userSite.setSites(userSites); siteCategories[0]=userSite; SiteCategory pluginSite = new SiteCategory(Messages.Sites_Plugin_provided_sites); - Set<IProjectExampleSite> pluginSites = ProjectUtil.getPluginSites(); + Set<IProjectExampleSite> pluginSites = ProjectExampleUtil.getPluginSites(); pluginSite.setSites(pluginSites); siteCategories[1]=pluginSite; sites = new HashSet<IProjectExampleSite>(); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -36,7 +36,7 @@ import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.AbstractImportProjectExample; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; public class ImportDefaultProjectExample extends AbstractImportProjectExample { @@ -48,9 +48,9 @@ }; @Override - public boolean importProject(Project projectDescription, File file, + public boolean importProject(ProjectExample projectDescription, File file, IProgressMonitor monitor) throws Exception { - List<Project> projects = new ArrayList<Project>(); + List<ProjectExample> projects = new ArrayList<ProjectExample>(); if (projectDescription.getIncludedProjects() == null) { boolean ret = importSingleProject(projectDescription, file, monitor); projects.add(projectDescription); @@ -130,7 +130,7 @@ project.create(monitor); } - private boolean importSingleProject(Project projectDescription, File file, + private boolean importSingleProject(ProjectExample projectDescription, File file, IProgressMonitor monitor) throws CoreException, ZipException, IOException, InvocationTargetException, InterruptedException { final String projectName = projectDescription.getName(); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -16,14 +16,14 @@ import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.IImportProjectExample; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; public class NewProjectExamplesJob extends WorkspaceJob { - private List<Project> selectedProjects; - private List<Project> projects = new ArrayList<Project>(); + private List<ProjectExample> selectedProjects; + private List<ProjectExample> projects = new ArrayList<ProjectExample>(); - public NewProjectExamplesJob(String name, List<Project> selectedProjects) { + public NewProjectExamplesJob(String name, List<ProjectExample> selectedProjects) { super(name); this.selectedProjects = selectedProjects; } @@ -32,7 +32,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { projects .clear(); - for (Project selectedProject : selectedProjects) { + for (ProjectExample selectedProject : selectedProjects) { boolean success = ProjectExamplesActivator.downloadProject( selectedProject, monitor); if (success) { @@ -43,7 +43,7 @@ } try { setName(Messages.NewProjectExamplesWizard_Importing); - for (final Project project : projects) { + for (final ProjectExample project : projects) { IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(project.getImportType()); if (importProjectExample == null) { @@ -88,7 +88,7 @@ return null; } - public List<Project> getProjects() { + public List<ProjectExample> getProjects() { return projects; } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -25,11 +25,11 @@ import org.eclipse.ui.IWorkbench; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; public class NewProjectExamplesWizard extends Wizard implements INewWizard { - private List<Project> projects = new ArrayList<Project>(); + private List<ProjectExample> projects = new ArrayList<ProjectExample>(); private NewProjectExamplesWizardPage page; @@ -45,7 +45,7 @@ @Override public boolean performFinish() { - final List<Project> selectedProjects = new ArrayList<Project>(); + final List<ProjectExample> selectedProjects = new ArrayList<ProjectExample>(); if (page.getSelection() == null || page.getSelection().size() <= 0) { return false; } @@ -53,8 +53,8 @@ Iterator iterator = selection.iterator(); while (iterator.hasNext()) { Object object = iterator.next(); - if (object instanceof Project) { - Project project = (Project) object; + if (object instanceof ProjectExample) { + ProjectExample project = (ProjectExample) object; selectedProjects.add(project); } } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -65,12 +65,12 @@ import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.dialog.FixDialog; -import org.jboss.tools.project.examples.model.Category; +import org.jboss.tools.project.examples.model.ProjectExampleCategory; import org.jboss.tools.project.examples.model.IImportProjectExample; import org.jboss.tools.project.examples.model.IProjectExampleSite; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.jboss.tools.project.examples.preferences.ProjectExamplesPreferencePage; /** @@ -89,7 +89,7 @@ private PageBook notesPageBook; private Composite noteEmptyComposite; private Composite noteComposite; - private List<Category> categories; + private List<ProjectExampleCategory> categories; private Text descriptionText; @@ -199,8 +199,8 @@ public void selectionChanged(SelectionChangedEvent event) { selection = (IStructuredSelection) event.getSelection(); Object selected = selection.getFirstElement(); - if (selected instanceof Project && selection.size() == 1) { - Project selectedProject = (Project) selected; + if (selected instanceof ProjectExample && selection.size() == 1) { + ProjectExample selectedProject = (ProjectExample) selected; descriptionText.setText(selectedProject.getDescription()); projectName.setText(selectedProject.getName()); projectURL.setText(selectedProject.getUrl()); @@ -422,11 +422,11 @@ siteCombo.setItems(items); } - private List<Category> getCategories(boolean show) { + private List<ProjectExampleCategory> getCategories(boolean show) { IRunnableWithProgress op = new IRunnableWithProgress() { public void run(IProgressMonitor monitor) { - categories = ProjectUtil.getProjects(monitor); + categories = ProjectExampleUtil.getProjects(monitor); } }; try { @@ -434,7 +434,7 @@ } catch (Exception e) { ProjectExamplesActivator.log(e); } - HashSet<IProjectExampleSite> invalidSites = ProjectUtil.getInvalidSites(); + HashSet<IProjectExampleSite> invalidSites = ProjectExampleUtil.getInvalidSites(); boolean showInvalidSites = ProjectExamplesActivator.getDefault().getPreferenceStore().getBoolean(ProjectExamplesActivator.SHOW_INVALID_SITES); if (invalidSites.size() > 0 && showInvalidSites && show) { String message = Messages.NewProjectExamplesWizardPage_Cannot_access_the_following_sites; @@ -453,9 +453,9 @@ //List<Category> categories = getCategories(true); Set<String> sites = new TreeSet<String>(); sites.add(ProjectExamplesActivator.ALL_SITES); - for (Category category:categories) { - List<Project> projects = category.getProjects(); - for (Project project:projects) { + for (ProjectExampleCategory category:categories) { + List<ProjectExample> projects = category.getProjects(); + for (ProjectExample project:projects) { String name = project.getSite() == null ? ProjectExamplesActivator.ALL_SITES : project.getSite().getName(); sites.add(name); } @@ -473,12 +473,12 @@ @Override public String getText(Object element) { - if (element instanceof Category) { - Category category = (Category) element; + if (element instanceof ProjectExampleCategory) { + ProjectExampleCategory category = (ProjectExampleCategory) element; return category.getName(); } - if (element instanceof Project) { - Project project = (Project) element; + if (element instanceof ProjectExample) { + ProjectExample project = (ProjectExample) element; return project.getShortDescription(); } return super.getText(element); @@ -494,22 +494,22 @@ //return children.toArray(); return childCollections; } - if (parentElement instanceof Category) { - Category category = (Category) parentElement; + if (parentElement instanceof ProjectExampleCategory) { + ProjectExampleCategory category = (ProjectExampleCategory) parentElement; return category.getProjects().toArray(); } return new Object[0]; } public Object getParent(Object element) { - if (element instanceof Project) { - return ((Project)element).getCategory(); + if (element instanceof ProjectExample) { + return ((ProjectExample)element).getCategory(); } return null; } public boolean hasChildren(Object element) { - return element instanceof Category; + return element instanceof ProjectExampleCategory; } public Object[] getElements(Object inputElement) { @@ -543,9 +543,9 @@ Iterator iterator = selection.iterator(); while (iterator.hasNext()) { Object object = iterator.next(); - if (object instanceof Project) { + if (object instanceof ProjectExample) { canFinish=true; - Project project = (Project) object; + ProjectExample project = (ProjectExample) object; String importType = project.getImportType(); if (importType != null && importType.length() > 0) { IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(importType); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/SiteFilter.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/SiteFilter.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/SiteFilter.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -15,9 +15,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Category; +import org.jboss.tools.project.examples.model.ProjectExampleCategory; import org.jboss.tools.project.examples.model.IProjectExampleSite; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectModelElement; /** @@ -39,8 +39,8 @@ if (! (element instanceof ProjectModelElement) ) { return false; } - if (element instanceof Category) { - Category category = (Category) element; + if (element instanceof ProjectExampleCategory) { + ProjectExampleCategory category = (ProjectExampleCategory) element; int size = 0; if (site.equals(ProjectExamplesActivator.ALL_SITES)) { size += category.getProjects().size(); @@ -52,8 +52,8 @@ if (!site.equals(categorySite.getName())) { return false; } - List<Project> projects = category.getProjects(); - for (Project project:projects) { + List<ProjectExample> projects = category.getProjects(); + for (ProjectExample project:projects) { IProjectExampleSite projectSite = project.getSite(); if (projectSite == null) { continue; Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -32,8 +32,8 @@ import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.cheatsheet.Activator; import org.jboss.tools.project.examples.model.IImportProjectExample; -import org.jboss.tools.project.examples.model.Project; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExample; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; /** * @@ -60,7 +60,7 @@ return; } - Project project = new Project(); + ProjectExample project = new ProjectExample(); project.setName(params[0]); StringTokenizer tokenizer = new StringTokenizer(params[1],","); //$NON-NLS-1$ List<String> includedProjects = new ArrayList<String>(); @@ -73,7 +73,7 @@ } - private void importProject(final Project project) { + private void importProject(final ProjectExample project) { WorkspaceJob workspaceJob = new WorkspaceJob(Messages.NewProjectExamplesWizard_Downloading) { @Override @@ -88,7 +88,7 @@ ProjectExamplesActivator.log(e); return Status.CANCEL_STATUS; } - final File file = ProjectUtil.getProjectExamplesFile( + final File file = ProjectExampleUtil.getProjectExamplesFile( url, name, ".zip", monitor); //$NON-NLS-1$ if (file == null) { return Status.CANCEL_STATUS; @@ -130,7 +130,7 @@ } catch (InterruptedException e) { return; } - List<Project> projects = new ArrayList<Project>(); + List<ProjectExample> projects = new ArrayList<ProjectExample>(); projects.add(project); List<IMarker> markers = ProjectExamplesActivator .getMarkers(projects); Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/RunProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -21,9 +21,9 @@ import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.cheatsheet.Activator; import org.jboss.tools.project.examples.cheatsheet.Messages; -import org.jboss.tools.project.examples.model.Category; -import org.jboss.tools.project.examples.model.Project; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleCategory; +import org.jboss.tools.project.examples.model.ProjectExample; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; /** * @@ -53,11 +53,11 @@ Activator.log(NLS.bind(Messages.RunProjectExample_Invalid_project_example, params[0])); return; } - List<Category> categories = ProjectUtil.getProjects(new NullProgressMonitor()); - Project project = null; - for (Category category:categories) { + List<ProjectExampleCategory> categories = ProjectExampleUtil.getProjects(new NullProgressMonitor()); + ProjectExample project = null; + for (ProjectExampleCategory category:categories) { if (projectExample[0].equals(category.getName())) { - for (Project p:category.getProjects()) { + for (ProjectExample p:category.getProjects()) { if (projectExample[1].equals(p.getName())) { project = p; break; @@ -69,7 +69,7 @@ } } if (project != null) { - List<Project> selectedProjects = new ArrayList<Project>(); + List<ProjectExample> selectedProjects = new ArrayList<ProjectExample>(); selectedProjects.add(project); ProjectExamplesActivator.importProjectExamples(selectedProjects, true); } Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java =================================================================== --- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -39,12 +39,12 @@ import org.eclipse.core.runtime.Status; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Category; +import org.jboss.tools.project.examples.model.ProjectExampleCategory; import org.jboss.tools.project.examples.model.IImportProjectExample; import org.jboss.tools.project.examples.model.IProjectExampleSite; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectExampleSite; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.jboss.tools.test.util.JobUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -110,10 +110,10 @@ site.setUrl(url); Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); sites.add(site); - List<Category> categories = ProjectUtil.getProjects(sites , new NullProgressMonitor()); - Category category = categories.get(0); + List<ProjectExampleCategory> categories = ProjectExampleUtil.getProjects(sites , new NullProgressMonitor()); + ProjectExampleCategory category = categories.get(0); assertTrue("Test".equals(category.getName())); - Project project = category.getProjects().get(0); + ProjectExample project = category.getProjects().get(0); String urlString = project.getUrl(); assertTrue(urlString.startsWith("file:")); url = new URL(urlString); @@ -143,17 +143,17 @@ } private void importProject(IProgressMonitor monitor) throws MalformedURLException, Exception { - List<Category> projects = ProjectUtil.getProjects(monitor); - Category seamCategory = null; - for (Category category: projects) { + List<ProjectExampleCategory> projects = ProjectExampleUtil.getProjects(monitor); + ProjectExampleCategory seamCategory = null; + for (ProjectExampleCategory category: projects) { if ("Seam".equals(category.getName())) { seamCategory = category; break; } } assertNotNull(seamCategory); - Project projectExample = null; - for (Project project: seamCategory.getProjects()) { + ProjectExample projectExample = null; + for (ProjectExample project: seamCategory.getProjects()) { if ("numberguess".equals(project.getName())) { projectExample = project; break; @@ -164,7 +164,7 @@ String name = projectExample.getName(); URL url = null; url = new URL(urlString); - File file = ProjectUtil.getProjectExamplesFile( + File file = ProjectExampleUtil.getProjectExamplesFile( url, name, ".zip", monitor); //$NON-NLS-1$ assertNotNull(file); IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(projectExample.getImportType()); Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/SiteTest.java =================================================================== --- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/SiteTest.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/SiteTest.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.project.examples.model.IProjectExampleSite; import org.jboss.tools.project.examples.model.ProjectExampleSite; -import org.jboss.tools.project.examples.model.ProjectUtil; +import org.jboss.tools.project.examples.model.ProjectExampleUtil; import org.junit.Test; /** @@ -31,15 +31,15 @@ @Test public void sitesPresent() { Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); - sites.addAll(ProjectUtil.getPluginSites()); - sites.addAll(ProjectUtil.getUserSites()); + sites.addAll(ProjectExampleUtil.getPluginSites()); + sites.addAll(ProjectExampleUtil.getUserSites()); assertTrue(sites.size() > 0); } @Test public void testInvalidSites() { - ProjectUtil.getProjects(new NullProgressMonitor()); - HashSet<IProjectExampleSite> invalidSites = ProjectUtil.getInvalidSites(); + ProjectExampleUtil.getProjects(new NullProgressMonitor()); + HashSet<IProjectExampleSite> invalidSites = ProjectExampleUtil.getInvalidSites(); assertTrue(invalidSites.size() <= 0); } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Shell; import org.jboss.tools.maven.project.examples.wizard.ArchetypeExamplesWizard; import org.jboss.tools.project.examples.model.AbstractImportProjectExample; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @author snjeza @@ -43,9 +43,9 @@ AbstractImportProjectExample { @Override - public boolean importProject(final Project projectDescription, File file, + public boolean importProject(final ProjectExample projectDescription, File file, final IProgressMonitor monitor) throws Exception { - List<Project> projects = new ArrayList<Project>(); + List<ProjectExample> projects = new ArrayList<ProjectExample>(); projects.add(projectDescription); //IPath location = getLocation(); //final File destination = new File(location.toOSString()); Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -36,7 +36,7 @@ import org.jboss.tools.maven.ui.Activator; import org.jboss.tools.project.examples.ProjectExamplesActivator; import org.jboss.tools.project.examples.model.AbstractImportProjectExample; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @author snjeza @@ -49,9 +49,9 @@ private boolean confirm; @Override - public boolean importProject(Project projectDescription, File file, + public boolean importProject(ProjectExample projectDescription, File file, IProgressMonitor monitor) throws Exception { - List<Project> projects = new ArrayList<Project>(); + List<ProjectExample> projects = new ArrayList<ProjectExample>(); projects.add(projectDescription); IPath rootPath = getLocation(); IPath mavenProjectsRoot = rootPath; @@ -154,7 +154,7 @@ } private List<String> importMavenProjects(final File destination, - final Project projectDescription, IProgressMonitor monitor) { + final ProjectExample projectDescription, IProgressMonitor monitor) { List<String> projectNames = new ArrayList<String>(); MavenPlugin plugin = MavenPlugin.getDefault(); try { Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -46,7 +46,7 @@ import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator; import org.jboss.tools.maven.ui.Activator; import org.jboss.tools.project.examples.ProjectExamplesActivator; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @@ -55,7 +55,7 @@ */ public class ArchetypeExamplesWizard extends Wizard implements INewWizard { - private Project projectDescription; + private ProjectExample projectDescription; private ProjectImportConfiguration configuration; private ArchetypeExamplesWizardFirstPage simplePage; private ArchetypeExamplesWizardPage wizardPage; @@ -64,7 +64,7 @@ private String artifactId; private IPath locationPath; - public ArchetypeExamplesWizard(Project projectDescription) { + public ArchetypeExamplesWizard(ProjectExample projectDescription) { super(); setWindowTitle("New JBoss Project"); setDefaultPageImageDescriptor(MavenProjectExamplesActivator.getNewWizardImageDescriptor()); Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -56,7 +56,7 @@ import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator; import org.jboss.tools.maven.project.examples.Messages; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * Simplified UI for the Maven Archetype Wizard, based off the original m2e MavenProjectWizardLocationPage. @@ -79,11 +79,11 @@ private ModifyListener projectNameModifyListener; private ModifyListener packageNameModifyListener; private ModifyListener propertyModifyListener; - private final Project projectDescription; + private final ProjectExample projectDescription; public ArchetypeExamplesWizardFirstPage( ProjectImportConfiguration configuration, - Project projectDescription, List<IWorkingSet> workingSet) { + ProjectExample projectDescription, List<IWorkingSet> workingSet) { super(configuration, projectDescription.getShortDescription(),Messages.ArchetypeExamplesWizardFirstPage_Title, workingSet); this.projectDescription = projectDescription; setPageComplete(false); Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2012-02-04 18:30:28 UTC (rev 38431) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2012-02-05 00:36:38 UTC (rev 38432) @@ -49,7 +49,7 @@ import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator; import org.jboss.tools.maven.project.examples.wizard.xpl.MavenProjectWizardArchetypeParametersPage; import org.jboss.tools.project.examples.model.ArchetypeModel; -import org.jboss.tools.project.examples.model.Project; +import org.jboss.tools.project.examples.model.ProjectExample; /** * @@ -59,12 +59,12 @@ public class ArchetypeExamplesWizardPage extends MavenProjectWizardArchetypeParametersPage { - private Project projectDescription; + private ProjectExample projectDescription; private Composite warningLink; private Boolean isEnterpriseRepoAvailable; public ArchetypeExamplesWizardPage( - ProjectImportConfiguration configuration, Project projectDescription) { + ProjectImportConfiguration configuration, ProjectExample projectDescription) { super(configuration); setTitle(projectDescription.getShortDescription()); this.projectDescription = projectDescription;