diff options
Diffstat (limited to 'changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java')
-rw-r--r-- | changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java index 494afc2fdd..679b8b90d5 100644 --- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java +++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/actions/ChangeLogAction.java @@ -73,11 +73,6 @@ public abstract class ChangeLogAction extends Action { extensionManager = ChangeLogExtensionManager.getExtensionManager(); } - public ChangeLogAction(String name) { - super(name); - extensionManager = ChangeLogExtensionManager.getExtensionManager(); - } - protected void reportErr(String msg, Exception e) { ChangelogPlugin.getDefault().getLog().log( new Status(IStatus.ERROR, ChangelogPlugin.PLUGIN_ID, IStatus.ERROR, msg, e)); @@ -101,12 +96,6 @@ public abstract class ChangeLogAction extends Action { } } - protected String returnQualifedEditor(Class<?> ClassName) { - return ClassName.toString().substring( - ClassName.getPackage().toString().length() - 1, - ClassName.toString().length()); - } - protected IFile createChangeLog(IPath changelog) { IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot(); IWorkbench ws = PlatformUI.getWorkbench(); @@ -289,24 +278,20 @@ public abstract class ChangeLogAction extends Action { IEditorInput cc = null; String WorkspaceRoot; - try { - IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot(); - WorkspaceRoot = myWorkspaceRoot.getLocation().toOSString(); - - if (currentEditor instanceof MultiPageEditorPart) { - Object ed = ((MultiPageEditorPart) currentEditor).getSelectedPage(); - if (ed instanceof IEditorPart) - cc = ((IEditorPart) ed).getEditorInput(); - if (cc instanceof FileEditorInput) - return (appendRoot) ? WorkspaceRoot + ((FileEditorInput) cc).getFile().getFullPath().toOSString() : - ((FileEditorInput) cc).getFile().getFullPath().toOSString(); - } - - cc = currentEditor.getEditorInput(); - - } catch(Exception e) { - return ""; + IWorkspaceRoot myWorkspaceRoot = getWorkspaceRoot(); + WorkspaceRoot = myWorkspaceRoot.getLocation().toOSString(); + + if (currentEditor instanceof MultiPageEditorPart) { + Object ed = ((MultiPageEditorPart) currentEditor).getSelectedPage(); + if (ed instanceof IEditorPart) + cc = ((IEditorPart) ed).getEditorInput(); + if (cc instanceof FileEditorInput) + return (appendRoot) ? WorkspaceRoot + ((FileEditorInput) cc).getFile().getFullPath().toOSString() : + ((FileEditorInput) cc).getFile().getFullPath().toOSString(); } + + cc = currentEditor.getEditorInput(); + if (cc == null) return ""; |