Attachment #265006 for bug #488748

Lines 499-504 Link Here

(-)a/org.eclipse.jdt.ui/plugin.properties (+5 lines)
499	GenerateJavadocAction.label= &Generate Javadoc...	499	GenerateJavadocAction.label= &Generate Javadoc...
500		500
501	##########################################################################	501	##########################################################################
		502	# Module Support
		503	##########################################################################
		504	create.module.info.label= Create module-info.java
		505
		506	##########################################################################
502	# Java Working Set Support	507	# Java Working Set Support
503	##########################################################################	508	##########################################################################
504	JavaWorkingSetPage.name= Java	509	JavaWorkingSetPage.name= Java




        </activeWhen>
     </projectConfigurator>
  </extension>
  <extension
        point="org.eclipse.ui.popupMenus">
      <objectContribution
            objectClass="org.eclipse.core.resources.IProject"
            adaptable="true"
            id="org.eclipse.jdt.ui.create.module.info">
       	 <visibility>
        	<and>
            <objectState 
	            name="projectNature" 
	            value="org.eclipse.jdt.core.javanature"/>
	        <objectState
	        	name="open"
	        	value="true"/>
            </and>
       	 </visibility>
         <action
            label="%create.module.info.label"
            class="org.eclipse.jdt.internal.ui.actions.CreateModuleInfoAction"
            menubarPath="org.eclipse.ui.projectConfigure/additions"
            enablesFor="1"
            id="org.eclipse.jdt.ui.create.module.info.action">
      	</action>
      </objectContribution>
  </extension>
</plugin>

Lines 1-9 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.java (-1 / +10 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2015 IBM Corporation and others.	2	* Copyright (c) 2000, 2016 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* This is an implementation of an early-draft specification developed under the Java
		9	* Community Process (JCP) and is made available for testing and evaluation purposes
		10	* only. The code is not compatible with any specification of the JCP.
7	*	11	*
8	* Contributors:	12	* Contributors:
9	* IBM Corporation - initial API and implementation	13	* IBM Corporation - initial API and implementation
Lines 432-437 Link Here
432	public static String CollapsAllAction_tooltip;	436	public static String CollapsAllAction_tooltip;
433	public static String CollapsAllAction_description;	437	public static String CollapsAllAction_description;
434		438
		439	public static String CreateModuleInfoAction_error_message_compliance;
		440	public static String CreateModuleInfoAction_error_message_no_source_folder;
		441	public static String CreateModuleInfoAction_error_title;
		442	public static String CreateModuleInfoAction_question_message_overwrite_module_info;
		443
435	public static String GenerateToStringAction_label;	444	public static String GenerateToStringAction_label;
436	public static String GenerateToStringAction_description;	445	public static String GenerateToStringAction_description;
437	public static String GenerateToStringAction_tooltip;	446	public static String GenerateToStringAction_tooltip;

Lines 1-9 Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties (-1 / +10 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2013 IBM Corporation and others.	2	# Copyright (c) 2000, 2016 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html	6	# http://www.eclipse.org/legal/epl-v10.html
		7	#
		8	# This is an implementation of an early-draft specification developed under the Java
		9	# Community Process (JCP) and is made available for testing and evaluation purposes
		10	# only. The code is not compatible with any specification of the JCP.
7	#	11	#
8	# Contributors:	12	# Contributors:
9	# IBM Corporation - initial API and implementation	13	# IBM Corporation - initial API and implementation
Lines 461-466 Link Here
461	CollapsAllAction_tooltip= Collapse All	465	CollapsAllAction_tooltip= Collapse All
462	CollapsAllAction_description= Collapse All	466	CollapsAllAction_description= Collapse All
463		467
		468	CreateModuleInfoAction_error_message_compliance=Project requires compliance level of 9 or above.
		469	CreateModuleInfoAction_error_message_no_source_folder=No source folder exists in the project.
		470	CreateModuleInfoAction_error_title=Create module-info.java
		471	CreateModuleInfoAction_question_message_overwrite_module_info=The module-info.java file already exists in the source folder ''{0}''. Do you want to overwrite it?
		472
464		473
465	# DO NOT REMOVE, used in a product, see https://bugs.eclipse.org/296836	474	# DO NOT REMOVE, used in a product, see https://bugs.eclipse.org/296836
466	OrganizeImportsAction_summary_added={0} import(s) added.	475	OrganizeImportsAction_summary_added={0} import(s) added.




/*******************************************************************************
 * Copyright (c) 2016 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.actions;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.eclipse.swt.widgets.Display;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;

import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;

import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IModuleDescription;
import org.eclipse.jdt.core.IModuleDescription.IModuleReference;
import org.eclipse.jdt.core.IModuleDescription.IPackageExport;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;

import org.eclipse.jdt.internal.corext.util.InfoFilesUtil;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.internal.ui.JavaPlugin;

public class CreateModuleInfoAction implements IObjectActionDelegate {

	private static final String MODULE_INFO_JAVA_FILENAME= JavaModelUtil.MODULE_INFO_JAVA;

	private ISelection fSelection;

	@Override
	public void selectionChanged(IAction action, ISelection selection) {
		fSelection= selection;
	}

	@Override
	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
		// not used
	}

	@Override
	public void run(IAction action) {
		IJavaProject javaProject= null;

		if (fSelection instanceof IStructuredSelection) {
			Object selectedElement= ((IStructuredSelection) fSelection).getFirstElement();

			if (selectedElement instanceof IProject) {
				javaProject= JavaCore.create((IProject) selectedElement);
			} else if (selectedElement instanceof IJavaProject) {
				javaProject= (IJavaProject) selectedElement;
			} else {
				return;
			}

			try {
				if (!JavaModelUtil.is9OrHigher(javaProject)) {
					MessageDialog.openError(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, ActionMessages.CreateModuleInfoAction_error_message_compliance);
					return;
				}

				IPackageFragmentRoot[] packageFragmentRoots= javaProject.getPackageFragmentRoots();
				List<IPackageFragmentRoot> packageFragmentRootsAsList= new ArrayList<>(Arrays.asList(packageFragmentRoots));
				for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
					IResource res= packageFragmentRoot.getCorrespondingResource();
					if (res == null || res.getType() != IResource.FOLDER || packageFragmentRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
						packageFragmentRootsAsList.remove(packageFragmentRoot);
					}
				}
				packageFragmentRoots= packageFragmentRootsAsList.toArray(new IPackageFragmentRoot[packageFragmentRootsAsList.size()]);

				if (packageFragmentRoots.length == 0) {
					MessageDialog.openError(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, ActionMessages.CreateModuleInfoAction_error_message_no_source_folder);
					return;
				}

				IPackageFragmentRoot targetPkgFragmentRoot= null;

				for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
					if (packageFragmentRoot.getPackageFragment("").getCompilationUnit(MODULE_INFO_JAVA_FILENAME).exists()) { //$NON-NLS-1$
						String message= Messages.format(ActionMessages.CreateModuleInfoAction_question_message_overwrite_module_info, packageFragmentRoot.getElementName());
						boolean overwrite= MessageDialog.openQuestion(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, message);
						if (!overwrite) {
							return;
						}
						targetPkgFragmentRoot= packageFragmentRoot;
						break;
					}
				}

				if (targetPkgFragmentRoot == null) {
					targetPkgFragmentRoot= packageFragmentRoots[0];
				}

				createAndOpenFile(targetPkgFragmentRoot);

			} catch (CoreException e) {
				JavaPlugin.log(e);
			}
		}
	}

	private void createAndOpenFile(IPackageFragmentRoot pkgFragmentRoot) throws CoreException {
		createModuleInfoJava(pkgFragmentRoot);

		IFile file= ((IFolder) pkgFragmentRoot.getCorrespondingResource()).getFile(MODULE_INFO_JAVA_FILENAME);
		if (file.exists()) {
			BasicNewResourceWizard.selectAndReveal(file, JavaPlugin.getActiveWorkbenchWindow());
			openFile(file);
		}
	}

	private void createModuleInfoJava(IPackageFragmentRoot pkgFragmentRoot) throws CoreException {
		IModuleDescription module = JavaCore.createModuleFromPackageRoot(null, pkgFragmentRoot.getJavaProject());
		if (module != null) {
			StringBuilder fileContent= new StringBuilder();
			fileContent.append("module "); //$NON-NLS-1$
			fileContent.append(module.getElementName());
			fileContent.append(" {"); //$NON-NLS-1$
			fileContent.append('\n');
			IPackageExport[] exportedPackages= module.getExportedPackages();
			for (IPackageExport iPackageExport : exportedPackages) {
				fileContent.append('\t');
				fileContent.append("exports "); //$NON-NLS-1$
				fileContent.append(iPackageExport.getPackageName());
				String[] targets = iPackageExport.getTargetModules();
				if (targets != null && targets.length > 0) {
					fileContent.append(" to "); //$NON-NLS-1$
				}
				for (int i= 0; i < targets.length; i++) {
					fileContent.append(targets[i]);
					if (i < targets.length - 1) {
						fileContent.append(',');
					}
				}
				fileContent.append(";\n"); //$NON-NLS-1$
			}
			IModuleReference[] requiredModules= module.getRequiredModules();
			for (IModuleReference iModuleReference : requiredModules) {
				fileContent.append('\t');
				fileContent.append("requires "); //$NON-NLS-1$
				if (iModuleReference.isPublic()) {
					fileContent.append("public "); //$NON-NLS-1$
				}
				fileContent.append(iModuleReference.getModuleName());
				fileContent.append(';');
				fileContent.append('\n');
			}
			fileContent.append('}');
			IPackageFragment defaultPkg= pkgFragmentRoot.getPackageFragment(""); //$NON-NLS-1$
			InfoFilesUtil.createInfoJavaFile(MODULE_INFO_JAVA_FILENAME, fileContent.toString(), defaultPkg, new NullProgressMonitor());
		}
	}

	private void openFile(final IFile file) {
		final IWorkbenchPage activePage= JavaPlugin.getActivePage();
		if (activePage != null) {
			final Display display= getDisplay();
			if (display != null) {
				display.asyncExec(new Runnable() {
					@Override
					public void run() {
						try {
							IDE.openEditor(activePage, file, true);
						} catch (PartInitException e) {
							JavaPlugin.log(e);
						}
					}
				});
			}
		}
	}

	private Display getDisplay() {
		Display display= Display.getCurrent();
		if (display == null)
			display= Display.getDefault();
		return display;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2011 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;

import org.eclipse.jdt.core.IJavaElement;

import org.eclipse.jdt.internal.corext.util.JavaModelUtil;

import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;

	public boolean performFinish() {
		boolean res= super.performFinish();
		if (res) {
			selectAndReveal(fPage.getCorrespondingResource());
			selectAndReveal(resource);
			if (resource instanceof IFile && resource.getName().equals(JavaModelUtil.MODULE_INFO_JAVA)) {
				openResource((IFile) resource);
			}
		}
		return res;
	}




/*******************************************************************************
 * Copyright (c) 2000, 2013 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation

import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.util.BidiUtils;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;

import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaModelStatus;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;

import org.eclipse.jdt.internal.corext.util.InfoFilesUtil;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.corext.util.Messages;



	private SelectionButtonDialogField fExcludeInOthersFields;
	private SelectionButtonDialogField fIgnoreOptionalProblemsField;
	private SelectionButtonDialogField fCreateModuleInfoJavaField;

	private static final String MODULE_INFO_JAVA_FILENAME= JavaModelUtil.MODULE_INFO_JAVA;
	private static final String SETTINGS_CREATE_MODULE_INFO_JAVA= "create_module_info_java"; //$NON-NLS-1$

	private IWorkspaceRoot fWorkspaceRoot;


		fIgnoreOptionalProblemsField.setLabelText(NewWizardMessages.NewSourceFolderWizardPage_ignore_optional_problems_label);
		fIgnoreOptionalProblemsField.setSelection(false);

		fCreateModuleInfoJavaField= new SelectionButtonDialogField(SWT.CHECK);
		fCreateModuleInfoJavaField.setDialogFieldListener(adapter);
		fCreateModuleInfoJavaField.setLabelText(NewWizardMessages.NewSourceFolderWizardPage_create_module_info_java);
		fCreateModuleInfoJavaField.setSelection(false);

		fRootStatus= new StatusInfo();
		fProjectStatus= new StatusInfo();
	}

		String projPath= getProjectPath(selection);
		fProjectField.setText(projPath != null ? projPath : ""); //$NON-NLS-1$
		fRootDialogField.setText(""); //$NON-NLS-1$

		IDialogSettings dialogSettings= getDialogSettings();
		if (dialogSettings != null) {
			IDialogSettings section= dialogSettings.getSection(PAGE_NAME);
			if (section != null) {
				fCreateModuleInfoJavaField.setSelection(section.getBoolean(SETTINGS_CREATE_MODULE_INFO_JAVA));
			}
		}
	}

	private String getProjectPath(IStructuredSelection selection) {

		fRootDialogField.doFillIntoGrid(composite, 3);
		fExcludeInOthersFields.doFillIntoGrid(composite, 3);
		fIgnoreOptionalProblemsField.doFillIntoGrid(composite, 3);
		fCreateModuleInfoJavaField.doFillIntoGrid(composite, 3);

		int maxFieldWidth= convertWidthInCharsToPixels(40);
		LayoutUtil.setWidthHint(fProjectField.getTextControl(null), maxFieldWidth);

		} else if (field == fExcludeInOthersFields) {
			updateRootStatus();
		} else if (field == fIgnoreOptionalProblemsField) {
			updateRootStatus();
		} else if (field == fCreateModuleInfoJavaField) {
			updateRootStatus();
		}
		updateStatus(new IStatus[] { fProjectStatus, fRootStatus });

					IClasspathEntry curr= fEntries[i];
					if (curr.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
						if (path.equals(curr.getPath())) {
							fRootStatus.setError(NewWizardMessages.NewSourceFolderWizardPage_error_AlreadyExisting);
							if (!createModuleInfoJava) {
								fRootStatus.setError(NewWizardMessages.NewSourceFolderWizardPage_error_AlreadyExisting);
							}
							return;
						}
						if (projPath.equals(curr.getPath())) {

		}
	}

	/**
	 * Checks if the module-info.java file already exists in any package in the given package
	 * fragment root.
	 * 
	 * @param root the package fragment root
	 * @return <code>true</code> if module-info.java exists in any package in the given
	 *         <code>root</code>, <code>false</code> otherwise
	 */
	private boolean moduleInfoJavaAlreadyExists(IPackageFragmentRoot root) {
		try {
			for (IJavaElement pkgFragment : root.getChildren()) {
				if (((IPackageFragment) pkgFragment).getCompilationUnit(MODULE_INFO_JAVA_FILENAME).exists()) {
					return true;
				}
			}
		} catch (JavaModelException e) {
			// pretend that the file does not exist
		}
		return false;
	}

	private void insertAtEndOfCategory(IClasspathEntry entry, List<IClasspathEntry> entries) {
		int length= entries.size();
		IClasspathEntry[] elements= entries.toArray(new IClasspathEntry[length]);

		return fCreatedRoot;
	}

	/**
	 * @return <code>true</code> if module-info.java should be created, <code>false</code> otherwise
	 */
	private boolean isCreateModuleInfoJava() {
		return JavaModelUtil.is9OrHigher(fCurrJProject) && fCreateModuleInfoJavaField.isSelected();
	}

	public IResource getCorrespondingResource() {
		return fCurrJProject.getProject().getFolder(fRootDialogField.getText());
		if (isCreateModuleInfoJava()) {
			return folder.getFile(MODULE_INFO_JAVA_FILENAME);
		}
		return folder;
	}

	public void createPackageFragmentRoot(IProgressMonitor monitor) throws CoreException, InterruptedException {
		if (monitor == null) {
			monitor= new NullProgressMonitor();
		}
		monitor.beginTask(NewWizardMessages.NewSourceFolderWizardPage_operation, 3);
		try {
			IPath projPath= fCurrJProject.getProject().getFullPath();
			if (fOutputLocation.equals(projPath) && !fNewOutputLocation.equals(projPath)) {
				if (BuildPathsBlock.hasClassfiles(fCurrJProject.getProject())) {
					if (BuildPathsBlock.getRemoveOldBinariesQuery(getShell()).doQuery(false, projPath)) {
						BuildPathsBlock.removeOldClassfiles(fCurrJProject.getProject());
				IPath projPath= fCurrJProject.getProject().getFullPath();
				if (fOutputLocation.equals(projPath) && !fNewOutputLocation.equals(projPath)) {
					if (BuildPathsBlock.hasClassfiles(fCurrJProject.getProject())) {
						if (BuildPathsBlock.getRemoveOldBinariesQuery(getShell()).doQuery(false, projPath)) {
							BuildPathsBlock.removeOldClassfiles(fCurrJProject.getProject());
						}
					}
				}

				if (!folder.exists()) {
					CoreUtility.createFolder(folder, true, true, new SubProgressMonitor(monitor, 1));
				}
				if (monitor.isCanceled()) {
					throw new InterruptedException();
				}

				fCurrJProject.setRawClasspath(fNewEntries, fNewOutputLocation, new SubProgressMonitor(monitor, 2));

			} finally {
				monitor.done();
			}
		}

			String relPath= fRootDialogField.getText();
			// default package always exists
			IPackageFragment pack= fCreatedRoot.getPackageFragment(""); //$NON-NLS-1$
			String fileContent= JavaCore.createModuleFromPackageRoot(null, fCreatedRoot);
			InfoFilesUtil.createInfoJavaFile(MODULE_INFO_JAVA_FILENAME, fileContent, pack, monitor);
		}

			IFolder folder= fCurrJProject.getProject().getFolder(relPath);
			if (!folder.exists()) {
				CoreUtility.createFolder(folder, true, true, new SubProgressMonitor(monitor, 1));
			IDialogSettings section= dialogSettings.getSection(PAGE_NAME);
			if (section == null) {
				section= dialogSettings.addNewSection(PAGE_NAME);
			}
			if (monitor.isCanceled()) {
				throw new InterruptedException();
			}

			fCurrJProject.setRawClasspath(fNewEntries, fNewOutputLocation, new SubProgressMonitor(monitor, 2));

			fCreatedRoot= fCurrJProject.getPackageFragmentRoot(folder);
		} finally {
			monitor.done();
		}
	}





/*******************************************************************************
 * Copyright (c) 2000, 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * This is an implementation of an early-draft specification developed under the Java
 * Community Process (JCP) and is made available for testing and evaluation purposes
 * only. The code is not compatible with any specification of the JCP.
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation

	public static String NewSourceFolderWizardPage_operation;
	public static String NewSourceFolderWizardPage_exclude_label;
	public static String NewSourceFolderWizardPage_ignore_optional_problems_label;
	public static String NewSourceFolderWizardPage_create_module_info_java;
	public static String NewSourceFolderWizardPage_ChooseExistingRootDialog_title;
	public static String NewSourceFolderWizardPage_ChooseExistingRootDialog_description;
	public static String NewSourceFolderWizardPage_ChooseProjectDialog_title;




###############################################################################
# Copyright (c) 2000, 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
# http://www.eclipse.org/legal/epl-v10.html
#
# This is an implementation of an early-draft specification developed under the Java
# Community Process (JCP) and is made available for testing and evaluation purposes
# only. The code is not compatible with any specification of the JCP.
#
# Contributors:
#     IBM Corporation - initial API and implementation


NewSourceFolderWizardPage_exclude_label=&Update exclusion filters in other source folders to solve nesting
NewSourceFolderWizardPage_ignore_optional_problems_label=&Ignore optional compile problems
NewSourceFolderWizardPage_create_module_info_java=&Create module-info.java (9 or higher)

NewSourceFolderWizardPage_ChooseExistingRootDialog_title=Existing Folder Selection
NewSourceFolderWizardPage_ChooseExistingRootDialog_description=&Choose folder as source folder:

Return to bug 488748

Lines 6932-6935 Link Here

(-)a/org.eclipse.jdt.ui/plugin.xml (+25 lines)
6932	</activeWhen>	6932	</activeWhen>
6933	</projectConfigurator>	6933	</projectConfigurator>
6934	</extension>	6934	</extension>
		6935	<extension
		6936	point="org.eclipse.ui.popupMenus">
		6937	<objectContribution
		6938	objectClass="org.eclipse.core.resources.IProject"
		6939	adaptable="true"
		6940	id="org.eclipse.jdt.ui.create.module.info">
		6941	<visibility>
		6942	<and>
		6943	<objectState
		6944	name="projectNature"
		6945	value="org.eclipse.jdt.core.javanature"/>
		6946	<objectState
		6947	name="open"
		6948	value="true"/>
		6949	</and>
		6950	</visibility>
		6951	<action
		6952	label="%create.module.info.label"
		6953	class="org.eclipse.jdt.internal.ui.actions.CreateModuleInfoAction"
		6954	menubarPath="org.eclipse.ui.projectConfigure/additions"
		6955	enablesFor="1"
		6956	id="org.eclipse.jdt.ui.create.module.info.action">
		6957	</action>
		6958	</objectContribution>
		6959	</extension>
6935	</plugin>	6960	</plugin>

Added Link Here

(-)a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/CreateModuleInfoAction.java (+212 lines)
1	/*******************************************************************************
2	* Copyright (c) 2016 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* This is an implementation of an early-draft specification developed under the Java
9	* Community Process (JCP) and is made available for testing and evaluation purposes
10	* only. The code is not compatible with any specification of the JCP.
11	*
12	* Contributors:
13	* IBM Corporation - initial API and implementation
14	*******************************************************************************/
15	package org.eclipse.jdt.internal.ui.actions;
16
17	import java.util.ArrayList;
18	import java.util.Arrays;
19	import java.util.List;
20
21	import org.eclipse.swt.widgets.Display;
22
23	import org.eclipse.core.runtime.CoreException;
24	import org.eclipse.core.runtime.NullProgressMonitor;
25
26	import org.eclipse.core.resources.IFile;
27	import org.eclipse.core.resources.IFolder;
28	import org.eclipse.core.resources.IProject;
29	import org.eclipse.core.resources.IResource;
30
31	import org.eclipse.jface.action.IAction;
32	import org.eclipse.jface.dialogs.MessageDialog;
33	import org.eclipse.jface.viewers.ISelection;
34	import org.eclipse.jface.viewers.IStructuredSelection;
35
36	import org.eclipse.ui.IObjectActionDelegate;
37	import org.eclipse.ui.IWorkbenchPage;
38	import org.eclipse.ui.IWorkbenchPart;
39	import org.eclipse.ui.PartInitException;
40	import org.eclipse.ui.ide.IDE;
41	import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
42
43	import org.eclipse.jdt.core.IJavaProject;
44	import org.eclipse.jdt.core.IModuleDescription;
45	import org.eclipse.jdt.core.IModuleDescription.IModuleReference;
46	import org.eclipse.jdt.core.IModuleDescription.IPackageExport;
47	import org.eclipse.jdt.core.IPackageFragment;
48	import org.eclipse.jdt.core.IPackageFragmentRoot;
49	import org.eclipse.jdt.core.JavaCore;
50
51	import org.eclipse.jdt.internal.corext.util.InfoFilesUtil;
52	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
53	import org.eclipse.jdt.internal.corext.util.Messages;
54
55	import org.eclipse.jdt.internal.ui.JavaPlugin;
56
57	public class CreateModuleInfoAction implements IObjectActionDelegate {
58
59	private static final String MODULE_INFO_JAVA_FILENAME= JavaModelUtil.MODULE_INFO_JAVA;
60
61	private ISelection fSelection;
62
63	@Override
64	public void selectionChanged(IAction action, ISelection selection) {
65	fSelection= selection;
66	}
67
68	@Override
69	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
70	// not used
71	}
72
73	@Override
74	public void run(IAction action) {
75	IJavaProject javaProject= null;
76
77	if (fSelection instanceof IStructuredSelection) {
78	Object selectedElement= ((IStructuredSelection) fSelection).getFirstElement();
79
80	if (selectedElement instanceof IProject) {
81	javaProject= JavaCore.create((IProject) selectedElement);
82	} else if (selectedElement instanceof IJavaProject) {
83	javaProject= (IJavaProject) selectedElement;
84	} else {
85	return;
86	}
87
88	try {
89	if (!JavaModelUtil.is9OrHigher(javaProject)) {
90	MessageDialog.openError(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, ActionMessages.CreateModuleInfoAction_error_message_compliance);
91	return;
92	}
93
94	IPackageFragmentRoot[] packageFragmentRoots= javaProject.getPackageFragmentRoots();
95	List<IPackageFragmentRoot> packageFragmentRootsAsList= new ArrayList<>(Arrays.asList(packageFragmentRoots));
96	for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
97	IResource res= packageFragmentRoot.getCorrespondingResource();
98	if (res == null \|\| res.getType() != IResource.FOLDER \|\| packageFragmentRoot.getKind() != IPackageFragmentRoot.K_SOURCE) {
99	packageFragmentRootsAsList.remove(packageFragmentRoot);
100	}
101	}
102	packageFragmentRoots= packageFragmentRootsAsList.toArray(new IPackageFragmentRoot[packageFragmentRootsAsList.size()]);
103
104	if (packageFragmentRoots.length == 0) {
105	MessageDialog.openError(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, ActionMessages.CreateModuleInfoAction_error_message_no_source_folder);
106	return;
107	}
108
109	IPackageFragmentRoot targetPkgFragmentRoot= null;
110
111	for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
112	if (packageFragmentRoot.getPackageFragment("").getCompilationUnit(MODULE_INFO_JAVA_FILENAME).exists()) { //$NON-NLS-1$
113	String message= Messages.format(ActionMessages.CreateModuleInfoAction_question_message_overwrite_module_info, packageFragmentRoot.getElementName());
114	boolean overwrite= MessageDialog.openQuestion(getDisplay().getActiveShell(), ActionMessages.CreateModuleInfoAction_error_title, message);
115	if (!overwrite) {
116	return;
117	}
118	targetPkgFragmentRoot= packageFragmentRoot;
119	break;
120	}
121	}
122
123	if (targetPkgFragmentRoot == null) {
124	targetPkgFragmentRoot= packageFragmentRoots[0];
125	}
126
127	createAndOpenFile(targetPkgFragmentRoot);
128
129	} catch (CoreException e) {
130	JavaPlugin.log(e);
131	}
132	}
133	}
134
135	private void createAndOpenFile(IPackageFragmentRoot pkgFragmentRoot) throws CoreException {
136	createModuleInfoJava(pkgFragmentRoot);
137
138	IFile file= ((IFolder) pkgFragmentRoot.getCorrespondingResource()).getFile(MODULE_INFO_JAVA_FILENAME);
139	if (file.exists()) {
140	BasicNewResourceWizard.selectAndReveal(file, JavaPlugin.getActiveWorkbenchWindow());
141	openFile(file);
142	}
143	}
144
145	private void createModuleInfoJava(IPackageFragmentRoot pkgFragmentRoot) throws CoreException {
146	IModuleDescription module = JavaCore.createModuleFromPackageRoot(null, pkgFragmentRoot.getJavaProject());
147	if (module != null) {
148	StringBuilder fileContent= new StringBuilder();
149	fileContent.append("module "); //$NON-NLS-1$
150	fileContent.append(module.getElementName());
151	fileContent.append(" {"); //$NON-NLS-1$
152	fileContent.append('\n');
153	IPackageExport[] exportedPackages= module.getExportedPackages();
154	for (IPackageExport iPackageExport : exportedPackages) {
155	fileContent.append('\t');
156	fileContent.append("exports "); //$NON-NLS-1$
157	fileContent.append(iPackageExport.getPackageName());
158	String[] targets = iPackageExport.getTargetModules();
159	if (targets != null && targets.length > 0) {
160	fileContent.append(" to "); //$NON-NLS-1$
161	}
162	for (int i= 0; i < targets.length; i++) {
163	fileContent.append(targets[i]);
164	if (i < targets.length - 1) {
165	fileContent.append(',');
166	}
167	}
168	fileContent.append(";\n"); //$NON-NLS-1$
169	}
170	IModuleReference[] requiredModules= module.getRequiredModules();
171	for (IModuleReference iModuleReference : requiredModules) {
172	fileContent.append('\t');
173	fileContent.append("requires "); //$NON-NLS-1$
174	if (iModuleReference.isPublic()) {
175	fileContent.append("public "); //$NON-NLS-1$
176	}
177	fileContent.append(iModuleReference.getModuleName());
178	fileContent.append(';');
179	fileContent.append('\n');
180	}
181	fileContent.append('}');
182	IPackageFragment defaultPkg= pkgFragmentRoot.getPackageFragment(""); //$NON-NLS-1$
183	InfoFilesUtil.createInfoJavaFile(MODULE_INFO_JAVA_FILENAME, fileContent.toString(), defaultPkg, new NullProgressMonitor());
184	}
185	}
186
187	private void openFile(final IFile file) {
188	final IWorkbenchPage activePage= JavaPlugin.getActivePage();
189	if (activePage != null) {
190	final Display display= getDisplay();
191	if (display != null) {
192	display.asyncExec(new Runnable() {
193	@Override
194	public void run() {
195	try {
196	IDE.openEditor(activePage, file, true);
197	} catch (PartInitException e) {
198	JavaPlugin.log(e);
199	}
200	}
201	});
202	}
203	}
204	}
205
206	private Display getDisplay() {
207	Display display= Display.getCurrent();
208	if (display == null)
209	display= Display.getDefault();
210	return display;
211	}
212	}