[jbosstools-commits] JBoss Tools SVN: r11799 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/preferences and 2 other directories.
Author: snjeza
Date: 2008-11-14 14:53:25 -0500 (Fri, 14 Nov 2008)
New Revision: 11799
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
JBIDE-3130 Seam 2.1 support: Facet and Runtime
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-11-14 19:53:17 UTC (rev
11798)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-11-14 19:53:25 UTC (rev
11799)
@@ -106,6 +106,9 @@
<wizard-pages action="jst.seam.2.0.install">
<page
class="org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage"/>
</wizard-pages>
+ <wizard-pages action="jst.seam.2.1.install">
+ <page
class="org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage"/>
+ </wizard-pages>
</extension>
<extension
point="org.eclipse.ui.views">
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-11-14
19:53:17 UTC (rev 11798)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-11-14
19:53:25 UTC (rev 11799)
@@ -920,6 +920,9 @@
if(vs.matches(SeamVersion.SEAM_2_0.toString().replace(".", "\\.") +
".*")) {
return SeamVersion.SEAM_2_0;
}
+ if(vs.matches(SeamVersion.SEAM_2_1.toString().replace(".", "\\.") +
".*")) {
+ return SeamVersion.SEAM_2_1;
+ }
return null;
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-11-14
19:53:17 UTC (rev 11798)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-11-14
19:53:25 UTC (rev 11799)
@@ -472,11 +472,13 @@
SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
Arrays.asList(new String[] {
SeamVersion.SEAM_1_2.toString(),
- SeamVersion.SEAM_2_0.toString()}),
+ SeamVersion.SEAM_2_0.toString(),
+ SeamVersion.SEAM_2_1.toString()}),
SeamVersion.SEAM_1_2.toString(), false);
this.validSeamVersions = new ArrayList<SeamVersion>();
this.validSeamVersions.add(SeamVersion.SEAM_1_2);
this.validSeamVersions.add(SeamVersion.SEAM_2_0);
+ this.validSeamVersions.add(SeamVersion.SEAM_2_1);
} else {
this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
SRT_VERSION,
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-11-14
19:53:17 UTC (rev 11798)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-11-14
19:53:25 UTC (rev 11799)
@@ -213,6 +213,8 @@
creator = new SeamProjectCreator(model, project);
} else if(seamVersion == SeamVersion.SEAM_2_0) {
creator = new Seam2ProjectCreator(model, project);
+ } else if(seamVersion == SeamVersion.SEAM_2_1) {
+ creator = new Seam2ProjectCreator(model, project);
} else {
throw new RuntimeException("Can't get seam version from seam facet
model");
}