Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2008-04-20 16:23:29 -0400
committerpelder2008-04-20 16:23:29 -0400
commit6606bf5bb3205fecf8a66d0eaac868d050261d24 (patch)
treeb69fcb9e7fa267cff91b7c70a4c9c168d2785db8
parent3087de1d2d36c4017a73d3ea9509e648ec9a4f66 (diff)
downloadorg.eclipse.jet-6606bf5bb3205fecf8a66d0eaac868d050261d24.tar.gz
org.eclipse.jet-6606bf5bb3205fecf8a66d0eaac868d050261d24.tar.xz
org.eclipse.jet-6606bf5bb3205fecf8a66d0eaac868d050261d24.zip
[227924] Use Java5 language features checkbox always enabled in JET Project properites
-rw-r--r--plugins/org.eclipse.jet.ui/src/org/eclipse/jet/internal/ui/prefs/CompilePreferencePage.java2
-rw-r--r--plugins/org.eclipse.jet.ui/src/org/eclipse/jet/ui/newproject/NewProjectWizard.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/internal/ui/prefs/CompilePreferencePage.java b/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/internal/ui/prefs/CompilePreferencePage.java
index e0047d5..8e0819c 100644
--- a/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/internal/ui/prefs/CompilePreferencePage.java
+++ b/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/internal/ui/prefs/CompilePreferencePage.java
@@ -218,10 +218,12 @@ public class CompilePreferencePage extends FieldEditorPreferencePage implements
jetVersionFieldEditor.setEnabled(enabledGlobalSettings, getFieldEditorParent());
srcFolderFieldEditor.setEnabled(enabledGlobalSettings, javaGenerationGroup);
derivedJavaFieldEditor.setEnabled(enabledGlobalSettings, javaGenerationGroup);
+ useJava5FieldEditor.setEnabled(enabledGlobalSettings, javaGenerationGroup);
if(!enabledGlobalSettings) {
srcFolderFieldEditor.loadDefault();
derivedJavaFieldEditor.loadDefault();
jetVersionFieldEditor.loadDefault();
+ useJava5FieldEditor.loadDefault();
}
// Enable JET1 options
diff --git a/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/ui/newproject/NewProjectWizard.java b/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/ui/newproject/NewProjectWizard.java
index 33c987d..b825b92 100644
--- a/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/ui/newproject/NewProjectWizard.java
+++ b/plugins/org.eclipse.jet.ui/src/org/eclipse/jet/ui/newproject/NewProjectWizard.java
@@ -84,7 +84,7 @@ public class NewProjectWizard extends Wizard implements INewWizard {
if(!projectPage.useDefaults()) {
newProjectInfo.setLocation(projectPage.getLocationPath().toString());
}
- newProjectInfo.setProjectAttribute("binDi r", projectPage.getJavaOutputFolder()); //$NON-NLS-1$
+ newProjectInfo.setProjectAttribute("binDir", projectPage.getJavaOutputFolder()); //$NON-NLS-1$
newProjectInfo.setProjectAttribute("jet2javaDir", projectPage.getJETOutputFolder()); //$NON-NLS-1$
newProjectInfo.setProjectAttribute("templatesDir", projectPage.getTemplateFolder()); //$NON-NLS-1$
newProjectInfo.setProjectAttribute("bundleName", projectPropertiesPage.getTransformName()); //$NON-NLS-1$

Back to the top