ADD: Double click in the status line open the Team Message view

mmornati · Apr 5, 2012 · 078153d · 078153d
1 parent dac728f
commit 078153d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 13 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -13,7 +13,7 @@
             category="epomodoro"
             class="net.mornati.epomodoro.views.TeamStatus"
             icon="icons/team.png"
-            id="epomodoro.views.TeamStatus"
+            id="net.mornati.epomodoro.views.TeamStatus"
             name="Team Messages">
       </view>
       <view

diff --git a/src/net/mornati/epomodoro/Activator.java b/src/net/mornati/epomodoro/Activator.java
@@ -1,5 +1,6 @@
 package net.mornati.epomodoro;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,14 +47,14 @@ public class Activator extends AbstractUIPlugin {
 	private PomodoroTimer timer;
 	private boolean showDialog=false;
 	private Timer scheduler=new Timer();
-	final java.text.SimpleDateFormat sdf=new java.text.SimpleDateFormat("mm : ss");
+	private final SimpleDateFormat sdf=new SimpleDateFormat("mm : ss");
 	private static final Logger LOG=Logger.getLogger(Activator.class.getName());
-	private List<Button> startButtons=new ArrayList<Button>();
-	private List<Label> counterLabels=new ArrayList<Label>();
+	private final List<Button> startButtons=new ArrayList<Button>();
+	private final List<Label> counterLabels=new ArrayList<Label>();
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	@Override
@@ -69,7 +70,7 @@ public void start(BundleContext context) throws Exception {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	@Override
@@ -85,7 +86,7 @@ public void stop(BundleContext context) throws Exception {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getDefault() {
@@ -94,7 +95,7 @@ public static Activator getDefault() {
 
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in relative path
-	 * 
+	 *
 	 * @param path
 	 *            the path
 	 * @return the image descriptor
@@ -200,7 +201,7 @@ public void subscribeCounterLabel(Label label) {
 	public List<Button> getStartButtons() {
 		return startButtons;
 	}
-	
+
 	public void scheduleTimer(final int changeInterval) {
 		final PomodoroTimer internalTimer;
 		if (timer == null) {
@@ -209,6 +210,7 @@ public void scheduleTimer(final int changeInterval) {
 			internalTimer=timer;
 		}
 		Display.getDefault().timerExec(changeInterval, new Runnable() {
+			@Override
 			public void run() {
 				if (internalTimer != null) {
 					for (Label countdown : counterLabels) {

diff --git a/src/net/mornati/epomodoro/Startup.java b/src/net/mornati/epomodoro/Startup.java
@@ -3,7 +3,10 @@
 import net.mornati.epomodoro.preference.PomodoroPreferencePage;
 import net.mornati.epomodoro.util.PluginImages;
 import net.mornati.epomodoro.util.UIUtil;
+import net.mornati.epomodoro.views.TeamStatus;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.ControlContribution;
 import org.eclipse.jface.action.StatusLineManager;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -14,13 +17,15 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.WorkbenchWindow;
 
 public class Startup implements IStartup {
-
 	@Override
 	public void earlyStartup() {
 		Display.getDefault().asyncExec(new Runnable() {
@@ -38,6 +43,17 @@ protected Control createControl(Composite parent) {
 						Label imgLabel=new Label(composite, SWT.NONE);
 						imgLabel.setImage(image);
 						Label countdownStatus=new Label(composite, SWT.NONE);
+						countdownStatus.addListener(SWT.MouseDoubleClick, new Listener() {
+							@Override
+							public void handleEvent(Event event) {
+								try {
+									PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(TeamStatus.ID);
+								} catch (PartInitException e) {
+									Activator.getDefault().getLog()
+											.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to open view " + TeamStatus.ID, e));
+								}
+							}
+						});
 						countdownStatus.setText(Activator.getDefault().getTimer().getFormatTime());
 						countdownStatus.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
 						Activator.getDefault().subscribeCounterLabel(countdownStatus);

diff --git a/src/net/mornati/epomodoro/views/TeamStatus.java b/src/net/mornati/epomodoro/views/TeamStatus.java
@@ -53,15 +53,15 @@ public class TeamStatus extends ViewPart implements PropertyChangeListener {
 	/**
 	 * The ID of the view as specified by the extension.
 	 */
-	public static final String ID="epomodoro.views.SampleView";
+	public static final String ID=TeamStatus.class.getName();
 
 	private static final Logger LOG=Logger.getLogger(TeamStatus.class.getName());
 
 	private TableViewer viewer;
 	private Action clearTable;
 	private Action connect;
 	private PomodoroComparator comparator;
-	private List<TimerMessage> receivedMessages=new ArrayList<TimerMessage>();
+	private final List<TimerMessage> receivedMessages=new ArrayList<TimerMessage>();
 
 	// This will create the columns for the table
 	private void createColumns(final Composite parent, final TableViewer viewer) {
@@ -143,6 +143,7 @@ public TeamStatus() {
 	/**
 	 * This is a callback that will allow us to create the viewer and initialize it.
 	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		Composite composite=new Composite(parent, SWT.NONE);
 		GridLayout gridLayout=new GridLayout();
@@ -171,9 +172,10 @@ protected IStatus run(IProgressMonitor monitor) {
 					}
 				}
 				Activator.getDefault().getCommunication().setReceiver(new ReceiverAdapter() {
+					@Override
 					public void receive(final Message msg) {
 						if (msg != null && (msg.getObject() instanceof AbstractPomodoroMessage)) {
-							
+
 							if (msg.getObject() instanceof TimerMessage) {
 								TimerMessage tm=(TimerMessage) msg.getObject();
 								if (receivedMessages.contains(tm)) {
@@ -191,6 +193,7 @@ public void receive(final Message msg) {
 							LOG.log(Level.WARNING, "Received a wrong message");
 						}
 						Display.getDefault().asyncExec(new Runnable() {
+							@Override
 							public void run() {
 								if (!viewer.getTable().isDisposed()) {
 									viewer.refresh();
@@ -216,6 +219,7 @@ private void hookContextMenu() {
 		MenuManager menuMgr=new MenuManager("#PopupMenu");
 		menuMgr.setRemoveAllWhenShown(true);
 		menuMgr.addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				TeamStatus.this.fillContextMenu(manager);
 			}
@@ -247,9 +251,11 @@ private void fillLocalToolBar(IToolBarManager manager) {
 
 	private void makeActions() {
 		clearTable=new Action() {
+			@Override
 			public void run() {
 				receivedMessages.clear();
 				Display.getDefault().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (!viewer.getTable().isDisposed()) {
 							viewer.refresh();
@@ -263,6 +269,7 @@ public void run() {
 		clearTable.setImageDescriptor(Activator.getImageDescriptor(PluginImages.ICONS_CLEAR));
 
 		connect=new Action() {
+			@Override
 			public void run() {
 				Communication communication=Activator.getDefault().getCommunication();
 				if (communication != null) {
@@ -278,6 +285,7 @@ public void run() {
 						}
 					}
 					Display.getDefault().timerExec(4000, new Runnable() {
+						@Override
 						public void run() {
 							if (Activator.getDefault().getCommunication().isConnected()) {
 								connect.setImageDescriptor(Activator.getImageDescriptor(PluginImages.ICONS_CONNECTED));
@@ -300,6 +308,7 @@ public void run() {
 	/**
 	 * Passing the focus request to the viewer's control.
 	 */
+	@Override
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}