Fix initial source folder field in wizards

Author: zarechenskiy

kotlin-eclipse-ui/src/org/jetbrains/kotlin/wizards/NewUnitWizardPage.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,6 @@
 import static org.jetbrains.kotlin.wizards.SWTWizardUtils.createText;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -134,12 +130,12 @@ public void modifyText(ModifyEvent e) {
         return name;
     }
 
-    private void setSourceDirByFolderName(String folderName) {
+    private void setSourceDirByFolderName(String srcFolder) {
         try {
             sourceDir = null;
             for (IJavaProject jp : JavaCore.create(getWorkspaceRoot()).getJavaProjects()) {
                 for (IPackageFragmentRoot pfr : jp.getPackageFragmentRoots()) {
-                    if (pfr.getPath().toPortableString().equals(folderName)) {
+                    if (pfr.getPath().toPortableString().equals(srcFolder)) {
                         sourceDir = pfr;
                         return;
                     }
@@ -153,8 +149,9 @@ private void setSourceDirByFolderName(String folderName) {
     private Text createSourceFolderField(Composite parent) {
         createLabel(parent, SOURCE_FOLDER_LABEL_TITLE);
 
-        String sourceFolderFromSelection = getSourceFolderFromSelection();
-        setSourceDirByFolderName(sourceFolderFromSelection);
+        IPackageFragmentRoot srcFolder = WizardUtilsKt.getSourceFolderBySelection(selection);
+        String sourceFolderFromSelection = srcFolder != null ? srcFolder.getPath().toOSString() : DEFAULT_SOURCE_FOLDER;
+        sourceDir = srcFolder;
 
         final Text folder = createText(parent, sourceFolderFromSelection);
         folder.addModifyListener(new ModifyListener() {
@@ -186,7 +183,8 @@ public void widgetSelected(SelectionEvent e) {
     private Text createPackageField(Composite parent) {
         createLabel(parent, PACKAGE_LABEL_TITLE);
 
-        String packageFromSelection = getPackageFromSelection();
+        IPackageFragment fragment = WizardUtilsKt.getPackageBySelection(selection);
+        String packageFromSelection = fragment != null ? fragment.getElementName() : DEFAULT_PACKAGE;
         packageName = packageFromSelection;
 
         final Text pkg = createText(parent, packageFromSelection);
@@ -232,105 +230,6 @@ public void widgetSelected(SelectionEvent e) {
         return pkg;
     }
 
-    private String getSourceFolderFromSelection() {
-        String defaultFolder = DEFAULT_SOURCE_FOLDER;
-        
-        if (selection.isEmpty()) {
-            return defaultFolder;
-        }
-        
-        Object selectedObject = selection.getFirstElement();
-        
-        if (selectedObject instanceof IJavaElement) {
-            IJavaElement selectedJavaElement = (IJavaElement) selectedObject;
-            switch (selectedJavaElement.getElementType()) {
-            case IJavaElement.JAVA_PROJECT:
-                return getDefaultSrcByProject((IJavaProject) selectedJavaElement);
-                
-            case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-                return selectedJavaElement.getPath().toPortableString();
-                
-            case IJavaElement.PACKAGE_FRAGMENT:
-            case IJavaElement.COMPILATION_UNIT:
-                return selectedJavaElement.getPath().uptoSegment(2).toPortableString();
-            }
-        } else if (selectedObject instanceof IResource) {
-            IResource selectedResource = (IResource) selectedObject;
-            switch (selectedResource.getType()) {
-            case IResource.FOLDER:
-                return getDefaultSrcByProject(JavaCore.create(selectedResource.getProject()));
-                
-            case IResource.FILE:
-                return selectedResource.getFullPath().uptoSegment(2).toPortableString();
-            }
-        }
-        
-        return defaultFolder;
-    }
-    
-    private String getPackageFromSelection() {
-        String defaultPackage = DEFAULT_PACKAGE;
-        
-        if (selection.isEmpty()) {
-            return defaultPackage;
-        }
-        
-        Object selectedObject = selection.getFirstElement();
-        
-        if (selectedObject instanceof IJavaElement) {
-            IJavaElement selectedJavaElement = (IJavaElement) selectedObject;
-            switch (selectedJavaElement.getElementType()) {
-            case IJavaElement.PACKAGE_FRAGMENT:
-                return selectedJavaElement.getElementName();
-                
-            case IJavaElement.COMPILATION_UNIT:
-                try {
-                    return selectedJavaElement.getJavaProject().findPackageFragment(
-                            selectedJavaElement.getPath().makeAbsolute().removeLastSegments(1)).getElementName();
-                } catch (Exception e) {
-                    KotlinLogger.logAndThrow(e);
-                }
-                break;
-            }
-        } else if (selectedObject instanceof IResource) {
-            IResource selectedResource = (IResource) selectedObject;
-            switch (selectedResource.getType()) {
-            case IResource.FILE:
-                try {
-                    return JavaCore.create(selectedResource.getProject()).findPackageFragment(
-                            selectedResource.getFullPath().makeAbsolute().removeLastSegments(1)).getElementName();
-                } catch (Exception e) {
-                    KotlinLogger.logAndThrow(e);
-                }
-                break;
-            }
-        }
-        
-        return defaultPackage;
-    }
-    
-    private String getDefaultSrcByProject(IJavaProject javaProject) {
-        String destFolder = javaProject.getPath().toPortableString();
-        
-        IClasspathEntry[] classpathEntries = null;
-        try {
-            classpathEntries = javaProject.getRawClasspath();
-        } catch (JavaModelException e) {
-            KotlinLogger.logAndThrow(e);
-            
-            return destFolder;
-        }
-        
-        for (IClasspathEntry classpathEntry : classpathEntries) {
-            if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-                destFolder += IPath.SEPARATOR + classpathEntry.getPath().segment(1);
-                break;
-            }
-        }
-        
-        return destFolder;
-    }
-    
     @Override
     protected String createErrorMessage() {
         if (sourceDir != null && packageNameIsLegal()) {

kotlin-eclipse-ui/src/org/jetbrains/kotlin/wizards/wizardUtils.kt

@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *******************************************************************************/
+package org.jetbrains.kotlin.wizards
+
+import org.eclipse.jface.viewers.IStructuredSelection
+import org.jetbrains.kotlin.core.utils.sourceFolders
+import org.eclipse.jdt.core.IJavaProject
+import org.eclipse.jdt.core.IPackageFragmentRoot
+import org.eclipse.jdt.core.IPackageFragment
+import org.eclipse.jdt.core.ICompilationUnit
+import org.eclipse.core.resources.IFile
+import org.eclipse.jdt.core.JavaCore
+import org.eclipse.core.resources.IResource
+
+fun getSourceFolderBySelection(selection: IStructuredSelection): IPackageFragmentRoot? {
+    if (selection.isEmpty) return null
+    
+    val element = selection.firstElement
+    return when (element) {
+        is IPackageFragmentRoot -> element
+        is IJavaProject -> element.sourceFolders.firstOrNull()
+        is IPackageFragment -> element.parent as IPackageFragmentRoot
+        is ICompilationUnit -> element.parent.parent as IPackageFragmentRoot
+        is IResource -> getPackageBySelection(selection)?.parent as? IPackageFragmentRoot
+        else -> null
+    }
+}
+
+fun getPackageBySelection(selection: IStructuredSelection): IPackageFragment? {
+    if (selection.isEmpty) return null
+    
+    val element = selection.firstElement
+    return when (element) {
+        is IPackageFragment -> element
+        is ICompilationUnit -> element.parent as IPackageFragment
+        is IResource -> {
+            val javaProject = JavaCore.create(element.project)
+            javaProject.findPackageFragment(element.getFullPath().removeLastSegments(1))
+        }
+        else -> null
+    }
+}