Skip to content

[NewTypeWizardPage] Add support for multiple type creation (#1251) #2407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexcoover wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[NewTypeWizardPage] Add support for multiple type creation (#1251) #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.jdt.junit/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.junit;singleton:=true
Bundle-Version: 3.17.200.qualifier
Bundle-Version: 3.18.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.junit.ui.JUnitPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,12 @@ private String getUpdatableString() {
}

@Override
public void createType(IProgressMonitor monitor) throws CoreException, InterruptedException {
public void createTypes(IProgressMonitor monitor) throws CoreException, InterruptedException {
IPackageFragment pack= getPackageFragment();
ICompilationUnit cu= pack.getCompilationUnit(getTypeName() + ".java"); //$NON-NLS-1$

if (!cu.exists()) {
super.createType(monitor);
super.createTypes(monitor);
fUpdatedExistingClassButton= false;
} else {
updateExistingType(cu, monitor);
Expand Down
26 changes: 13 additions & 13 deletions org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewTypeWizardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void testCreateClass1() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -176,7 +176,7 @@ public void testCreateClass2() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -230,7 +230,7 @@ public class A<T> {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -292,7 +292,7 @@ public class A<T> {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -362,7 +362,7 @@ public class A<T> {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -412,7 +412,7 @@ public void testCreateClassExtraImports1() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -475,7 +475,7 @@ public static class Inner {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -550,7 +550,7 @@ public class B {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -601,7 +601,7 @@ public void testCreateInterface() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -641,7 +641,7 @@ public void testCreateEnum() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -679,7 +679,7 @@ public void testCreateAnnotation() throws Exception {
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -723,7 +723,7 @@ public void typeBodyTest( NewTypeWizardPage wizardPage, String templateID, Strin
wizardPage.enableCommentControl(true);

FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();
Expand Down Expand Up @@ -835,7 +835,7 @@ public class Foo3 {
NewClassWizardPage wizardPage= new NewClassWizardPage();
wizardPage.init(new StructuredSelection(cu));
FussyProgressMonitor testMonitor= new FussyProgressMonitor();
wizardPage.createType(testMonitor);
wizardPage.createTypes(testMonitor);
testMonitor.assertUsedUp();

// Foo3.java can still be unique in test1
Expand Down
30 changes: 15 additions & 15 deletions org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewTypeWizardTest17.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

package org.eclipse.jdt.ui.tests.wizardapi;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import java.util.ArrayList;
import java.util.Hashtable;
Expand Down Expand Up @@ -362,7 +362,7 @@ public void testNonModularCreateClassSuccess1() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -426,7 +426,7 @@ public void testNonModularCreateClassSuccess2() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -491,7 +491,7 @@ public void testNonModularCreateClassSuccess3() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -555,7 +555,7 @@ public void testNonModularCreateClassSuccess4() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -618,7 +618,7 @@ public void testNonModularCreateInterfaceSuccess1() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -773,7 +773,7 @@ public void testModularCreateClassSuccess1() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -844,7 +844,7 @@ public void testModularCreateClassSuccess2() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -916,7 +916,7 @@ public void testModularCreateClassSuccess3() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -987,7 +987,7 @@ public void testModularCreateClassSuccess4() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -1057,7 +1057,7 @@ public void testModularCreateInterfaceSuccess1() throws Exception {
assertNotNull(status);
assertEquals(IStatus.OK, status.getSeverity());

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -1233,7 +1233,7 @@ public void testCreateRecordWithAbstractMethodStubs() throws Exception {
wizardPage.setAddComments(true, true);
wizardPage.enableCommentControl(true);

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -1297,7 +1297,7 @@ public void testCreateRecordWithOutAbstractMethodStubsAndMain() throws Exception
wizardPage.setAddComments(true, true);
wizardPage.enableCommentControl(true);

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -1337,7 +1337,7 @@ public void testCreateRecordWithMain() throws Exception {
wizardPage.setAddComments(true, true);
wizardPage.enableCommentControl(true);

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down Expand Up @@ -1384,7 +1384,7 @@ public void testCreateRecordWithAbstractMethodStubsAndMain() throws Exception {
wizardPage.setAddComments(true, true);
wizardPage.enableCommentControl(true);

wizardPage.createType(null);
wizardPage.createTypes(null);

String actual= wizardPage.getCreatedType().getCompilationUnit().getSource();

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ org.eclipse.jdt.ui/perf/search/participants=300
org.eclipse.jdt.ui/perf/content_assist/extensions=1000

#Reports the time for a single completion proposal sorter
org.eclipse.jdt.ui/perf/content_assist_sorters/extensions
org.eclipse.jdt.ui/perf/content_assist_sorters/extensions
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.ui
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true
Bundle-Version: 3.35.200.qualifier
Bundle-Version: 3.36.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.ui.JavaPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.ui</artifactId>
<version>3.35.200-SNAPSHOT</version>
<version>3.36.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
2 changes: 1 addition & 1 deletion ...ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/NewCUUsingWizardProposal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public void apply(IDocument document) {
wizard.addPages();
try {
NewTypeWizardPage page= getPage(wizard);
page.createType(null);
page.createTypes(null);
createdType= page.getCreatedType();
} catch (CoreException e) {
JavaPlugin.log(e);
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewAnnotationCreationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected boolean canRunForked() {

@Override
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
fPage.createTypes(monitor); // use the full progress monitor
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewClassCreationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected boolean canRunForked() {

@Override
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
fPage.createTypes(monitor); // use the full progress monitor
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewEnumCreationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected boolean canRunForked() {

@Override
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
fPage.createTypes(monitor); // use the full progress monitor
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewInterfaceCreationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected boolean canRunForked() {

@Override
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
fPage.createTypes(monitor); // use the full progress monitor
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewRecordCreationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected boolean canRunForked() {

@Override
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
fPage.createTypes(monitor); // use the full progress monitor
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,8 @@ private NewWizardMessages() {
public static String NewModuleInfoWizardPage_warning_DiscouragedModuleName;
public static String NewModuleInfoWizardPage_error_EnterName;

public static String NewTypeWizardPage_info_CreateMultipleTypes;

public static String ReleaseAttributeConfiguration_defaultReleaseName;
public static String ReleaseAttributeConfiguration_dialogTitle;
public static String ReleaseAttributeConfiguration_nameLabel;
Expand Down
2 changes: 2 additions & 0 deletions org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ NewTypeWizardPage_error_QualifiedName=Type name must not be qualified.
NewTypeWizardPage_info_FileExtensionNotRequired=The file extension '.java' will not be part of the type name.
NewTypeWizardPage_warning_TypeNameDiscouraged=Type name is discouraged. {0}

NewTypeWizardPage_info_CreateMultipleTypes=Values separated by semicolons will create multiple types.

NewTypeWizardPage_error_InvalidSuperClassName=Superclass type is not valid.
NewTypeWizardPage_error_InvalidSuperInterfaceName=Extended interface ''{0}'' is not valid.
NewTypeWizardPage_error_InvalidSuperClassRecord=Record ''{0}'' cannot be superclass. A record is final.
Expand Down
Loading
Loading