Eclipse 3.x commands update

vogella · vogella · commit 929ec09f5461 · 2014-11-04T17:42:09.000+01:00
diff --git a/de.vogella.rcp.intro.commands.popup/META-INF/MANIFEST.MF b/de.vogella.rcp.intro.commands.popup/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Popup Plug-in
 Bundle-SymbolicName: de.vogella.rcp.intro.commands.popup; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: de.vogella.rcp.intro.commands.popup.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Activator.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Activator.java
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Application.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Application.java
@@ -14,6 +14,7 @@ public class Application implements IApplication {
 	/* (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
 	 */
+	@Override
 	public Object start(IApplicationContext context) {
 		Display display = PlatformUI.createDisplay();
 		try {
@@ -30,12 +31,14 @@ public Object start(IApplicationContext context) {
 	/* (non-Javadoc)
 	 * @see org.eclipse.equinox.app.IApplication#stop()
 	 */
+	@Override
 	public void stop() {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
 		if (workbench == null)
 			return;
 		final Display display = workbench.getDisplay();
 		display.syncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (!display.isDisposed())
 					workbench.close();
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationActionBarAdvisor.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationActionBarAdvisor.java
@@ -26,6 +26,7 @@ public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
 		super(configurer);
 	}
 
+	@Override
 	protected void makeActions(final IWorkbenchWindow window) {
 		// Creates the actions and registers them.
 		// Registering is needed to ensure that key bindings work.
@@ -38,6 +39,7 @@ protected void makeActions(final IWorkbenchWindow window) {
 		register(exitAction);
 	}
 
+	@Override
 	protected void fillMenuBar(IMenuManager menuBar) {
 		MenuManager fileMenu = new MenuManager("&File",
 				IWorkbenchActionConstants.M_FILE);
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationWorkbenchAdvisor.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationWorkbenchAdvisor.java
@@ -8,11 +8,13 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
 	private static final String PERSPECTIVE_ID = "de.vogella.rcp.intro.commands.popup.perspective";
 
+	@Override
 	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
 			IWorkbenchWindowConfigurer configurer) {
 		return new ApplicationWorkbenchWindowAdvisor(configurer);
 	}
 
+	@Override
 	public String getInitialWindowPerspectiveId() {
 		return PERSPECTIVE_ID;
 	}
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationWorkbenchWindowAdvisor.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/ApplicationWorkbenchWindowAdvisor.java
@@ -12,11 +12,13 @@ public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)
 		super(configurer);
 	}
 
+	@Override
 	public ActionBarAdvisor createActionBarAdvisor(
 			IActionBarConfigurer configurer) {
 		return new ApplicationActionBarAdvisor(configurer);
 	}
 
+	@Override
 	public void preWindowOpen() {
 		IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
 		configurer.setInitialSize(new Point(400, 300));
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Perspective.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/Perspective.java
@@ -5,6 +5,7 @@
 
 public class Perspective implements IPerspectiveFactory {
 
+	@Override
 	public void createInitialLayout(IPageLayout layout) {
 		String editorArea = layout.getEditorArea();
 		layout.setEditorAreaVisible(false);
diff --git a/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/View.java b/de.vogella.rcp.intro.commands.popup/src/de/vogella/rcp/intro/commands/popup/View.java
@@ -1,11 +1,12 @@
 package de.vogella.rcp.intro.commands.popup;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -15,70 +16,48 @@
 import org.eclipse.ui.part.ViewPart;
 
 public class View extends ViewPart {
-	public static final String ID = "de.vogella.rcp.intro.commands.popup.view";
 
 	private TableViewer viewer;
 
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-
-		public Object[] getElements(Object parent) {
-			return new String[] { "One", "Two", "Three" };
-		}
-	}
-
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-
+	class ViewLabelProvider extends LabelProvider {
+		@Override
 		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(
-					ISharedImages.IMG_OBJ_ELEMENT);
+			return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
 		}
 	}
 
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
+	@Override
 	public void createPartControl(Composite parent) {
-		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL);
-		viewer.setContentProvider(new ViewContentProvider());
+		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
 		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setInput(getViewSite());
-		// This is new code
-		// First we create a menu Manager
+		
+		viewer.setInput(getData());
+		// Create a menu manager and create context menu
 		MenuManager menuManager = new MenuManager();
 		Menu menu = menuManager.createContextMenu(viewer.getTable());
-		// Set the MenuManager
+		// set the menu on the SWT widget
 		viewer.getTable().setMenu(menu);
+		// register the menu with the framework
 		getSite().registerContextMenu(menuManager, viewer);
-		// Make the selection available
+
+		// make the viewer selection available
 		getSite().setSelectionProvider(viewer);
 	}
 
 	/**
 	 * Passing the focus request to the viewer's control.
 	 */
+	@Override
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
+
+	private List<String> getData() {
+		List<String> list = new ArrayList<String>();
+		list.add("One");
+		list.add("Two");
+		list.add("Three");
+		return list;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {`
`26`	`26`	`super(configurer);`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ @Override`
`29`	`30`	`protected void makeActions(final IWorkbenchWindow window) {`
`30`	`31`	`// Creates the actions and registers them.`
`31`	`32`	`// Registering is needed to ensure that key bindings work.`
`@@ -38,6 +39,7 @@ protected void makeActions(final IWorkbenchWindow window) {`
`38`	`39`	`register(exitAction);`
`39`	`40`	`}`
`40`	`41`
	`42`	`+ @Override`
`41`	`43`	`protected void fillMenuBar(IMenuManager menuBar) {`
`42`	`44`	`MenuManager fileMenu = new MenuManager("&File",`
`43`	`45`	`IWorkbenchActionConstants.M_FILE);`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,13 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {`
`8`	`8`
`9`	`9`	`private static final String PERSPECTIVE_ID = "de.vogella.rcp.intro.commands.popup.perspective";`
`10`	`10`
	`11`	`+ @Override`
`11`	`12`	`public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(`
`12`	`13`	`IWorkbenchWindowConfigurer configurer) {`
`13`	`14`	`return new ApplicationWorkbenchWindowAdvisor(configurer);`
`14`	`15`	`}`
`15`	`16`
	`17`	`+ @Override`
`16`	`18`	`public String getInitialWindowPerspectiveId() {`
`17`	`19`	`return PERSPECTIVE_ID;`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,13 @@ public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)`
`12`	`12`	`super(configurer);`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ @Override`
`15`	`16`	`public ActionBarAdvisor createActionBarAdvisor(`
`16`	`17`	`IActionBarConfigurer configurer) {`
`17`	`18`	`return new ApplicationActionBarAdvisor(configurer);`
`18`	`19`	`}`
`19`	`20`
	`21`	`+ @Override`
`20`	`22`	`public void preWindowOpen() {`
`21`	`23`	`IWorkbenchWindowConfigurer configurer = getWindowConfigurer();`
`22`	`24`	`configurer.setInitialSize(new Point(400, 300));`