diff options
| author | bvosburgh | 2011-02-22 17:58:58 +0000 |
|---|---|---|
| committer | bvosburgh | 2011-02-22 17:58:58 +0000 |
| commit | 31562bbe72e456f03da6a361345caf51f62f2cef (patch) | |
| tree | bf198152ebfb18eeb4de4b2fee8371d6959acdbb /common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse | |
| parent | 5873c7fa478184891fdb39ddcba3e31de7ee3c63 (diff) | |
| download | webtools.dali-31562bbe72e456f03da6a361345caf51f62f2cef.tar.gz webtools.dali-31562bbe72e456f03da6a361345caf51f62f2cef.tar.xz webtools.dali-31562bbe72e456f03da6a361345caf51f62f2cef.zip | |
clean up x-friends, access rules, etc.
Diffstat (limited to 'common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse')
2 files changed, 13 insertions, 4 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java index cbc61848f7..e2eb246e3e 100644 --- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java +++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java @@ -29,7 +29,7 @@ import org.eclipse.jdt.ui.wizards.NewClassWizardPage; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jpt.common.core.internal.utility.jdt.JDTTools; +import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.ui.JptCommonUiPlugin; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWrapper; @@ -357,7 +357,12 @@ public abstract class ClassChooserPane<T extends Model> extends ChooserPane<T> } protected IPackageFragmentRoot getPackageFragmentRoot() { - return JDTTools.getCodeCompletionContextRoot(getJavaProject()); + try { + return this.getJavaProject().getPackageFragmentRoots()[0]; + } catch (JavaModelException ex) { + JptCommonUiPlugin.log(ex); + return null; + } } @Override diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java index cc9453c147..c88726ca65 100644 --- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java +++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java @@ -19,7 +19,6 @@ import org.eclipse.jdt.ui.JavaElementLabelProvider; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.common.core.internal.utility.jdt.JDTTools; import org.eclipse.jpt.common.ui.JptCommonUiPlugin; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWrapper; @@ -226,7 +225,12 @@ public abstract class PackageChooserPane<T extends Model> extends ChooserPane<T> } protected IPackageFragmentRoot getPackageFragmentRoot() { - return JDTTools.getCodeCompletionContextRoot(getJavaProject()); + try { + return this.getJavaProject().getPackageFragmentRoots()[0]; + } catch (JavaModelException ex) { + JptCommonUiPlugin.log(ex); + return null; + } } @Override |