Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2017-03-17 09:14:04 -0400
committerAlexander Kurtakov2017-03-17 09:36:25 -0400
commitaf77115bc05a9045cdf9c3f7a8aed01de471a48b (patch)
tree3a7e3786deb4bed6bb20c28bfbb38986d0db940b
parent7e3faeaa6acb33aeedc4d5ae6ea3a02072fdd1a6 (diff)
downloadorg.eclipse.linuxtools-af77115bc05a9045cdf9c3f7a8aed01de471a48b.tar.gz
org.eclipse.linuxtools-af77115bc05a9045cdf9c3f7a8aed01de471a48b.tar.xz
org.eclipse.linuxtools-af77115bc05a9045cdf9c3f7a8aed01de471a48b.zip
systemtap: Move classes used in ui.ide bundle to it.
This is first step in killing the useless systemtap.ui.editor bundle that is simply creating noise. Change-Id: I8ae7de0d776b3f0cb9609b2cd2b5c40ca4674469 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/93281 Tested-by: Hudson CI
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF5
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties3
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties6
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.xml43
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/internal/systemtap/ui/editor/localization.properties3
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleEditor.java2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/icons/actions/file/open_wiz.gifbin0 -> 216 bytes
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties3
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml24
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDESessionSettings.java1
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/NewFileHandler.java (renamed from systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/NewFileHandler.java)5
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/OpenFileHandler.java (renamed from systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/OpenFileHandler.java)8
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/DefinitionHandler.java4
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties5
15 files changed, 43 insertions, 71 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
index 9a1c748e4e..faa8a12c11 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.editor;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse
- .linuxtools.systemtap.ui.editor.handlers.file
+Export-Package: org.eclipse.linuxtools.systemtap.ui.editor
Require-Bundle: org.eclipse.core.filesystem,
org.eclipse.core.runtime,
org.eclipse.jface.text,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties
index 085b7349ad..774b92c465 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties
@@ -1,6 +1,5 @@
source.. = src/
-bin.includes = plugin.xml,\
- META-INF/,\
+bin.includes = META-INF/,\
icons/,\
.,\
about.html,\
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties
index 46fde932e1..22ed30610a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties
@@ -1,8 +1,2 @@
bundleName=SystemTap Script Editor
bundleProvider=Eclipse Linux Tools
-
-category.file.name=File
-category.file.desc=File Commands
-
-command.open.name=Open SystemTap File...
-command.open.desc=Open a SystemTap file \ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.xml
deleted file mode 100644
index d51c61962a..0000000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.ui.commands">
- <command
- name="%command.open.name"
- description="%command.open.desc"
- categoryId="org.eclipse.linuxtools.systemtap.ui.editor.category.file"
- id="org.eclipse.linuxtools.systemtap.ui.editor.commands.file.OpenFileCommand"/>
- <category
- name="%category.file.name"
- description="%category.file.desc"
- id="org.eclipse.linuxtools.systemtap.ui.editor.category.file"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.linuxtools.systemtap.ui.editor.handlers.file.OpenFileHandler"
- commandId="org.eclipse.linuxtools.systemtap.ui.editor.commands.file.OpenFileCommand">
- <activeWhen>
- <with
- variable="activeWorkbenchWindow.activePerspective">
- <equals value="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective"/>
- </with>
- </activeWhen>
- </handler>
- </extension>
-
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution locationURI="toolbar:org.eclipse.ui.workbench.file?before=save">
- <command
- commandId="org.eclipse.linuxtools.systemtap.ui.editor.commands.file.OpenFileCommand"
- icon="icons/actions/file/open_wiz.gif"
- label="%command.open.name">
- <visibleWhen checkEnabled="true"/>
- </command>
- </menuContribution>
- </extension>
-
-</plugin>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
index 65336102c8..5f653f147f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.editor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools SystemTap Script Editor Plug-In</name>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/internal/systemtap/ui/editor/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/internal/systemtap/ui/editor/localization.properties
index ab355d9e34..c73828dfeb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/internal/systemtap/ui/editor/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/internal/systemtap/ui/editor/localization.properties
@@ -1,7 +1,4 @@
PathEditorInput.Untitled=untitled
-OpenFileHandler.Problem=Problem
-OpenFileHandler.ProblemMessage=An error occurred when opening the file.
-OpenFileHandler.OpenFile=Open File
NewFileHandler.NewFile=New File
SimpleDocumentProvider.errorCreatingFile=Error when saving file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleEditor.java
index eb740d76a5..e630807c69 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleEditor.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/SimpleEditor.java
@@ -188,7 +188,7 @@ public class SimpleEditor extends TextEditor {
private static File queryFile() {
FileDialog dialog= new FileDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.SAVE);
- dialog.setText(Localization.getString("NewFileAction.NewFile")); //$NON-NLS-1$
+ dialog.setText(Localization.getString("NewFileHandler.NewFile")); //$NON-NLS-1$
String path= dialog.open();
if (path != null && !path.isEmpty()) {
return new File(path);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/icons/actions/file/open_wiz.gif b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/icons/actions/file/open_wiz.gif
new file mode 100644
index 0000000000..51e703b1b9
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/icons/actions/file/open_wiz.gif
Binary files differ
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
index 65f83c26bb..183926a884 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
@@ -26,6 +26,9 @@ category.tapset.desc=Tapset content actions
category.cfiles.name=C Actions
category.cfiles.desc=Actions applied to C/C++ files
+command.open.name=Open SystemTap File...
+command.open.desc=Open a SystemTap file
+
command.import.name=Import Tapset...
command.import.desc=Import tapset directory
command.run.name=SystemTap: Simple Run
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
index 45340f886f..f12f067d2e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
@@ -38,9 +38,16 @@
name="%view.probe.name">
</view>
</extension>
-
<extension
point="org.eclipse.ui.menus">
+ <menuContribution locationURI="toolbar:org.eclipse.ui.workbench.file?before=save">
+ <command
+ commandId="org.eclipse.linuxtools.internal.systemtap.ui.ide.OpenFileCommand"
+ icon="icons/actions/file/open_wiz.gif"
+ label="%command.open.name">
+ <visibleWhen checkEnabled="true"/>
+ </command>
+ </menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.linuxtools.internal.systemtap.ui.ide.views.FunctionBrowserView">
<command commandId="org.eclipse.ui.navigate.collapseAll"/>
@@ -339,6 +346,11 @@
id="org.eclipse.linuxtools.systemtap.ui.ide.category.file">
</category>
<command
+ name="%command.open.name"
+ description="%command.open.desc"
+ categoryId="org.eclipse.linuxtools.systemtap.ui.ide.category.file"
+ id="org.eclipse.linuxtools.internal.systemtap.ui.ide.OpenFileCommand"/>
+ <command
name="%command.import.name"
description="%command.import.desc"
categoryId="org.eclipse.linuxtools.systemtap.ui.ide.category.file"
@@ -430,6 +442,16 @@
<extension
point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.linuxtools.internal.systemtap.ui.ide.OpenFileHandler"
+ commandId="org.eclipse.linuxtools.internal.systemtap.ui.ide.OpenFileCommand">
+ <activeWhen>
+ <with
+ variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective"/>
+ </with>
+ </activeWhen>
+ </handler>
<handler
class="org.eclipse.linuxtools.internal.systemtap.ui.ide.handlers.RunScriptHandler"
commandId="org.eclipse.linuxtools.systemtap.ui.ide.RunScriptCommand">
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDESessionSettings.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDESessionSettings.java
index 3350df3310..14ef4dc636 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDESessionSettings.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDESessionSettings.java
@@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor;
-import org.eclipse.linuxtools.systemtap.ui.editor.handlers.file.NewFileHandler;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IWorkbenchPage;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/NewFileHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/NewFileHandler.java
index eb29237454..8e3b2fcd54 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/NewFileHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/NewFileHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2017 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
@@ -10,9 +10,8 @@
* Red Hat - migration to Handler implementation
*******************************************************************************/
-package org.eclipse.linuxtools.systemtap.ui.editor.handlers.file;
+package org.eclipse.linuxtools.internal.systemtap.ui.ide;
-import org.eclipse.linuxtools.internal.systemtap.ui.editor.Localization;
import org.eclipse.swt.SWT;
/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/OpenFileHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/OpenFileHandler.java
index 2ea3dd2a82..37e2b02b7f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/handlers/file/OpenFileHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/OpenFileHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2017 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
@@ -10,7 +10,7 @@
* Red Hat - migration to Handler implementation
*******************************************************************************/
-package org.eclipse.linuxtools.systemtap.ui.editor.handlers.file;
+package org.eclipse.linuxtools.internal.systemtap.ui.ide;
import java.io.File;
@@ -21,8 +21,6 @@ import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.linuxtools.internal.systemtap.ui.editor.EditorPlugin;
-import org.eclipse.linuxtools.internal.systemtap.ui.editor.Localization;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.ui.IWorkbenchPage;
@@ -87,7 +85,7 @@ public class OpenFileHandler extends AbstractHandler {
ErrorDialog.openError(window.getShell(),
Localization.getString("OpenFileHandler.Problem"), //$NON-NLS-1$
Localization.getString("OpenFileHandler.ProblemMessage"), //$NON-NLS-1$
- new Status(IStatus.ERROR, EditorPlugin.ID, e.getMessage(), e));
+ new Status(IStatus.ERROR, IDEPlugin.PLUGIN_ID, e.getMessage(), e));
}
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/DefinitionHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/DefinitionHandler.java
index 5c5af4608b..45c450f62f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/DefinitionHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/DefinitionHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 Red Hat, Inc.
+ * Copyright (c) 2014, 2017 Red Hat, Inc.
* 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
@@ -20,10 +20,10 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.CommentRemover;
+import org.eclipse.linuxtools.internal.systemtap.ui.ide.OpenFileHandler;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.structures.nodedata.ISearchableNode;
import org.eclipse.linuxtools.systemtap.structures.TreeDefinitionNode;
-import org.eclipse.linuxtools.systemtap.ui.editor.handlers.file.OpenFileHandler;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties
index 05284d800c..a33794ba1a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/localization.properties
@@ -71,3 +71,8 @@ BrowserView.TryRefresh=Refresh to update contents.
ToggleComment_error_title=Comment/Uncomment
ToggleComment_error_message=An error occurred while commenting/uncommenting.
+
+NewFileHandler.NewFile=New File
+OpenFileHandler.Problem=Problem
+OpenFileHandler.ProblemMessage=An error occurred when opening the file.
+OpenFileHandler.OpenFile=Open File

Back to the top