Fix eclipse project dependencies.

- Use the prebuilts from the maven repo
- Make each project exports its dependencies to avoid having to
  redefine them in all projects.

Change-Id: Ib4c8fc192da224ff6fc765725cb106c865eebb97

3 files changed, 16 insertions, 6 deletions

diff --git a/swtmenubar/.classpath b/swtmenubar/.classpath
index 336c3a2..25adf96 100644
--- a/swtmenubar/.classpath
+++ b/swtmenubar/.classpath
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/>
-	<classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_OUT_FRAMEWORK/swt.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-core-commands/3.6.0/org-eclipse-core-commands-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-equinox-common/3.6.0/org-eclipse-equinox-common-3.6.0.jar"/>
+	<classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/m2/repository/com/android/external/eclipse/org-eclipse-jface/3.6.2/org-eclipse-jface-3.6.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
index 7575ecd..8fc8213 100644
--- a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
+++ b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer.java
@@ -16,6 +16,8 @@
 
 package com.android.menubar;
 
+import com.android.menubar.IMenuBarEnhancer.MenuBarMode;
+
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
@@ -26,8 +28,6 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 
-import com.android.menubar.IMenuBarEnhancer.MenuBarMode;
-
 
 /**
  * On Mac, {@link MenuBarEnhancer#setupMenu} plugs a listener on the About and the
@@ -94,10 +94,12 @@ public final class MenuBarEnhancer {
         IMenuBarEnhancer enhancer;
         enhancer = new IMenuBarEnhancer() {
 
+            @Override
             public MenuBarMode getMenuBarMode() {
                 return MenuBarMode.GENERIC;
             }
 
+            @Override
             public void setupMenu(
                     String appName,
                     Display display,
@@ -153,16 +155,19 @@ public final class MenuBarEnhancer {
             final IAction quitAction) {
 
         IMenuBarCallback callbacks = new IMenuBarCallback() {
+            @Override
             public void printError(String format, Object... args) {
                 System.err.println(String.format(format, args));
             }
 
+            @Override
             public void onPreferencesMenuSelected() {
                 if (preferencesAction != null) {
                     preferencesAction.run();
                 }
             }
 
+            @Override
             public void onAboutMenuSelected() {
                 if (aboutAction != null) {
                     aboutAction.run();
@@ -176,10 +181,12 @@ public final class MenuBarEnhancer {
         if (enhancer == null) {
             enhancer = new IMenuBarEnhancer() {
 
+                @Override
                 public MenuBarMode getMenuBarMode() {
                     return MenuBarMode.GENERIC;
                 }
 
+                @Override
                 public void setupMenu(
                         String appName,
                         Display display,
diff --git a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
index 8560bfa..0e8df09 100644
--- a/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
+++ b/swtmenubar/src/main/java/com/android/menubar/MenuBarEnhancer37.java
@@ -38,6 +38,7 @@ public class MenuBarEnhancer37 implements IMenuBarEnhancer {
     public MenuBarEnhancer37() {
     }
 
+    @Override
     public MenuBarMode getMenuBarMode() {
         return MenuBarMode.MAC_OS;
     }
@@ -50,6 +51,7 @@ public class MenuBarEnhancer37 implements IMenuBarEnhancer {
      * @param display The SWT display. Must not be null.
      * @param callbacks The callbacks invoked by the menus.
      */
+    @Override
     public void setupMenu(
             String appName,
             Display display,
@@ -64,6 +66,7 @@ public class MenuBarEnhancer37 implements IMenuBarEnhancer {
 
         // Schedule disposal of callback object
         display.disposeExec(new Runnable() {
+            @Override
             public void run() {
             }
         });