diff options
| author | Roberto Sanchez | 2015-01-14 17:13:19 +0000 |
|---|---|---|
| committer | Roberto Sanchez | 2015-01-14 17:13:19 +0000 |
| commit | 4de6ea8d237762cca22b6c96b2482e61c517a75d (patch) | |
| tree | c29c2b51141b069a9fe5eb59d8503996aef0353a | |
| parent | 92c7e990609c9e515808ee07f2414eb548d9b503 (diff) | |
| download | webtools.javaee-4de6ea8d237762cca22b6c96b2482e61c517a75d.tar.gz webtools.javaee-4de6ea8d237762cca22b6c96b2482e61c517a75d.tar.xz webtools.javaee-4de6ea8d237762cca22b6c96b2482e61c517a75d.zip | |
[319387] Jar file appears as source folder in Servlet wizard
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF index af768a53e..42afe3cfa 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true -Bundle-Version: 1.1.800.qualifier +Bundle-Version: 1.1.801.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java index 460e12d4c..094539736 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation and others. + * Copyright (c) 2003, 2015 IBM Corporation 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 @@ -303,7 +303,7 @@ public class NewJavaClassWizardPage extends DataModelWizardPage { String projectName = model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME); if (projectName != null && projectName.length() > 0) { IProject targetProject = ProjectUtilities.getProject(projectName); - if (root == null || !root.getJavaProject().getProject().equals(targetProject)) { + if (root == null || !root.getJavaProject().getProject().equals(targetProject) || root.isArchive()) { IFolder folder = getDefaultJavaSourceFolder(targetProject); if (folder != null) folderText.setText(folder.getFullPath().toOSString()); diff --git a/plugins/org.eclipse.jst.j2ee.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ui/pom.xml index e51fb2f1a..9626ce367 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ui/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.ui</artifactId> - <version>1.1.800-SNAPSHOT</version> + <version>1.1.801-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |