diff --git a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target index cb4765e17b..e8cf94f96c 100644 --- a/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target +++ b/dev/org.eclipse.php.target.current/org.eclipse.php.target.current.target @@ -19,7 +19,7 @@ - + @@ -37,6 +37,11 @@ + + + + + @@ -75,5 +80,5 @@ - + diff --git a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target index 7ebd8495b8..35c083ffc4 100644 --- a/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target +++ b/dev/org.eclipse.php.target.next/org.eclipse.php.target.next.target @@ -24,7 +24,7 @@ - + @@ -44,6 +44,11 @@ + + + + + @@ -83,5 +88,5 @@ - + diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/phar/wizard/WizardPharFileResourceImportPage1.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/phar/wizard/WizardPharFileResourceImportPage1.java index 27ca8d91df..1c27d8ead1 100644 --- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/phar/wizard/WizardPharFileResourceImportPage1.java +++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/phar/wizard/WizardPharFileResourceImportPage1.java @@ -83,7 +83,7 @@ public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelec public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelection selection, String[] fileImportMask) { - super("zipFileImportPage1", aWorkbench, selection); //$NON-NLS-1$ + super("zipFileImportPage1", selection); //$NON-NLS-1$ setTitle(PharImportMessages.ArchiveExport_exportTitle); setDescription(PharImportMessages.ArchiveImport_description); @@ -96,8 +96,8 @@ public WizardPharFileResourceImportPage1(IWorkbench aWorkbench, IStructuredSelec } /** - * Called when the user presses the Cancel button. Return a boolean indicating - * permission to close the wizard. + * Called when the user presses the Cancel button. Return a boolean + * indicating permission to close the wizard. * * @return boolean */ @@ -117,8 +117,8 @@ public void createControl(Composite parent) { } /** - * Create the options specification widgets. There is only one in this case so - * create no group. + * Create the options specification widgets. There is only one in this case + * so create no group. * * @param parent * org.eclipse.swt.widgets.Composite @@ -175,8 +175,8 @@ private PharFile getSpecifiedPharSourceFile(String fileName) { } /** - * Answer a boolean indicating whether the specified source currently exists and - * is valid (ie.- proper format) + * Answer a boolean indicating whether the specified source currently exists + * and is valid (ie.- proper format) */ private boolean ensureZipSourceIsValid() { ZipFile specifiedFile = getSpecifiedZipSourceFile(); @@ -203,8 +203,8 @@ private boolean ensurePharSourceIsValid() { } /** - * Answer a boolean indicating whether the specified source currently exists and - * is valid (ie.- proper format) + * Answer a boolean indicating whether the specified source currently exists + * and is valid (ie.- proper format) */ @Override protected boolean ensureSourceIsValid() { @@ -218,9 +218,9 @@ protected boolean ensureSourceIsValid() { } /** - * The Finish button was pressed. Try to do the required work now and answer a - * boolean indicating success. If false is returned then the wizard - * will not close. + * The Finish button was pressed. Try to do the required work now and answer + * a boolean indicating success. If false is returned then the + * wizard will not close. * * @return boolean */ @@ -245,8 +245,8 @@ private void disposeStructureProvider() { } /** - * Returns a content provider for FileSystemElements that returns - * only files as children. + * Returns a content provider for FileSystemElements that + * returns only files as children. */ @Override protected ITreeContentProvider getFileProvider() { @@ -300,8 +300,8 @@ protected MinimizedFileSystemElement getFileSystemTree() { } /** - * Returns a content provider for FileSystemElements that returns - * only folders as children. + * Returns a content provider for FileSystemElements that + * returns only folders as children. */ @Override protected ITreeContentProvider getFolderProvider() { @@ -334,7 +334,8 @@ public boolean hasChildren(Object o) { } /** - * Answer the string to display as the label for the source specification field + * Answer the string to display as the label for the source specification + * field */ @Override protected String getSourceLabel() { @@ -404,7 +405,8 @@ private TarFile getSpecifiedTarSourceFile(String fileName) { } /** - * Open a FileDialog so that the user can specify the source file to import from + * Open a FileDialog so that the user can specify the source file to import + * from */ @Override protected void handleSourceBrowseButtonPressed() { @@ -467,8 +469,8 @@ protected void initializeOperation(ImportOperation op) { } /** - * Opens a file selection dialog and returns a string representing the selected - * file, or null if the dialog was canceled. + * Opens a file selection dialog and returns a string representing the + * selected file, or null if the dialog was canceled. */ protected String queryZipFileToImport() { FileDialog dialog = new FileDialog(sourceNameField.getShell(), SWT.OPEN | SWT.SHEET); @@ -495,8 +497,8 @@ protected void resetSelection() { } /** - * Use the dialog store to restore widget values to the values that they held - * last time this wizard was used to completion + * Use the dialog store to restore widget values to the values that they + * held last time this wizard was used to completion */ @Override protected void restoreWidgetValues() { @@ -521,9 +523,9 @@ protected void restoreWidgetValues() { * Since Finish was pressed, write widget values to the dialog store so that * they will persist into the next invocation of this wizard page. * - * Note that this method is identical to the one that appears in the superclass. - * This is necessary because proper overriding of instance variables is not - * occurring. + * Note that this method is identical to the one that appears in the + * superclass. This is necessary because proper overriding of instance + * variables is not occurring. */ @Override protected void saveWidgetValues() { diff --git a/pom.xml b/pom.xml index 80b278b4c2..5ebbf92ca1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ - 4.0.6 + 4.0.7 1.8 true -server @@ -28,8 +28,8 @@ https://sonarcloud.io ${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.ui.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.composer.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.composer.api.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.formatter.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.profile.core.tests/target/surefire-reports,${maven.multiModuleProjectDirectory}/tests/org.eclipse.php.refactoring.core.tests/target/surefire-reports org.eclipse.php.core.performance.tests,org.eclipse.php,features,org.eclipse.php.repository,org.eclipse.php.core.parser - 17 - 17 + 21 + 21 UTF-8 scm:git:https://github.com/eclipse/pdt.git