From 69c1ae3fd8658564fc36cd3baf362ab9a537a0f6 Mon Sep 17 00:00:00 2001
From: angelozerr <angelo.zerr@gmail.com>
Date: Fri, 5 Dec 2014 19:01:22 +0100
Subject: [PATCH] Load repository.json from HTTP. See
 https://github.com/angelozerr/tern.java/issues/195

---
 .../src/tern/TernRepositoryTest.java          |   1 +
 core/tern.core/META-INF/MANIFEST.MF           |   5 +
 core/tern.core/src/tern/ITernProject.java     |   1 +
 .../{ => repository}/ITernRepository.java     |   5 +-
 .../tern/{ => repository}/TernRepository.java |   3 +-
 .../src/tern/resources/TernProject.java       |   2 +-
 .../src/tern/utils/TernRepositoryHelper.java  |  85 ++++++
 core/tern.server.nodejs/META-INF/MANIFEST.MF  |   2 +-
 .../tern/server/nodejs/NodejsTernHelper.java  |   6 +-
 .../ide/core/ITernRepositoryManager.java      |   2 +-
 .../internal/core/TernRepositoryManager.java  |   4 +-
 .../internal/core/TernServerTypeManager.java  |   2 +-
 .../internal/core/builder/TernBuilder.java    |  41 +++
 .../core/resources/IDETernProject.java        |   2 +-
 .../tools/core/webbrowser/EditorOptions.java  |   2 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../plugin.properties                         |   3 +
 eclipse/tern.eclipse.ide.tools.ui/plugin.xml  |   7 +
 .../internal/ui/TernToolsUIMessages.java      |   8 +
 .../ui/TernToolsUIMessages.properties         |  14 +-
 .../internal/ui/wizards/DownloadOptions.java  |  22 ++
 .../wizards/DownloadTernModulesOperation.java |  63 ++++
 ...ownloadTernModulesSelectionWizardPage.java | 271 ++++++++++++++----
 .../ui/wizards/DownloadTernModulesWizard.java |   1 +
 .../tools/internal/ui/wizards/IOperation.java |   4 +-
 .../internal/ui/wizards/NewFileOperation.java |   3 +-
 .../tools/internal/ui/wizards/TernWizard.java |   2 +-
 .../webbrowser/ExportScriptsOperation.java    |  37 ---
 .../TernModulesSelectionWizardPage.java       |   2 +-
 .../ui/dialogs/EditRepositoryDialog.java      |   4 +-
 .../TernRepositoryPreferencesPage.java        |   2 +-
 .../ide/ui/controls/TernRepositoryBlock.java  |   4 +-
 .../viewers/TernRepositoryLabelProvider.java  |   7 +-
 33 files changed, 507 insertions(+), 114 deletions(-)
 rename core/tern.core/src/tern/{ => repository}/ITernRepository.java (90%)
 rename core/tern.core/src/tern/{ => repository}/TernRepository.java (94%)
 create mode 100644 core/tern.core/src/tern/utils/TernRepositoryHelper.java
 create mode 100644 eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesOperation.java
 delete mode 100644 eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/ExportScriptsOperation.java

diff --git a/core/tern.core.tests/src/tern/TernRepositoryTest.java b/core/tern.core.tests/src/tern/TernRepositoryTest.java
index 99a6e7418..46b868ef9 100644
--- a/core/tern.core.tests/src/tern/TernRepositoryTest.java
+++ b/core/tern.core.tests/src/tern/TernRepositoryTest.java
@@ -5,6 +5,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import tern.repository.TernRepository;
 import tern.server.ITernModule;
 import tern.server.nodejs.process.PathHelper;
 
diff --git a/core/tern.core/META-INF/MANIFEST.MF b/core/tern.core/META-INF/MANIFEST.MF
index 55cdd41de..56f94a6f7 100644
--- a/core/tern.core/META-INF/MANIFEST.MF
+++ b/core/tern.core/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Export-Package: tern,
  tern.doc,
  tern.internal.resources;x-internal:=true,
  tern.metadata,
+ tern.repository,
  tern.resources,
  tern.scriptpath,
  tern.scriptpath.impl,
@@ -30,6 +31,10 @@ Export-Package: tern,
  tern.server.protocol.type,
  tern.utils
 Import-Package: com.eclipsesource.json,
+ org.apache.http;resolution:=optional,
+ org.apache.http.client;resolution:=optional,
+ org.apache.http.client.methods;resolution:=optional,
+ org.apache.http.impl.client;resolution:=optional,
  org.osgi.framework
 Bundle-Activator: tern.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/core/tern.core/src/tern/ITernProject.java b/core/tern.core/src/tern/ITernProject.java
index 9fa0059d0..9789dff40 100644
--- a/core/tern.core/src/tern/ITernProject.java
+++ b/core/tern.core/src/tern/ITernProject.java
@@ -17,6 +17,7 @@
 
 import org.w3c.dom.Node;
 
+import tern.repository.ITernRepository;
 import tern.scriptpath.ITernScriptPath;
 import tern.server.ITernDef;
 import tern.server.ITernPlugin;
diff --git a/core/tern.core/src/tern/ITernRepository.java b/core/tern.core/src/tern/repository/ITernRepository.java
similarity index 90%
rename from core/tern.core/src/tern/ITernRepository.java
rename to core/tern.core/src/tern/repository/ITernRepository.java
index 024dab094..8a758de78 100644
--- a/core/tern.core/src/tern/ITernRepository.java
+++ b/core/tern.core/src/tern/repository/ITernRepository.java
@@ -8,14 +8,15 @@
  *  Contributors:
  *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
  */
-package tern;
+package tern.repository;
 
 import java.io.File;
 
+import tern.TernException;
 import tern.server.ITernModule;
 
 /**
- * Tern repository is a base dir which contains the tern.js JS files :
+ * Tern repository is a local base dir which contains the tern.js JS files :
  * 
  * <ul>
  * <li>bin folder</li>
diff --git a/core/tern.core/src/tern/TernRepository.java b/core/tern.core/src/tern/repository/TernRepository.java
similarity index 94%
rename from core/tern.core/src/tern/TernRepository.java
rename to core/tern.core/src/tern/repository/TernRepository.java
index 6ed2e87e8..c0e8f36e8 100644
--- a/core/tern.core/src/tern/TernRepository.java
+++ b/core/tern.core/src/tern/repository/TernRepository.java
@@ -8,12 +8,13 @@
  *  Contributors:
  *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
  */
-package tern;
+package tern.repository;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import tern.TernException;
 import tern.server.ITernModule;
 import tern.utils.ExtensionUtils;
 import tern.utils.TernModuleHelper;
diff --git a/core/tern.core/src/tern/resources/TernProject.java b/core/tern.core/src/tern/resources/TernProject.java
index 138d3157b..bf61b17a1 100644
--- a/core/tern.core/src/tern/resources/TernProject.java
+++ b/core/tern.core/src/tern/resources/TernProject.java
@@ -25,9 +25,9 @@
 import tern.ITernFile;
 import tern.ITernFileSynchronizer;
 import tern.ITernProject;
-import tern.ITernRepository;
 import tern.TernException;
 import tern.internal.resources.InternalTernResourcesManager;
+import tern.repository.ITernRepository;
 import tern.scriptpath.ITernScriptPath;
 import tern.scriptpath.impl.dom.DOMElementsScriptPath;
 import tern.server.ITernDef;
diff --git a/core/tern.core/src/tern/utils/TernRepositoryHelper.java b/core/tern.core/src/tern/utils/TernRepositoryHelper.java
new file mode 100644
index 000000000..efef1922d
--- /dev/null
+++ b/core/tern.core/src/tern/utils/TernRepositoryHelper.java
@@ -0,0 +1,85 @@
+/**
+ *  Copyright (c) 2013-2014 Angelo ZERR.
+ *  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
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ */
+package tern.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import tern.TernException;
+import tern.server.BasicTernPlugin;
+import tern.server.ITernModule;
+
+import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.JsonObject.Member;
+
+/**
+ * Helper for tern repository.
+ *
+ */
+public class TernRepositoryHelper {
+
+	/**
+	 * Default tern repository.json URL
+	 */
+	public static final String DEFAULT_TERN_REPOSITORY_URL = "https://raw.githubusercontent.com/angelozerr/tern.java/master/eclipse/tern.eclipse.ide.tools.ui/TO_DELETE/repository.json";
+
+	/**
+	 * Load tern modules coming from the given repository.json URL.
+	 * 
+	 * @param repositoryURL
+	 *            repository URL.
+	 * @return
+	 * @throws IOException
+	 * @throws ClientProtocolException
+	 * @throws TernException
+	 */
+	public static List<ITernModule> loadModules(String repositoryURL)
+			throws IOException, TernException {
+		// load repository.json with HTTP client.
+		HttpClient httpClient = new DefaultHttpClient();
+		HttpGet httpGet = new HttpGet(repositoryURL);
+		HttpResponse httpResponse = httpClient.execute(httpGet);
+		HttpEntity entity = httpResponse.getEntity();
+		InputStream in = entity.getContent();
+		// Check the status
+		StatusLine statusLine = httpResponse.getStatusLine();
+		int statusCode = statusLine.getStatusCode();
+		if (statusCode != HttpStatus.SC_OK) {
+			String message = IOUtils.toString(in);
+			if (StringUtils.isEmpty(message)) {
+				throw new TernException(statusLine.toString());
+			}
+			throw new TernException(message);
+		}
+
+		// read JSON and create tern modules list
+		JsonObject repository = JsonObject.readFrom(new InputStreamReader(in));
+		ITernModule module = null;
+		List<ITernModule> modules = new ArrayList<ITernModule>();
+		for (Member member : repository) {
+			module = new BasicTernPlugin(member.getName());
+			modules.add(module);
+		}
+		return modules;
+	}
+}
diff --git a/core/tern.server.nodejs/META-INF/MANIFEST.MF b/core/tern.server.nodejs/META-INF/MANIFEST.MF
index e38f8a60f..31d22e324 100644
--- a/core/tern.server.nodejs/META-INF/MANIFEST.MF
+++ b/core/tern.server.nodejs/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-SymbolicName: tern.server.nodejs;singleton:=true
 Bundle-Version: 0.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: tern.server.nodejs,tern.server.nodejs.process
-Require-Bundle: tern.core;bundle-version="0.2.0"
+Require-Bundle: tern.core
 Bundle-ClassPath: .
 Import-Package: com.eclipsesource.json,
  org.apache.commons.logging,
diff --git a/core/tern.server.nodejs/src/tern/server/nodejs/NodejsTernHelper.java b/core/tern.server.nodejs/src/tern/server/nodejs/NodejsTernHelper.java
index 50b5f06e4..88d59b104 100644
--- a/core/tern.server.nodejs/src/tern/server/nodejs/NodejsTernHelper.java
+++ b/core/tern.server.nodejs/src/tern/server/nodejs/NodejsTernHelper.java
@@ -10,6 +10,7 @@
  */
 package tern.server.nodejs;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -88,8 +89,11 @@ public static JsonObject makeRequest(String baseURL, TernDoc doc,
 			}
 
 			try {
+				
+				byte[] bytes = IOUtils.toByteArray(in);
+				System.err.println(IOUtils.toString(bytes));
 				JsonObject response = JsonObject
-						.readFrom(new InputStreamReader(in));
+						.readFrom(new InputStreamReader(new ByteArrayInputStream(bytes)));
 				if (interceptors != null) {
 					for (IInterceptor interceptor : interceptors) {
 						interceptor.handleResponse(response, server,
diff --git a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/core/ITernRepositoryManager.java b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/core/ITernRepositoryManager.java
index 1dd7e976c..72d900bf1 100644
--- a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/core/ITernRepositoryManager.java
+++ b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/core/ITernRepositoryManager.java
@@ -4,7 +4,7 @@
 
 import org.eclipse.core.resources.IProject;
 
-import tern.ITernRepository;
+import tern.repository.ITernRepository;
 
 public interface ITernRepositoryManager {
 
diff --git a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernRepositoryManager.java b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernRepositoryManager.java
index e6d143f49..7f03c712f 100644
--- a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernRepositoryManager.java
+++ b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernRepositoryManager.java
@@ -19,13 +19,13 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
-import tern.ITernRepository;
 import tern.TernException;
-import tern.TernRepository;
 import tern.eclipse.ide.core.ITernRepositoryManager;
 import tern.eclipse.ide.core.TernCorePlugin;
 import tern.eclipse.ide.core.preferences.TernCorePreferenceConstants;
 import tern.eclipse.ide.internal.core.preferences.TernCorePreferencesSupport;
+import tern.repository.ITernRepository;
+import tern.repository.TernRepository;
 import tern.utils.StringUtils;
 
 /**
diff --git a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernServerTypeManager.java b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernServerTypeManager.java
index b49747389..fc21f053f 100644
--- a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernServerTypeManager.java
+++ b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/TernServerTypeManager.java
@@ -22,13 +22,13 @@
 import org.eclipse.core.runtime.IRegistryChangeListener;
 import org.eclipse.core.runtime.Platform;
 
-import tern.ITernRepository;
 import tern.TernException;
 import tern.eclipse.ide.core.IIDETernProject;
 import tern.eclipse.ide.core.ITernServerPreferencesListener;
 import tern.eclipse.ide.core.ITernServerType;
 import tern.eclipse.ide.core.ITernServerTypeManager;
 import tern.eclipse.ide.core.TernCorePlugin;
+import tern.repository.ITernRepository;
 import tern.server.ITernDef;
 import tern.server.ITernModule;
 import tern.server.ITernPlugin;
diff --git a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/builder/TernBuilder.java b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/builder/TernBuilder.java
index d74e550ae..99a1965d3 100644
--- a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/builder/TernBuilder.java
+++ b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/builder/TernBuilder.java
@@ -10,9 +10,12 @@
  */
 package tern.eclipse.ide.internal.core.builder;
 
+import java.util.Date;
 import java.util.Map;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -34,6 +37,9 @@ protected IProject[] build(int kind, Map<String, String> args,
 		if (currentProject == null || !currentProject.isAccessible())
 			return EMPTY_PROJECT;
 
+		/*if (DEBUG)
+			System.out.println("\nJavaBuilder: Starting build of " + currentProject.getName() //$NON-NLS-1$
+				+ " @ " + new Date(System.currentTimeMillis())); //$NON-NLS-1$
 		/*
 		 * if (IDETernProject.hasTernNature(currentProject)) { try { long start
 		 * = System.currentTimeMillis();
@@ -43,5 +49,40 @@ protected IProject[] build(int kind, Map<String, String> args,
 		 */
 		return EMPTY_PROJECT;
 	}
+	
+	protected IProject[] buildOLD(int kind, Map args, IProgressMonitor monitor) {
+		if (kind == IncrementalProjectBuilder.FULL_BUILD) {
+			fullBuild(monitor);
+		} else {
+			IResourceDelta delta = getDelta(getProject());
+			if (delta == null) {
+				fullBuild(monitor);
+			} else {
+				incrementalBuild(delta, monitor);
+			}
+		}
+		return null;
+	}
+
+	private void incrementalBuild(IResourceDelta delta, IProgressMonitor monitor) {
+		System.out.println("incremental build on " + delta);
+		try {
+			delta.accept(new IResourceDeltaVisitor() {
+				public boolean visit(IResourceDelta delta) {
+					System.out.println("changed: "
+							+ delta.getResource().getRawLocation());
+					return true; // visit children too
+				}
+			});
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void fullBuild(IProgressMonitor monitor) {
+		System.out.println("full build");
+	}
+
+	
 
 }
diff --git a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/resources/IDETernProject.java b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/resources/IDETernProject.java
index 16df3eb0e..580316b56 100644
--- a/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/resources/IDETernProject.java
+++ b/eclipse/tern.eclipse.ide.core/src/tern/eclipse/ide/internal/core/resources/IDETernProject.java
@@ -31,7 +31,6 @@
 
 import tern.ITernFile;
 import tern.ITernProject;
-import tern.ITernRepository;
 import tern.TernResourcesManager;
 import tern.eclipse.ide.core.IIDETernProject;
 import tern.eclipse.ide.core.ITernConsoleConnector;
@@ -46,6 +45,7 @@
 import tern.eclipse.ide.internal.core.Trace;
 import tern.eclipse.ide.internal.core.preferences.TernCorePreferencesSupport;
 import tern.eclipse.ide.internal.core.scriptpath.FolderScriptPath;
+import tern.repository.ITernRepository;
 import tern.resources.TernProject;
 import tern.scriptpath.ITernScriptPath;
 import tern.scriptpath.ITernScriptPath.ScriptPathsType;
diff --git a/eclipse/tern.eclipse.ide.tools.core/src/tern/eclipse/ide/tools/core/webbrowser/EditorOptions.java b/eclipse/tern.eclipse.ide.tools.core/src/tern/eclipse/ide/tools/core/webbrowser/EditorOptions.java
index 84f791f7b..623c34e15 100644
--- a/eclipse/tern.eclipse.ide.tools.core/src/tern/eclipse/ide/tools/core/webbrowser/EditorOptions.java
+++ b/eclipse/tern.eclipse.ide.tools.core/src/tern/eclipse/ide/tools/core/webbrowser/EditorOptions.java
@@ -17,9 +17,9 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 
-import tern.ITernRepository;
 import tern.eclipse.ide.tools.core.generator.Options;
 import tern.eclipse.ide.tools.internal.core.TernToolsCorePlugin;
+import tern.repository.ITernRepository;
 import tern.server.ITernDef;
 import tern.server.ITernModule;
 import tern.server.ITernPlugin;
diff --git a/eclipse/tern.eclipse.ide.tools.ui/META-INF/MANIFEST.MF b/eclipse/tern.eclipse.ide.tools.ui/META-INF/MANIFEST.MF
index fe852f259..39d410518 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/META-INF/MANIFEST.MF
+++ b/eclipse/tern.eclipse.ide.tools.ui/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  tern.eclipse.ide.core,
- tern.core,
- tern.eclipse.ide.ui
+ tern.eclipse.ide.ui,
+ tern.core
 Bundle-Activator: tern.eclipse.ide.tools.internal.ui.TernToolsUIPlugin
 Bundle-ActivationPolicy: lazy
 Import-Package: com.eclipsesource.json
diff --git a/eclipse/tern.eclipse.ide.tools.ui/plugin.properties b/eclipse/tern.eclipse.ide.tools.ui/plugin.properties
index d11088bfb..ebcece1da 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/plugin.properties
+++ b/eclipse/tern.eclipse.ide.tools.ui/plugin.properties
@@ -15,6 +15,9 @@ providerName=Angelo ZERR
 TernWizard.name=Tern
 NewTernDefWizard.name=Tern JSON type definition
 NewTernPluginWizard.name=Tern Server Plugin
+DownloadTernModulesWizard.name=Download Tern modules
+
+# Web browser wizard
 WebBrowserWizard.name= Web Browser
 NewCodeMirrorWizard.name=CodeMirror
 NewAceWizard.name=Ace
diff --git a/eclipse/tern.eclipse.ide.tools.ui/plugin.xml b/eclipse/tern.eclipse.ide.tools.ui/plugin.xml
index aad8c39d7..59639672a 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/plugin.xml
+++ b/eclipse/tern.eclipse.ide.tools.ui/plugin.xml
@@ -38,6 +38,13 @@
             class="tern.eclipse.ide.tools.internal.ui.wizards.NewTernPluginWizard"
             id="tern.eclipse.ide.tools.internal.ui.wizards.NewTernPluginWizard">
       </wizard>
+      <wizard
+            name="%DownloadTernModulesWizard.name"
+            icon="icons/full/etool16/plugin.gif"
+            category="tern.eclipse.ide.ui.wizard"
+            class="tern.eclipse.ide.tools.internal.ui.wizards.DownloadTernModulesWizard"
+            id="tern.eclipse.ide.tools.internal.ui.wizards.DownloadTernModulesWizard">
+      </wizard>      
    </extension>
    	  	      
     <!-- =================================================================================== -->
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.java
index 72269e576..2c8af172a 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.java
@@ -27,6 +27,7 @@ public final class TernToolsUIMessages extends NLS {
 
 	// Buttons
 	public static String Button_browse;
+	public static String Button_refresh;
 
 	// Wizard
 	public static String NewFileWizardPage_name_text;
@@ -64,7 +65,14 @@ public final class TernToolsUIMessages extends NLS {
 
 	public static String DownloadTernModulesWizard_taskLabel;
 	public static String DownloadTernModulesSelectionWizardPage_title;
+	public static String DownloadTernModulesSelectionWizardPage_repositoryURL_text;
+	public static String DownloadTernModulesSelectionWizardPage_localRespositoryName_text;
 	public static String DownloadTernModulesSelectionWizardPage_description;
+	public static String DownloadTernModulesSelectionWizardPage_errorMessage;
+	public static String DownloadTernModulesSelectionWizardPage_errorTitle;
+	public static String DownloadTernModulesSelectionWizardPage_modules_selection_validation;
+	public static String RefreshRepositoryJob_name;
+	public static String RefreshRepositoryJob_loading;
 
 	private TernToolsUIMessages() {
 	}
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.properties b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.properties
index e7f6bc29f..0163dc4ef 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.properties
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/TernToolsUIMessages.properties
@@ -11,6 +11,7 @@
 
 # Buttons
 Button_browse=Browse...
+Button_refresh=Refresh...
 
 # Wizard
 NewTernDefWizard_windowTitle=New JSON type definitions
@@ -46,6 +47,13 @@ TernDefsSelectionWizardPage_defLoader_embedInHTML=Embed in HTML
 TernDefsSelectionWizardPage_defLoader_embedInJS=Embed in Javascript
 
 # Repository wizard
-DownloadTernModulesWizard_taskLabel=Downloading tern modules
-DownloadTernModulesSelectionWizardPage_title=Download tern modules
-DownloadTernModulesSelectionWizardPage_description=Select the tern modules that you wish to download
\ No newline at end of file
+DownloadTernModulesWizard_taskLabel=Downloading tern modules...
+DownloadTernModulesSelectionWizardPage_title=Download tern modules to local tern repository.
+DownloadTernModulesSelectionWizardPage_repositoryURL_text=&URL:
+DownloadTernModulesSelectionWizardPage_localRespositoryName_text=Local repository:
+DownloadTernModulesSelectionWizardPage_description=Load repository.json and select the tern modules that you wish to download.
+DownloadTernModulesSelectionWizardPage_errorTitle=Download repository error
+DownloadTernModulesSelectionWizardPage_errorMessage=Cannot load tern repository <{0}>.
+RefreshRepositoryJob_name=Refresh repository job.
+RefreshRepositoryJob_loading=Start loading tern repository <{0}>...
+DownloadTernModulesSelectionWizardPage_modules_selection_validation=Please select tern modules to download.
\ No newline at end of file
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadOptions.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadOptions.java
index c6275e455..bffdd6890 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadOptions.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadOptions.java
@@ -1,5 +1,27 @@
 package tern.eclipse.ide.tools.internal.ui.wizards;
 
+import tern.repository.ITernRepository;
+import tern.server.ITernModule;
+
 public class DownloadOptions {
 
+	private ITernRepository repository;
+	private ITernModule[] ternModules;
+
+	public ITernRepository getRepository() {
+		return repository;
+	}
+
+	public void setRepository(ITernRepository repository) {
+		this.repository = repository;
+	}
+
+	public ITernModule[] getTernModules() {
+		return ternModules;
+	}
+
+	public void setTernModules(ITernModule[] ternModules) {
+		this.ternModules = ternModules;
+	}
+
 }
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesOperation.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesOperation.java
new file mode 100644
index 000000000..3b858e8fb
--- /dev/null
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesOperation.java
@@ -0,0 +1,63 @@
+/**
+ *  Copyright (c) 2013-2014 Angelo ZERR.
+ *  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
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ */
+package tern.eclipse.ide.tools.internal.ui.wizards;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import tern.repository.ITernRepository;
+import tern.server.ITernModule;
+
+/**
+ * Operation used to download tern modules selected from the wizard page
+ * {@link DownloadTernModulesSelectionWizardPage}
+ *
+ */
+public class DownloadTernModulesOperation implements
+		IOperation<DownloadOptions> {
+
+	@Override
+	public void init() {
+
+	}
+
+	@Override
+	public void run(IProgressMonitor monitor, DownloadOptions options)
+			throws CoreException {
+		// repository where tern modules must be downloaded.
+		ITernRepository repository = options.getRepository();
+		// tern modules to download
+		ITernModule[] modules = options.getTernModules();
+		for (int i = 0; i < modules.length; i++) {
+			download(modules[i], repository.getTernBaseDir());
+		}
+	}
+
+	/**
+	 * Download tern module in the given file system tern base dir.
+	 * 
+	 * @param ternModule
+	 *            the tern module to download.
+	 * @param ternBaseDir
+	 *            the output file system tern base dir.
+	 */
+	private void download(ITernModule ternModule, File ternBaseDir) {
+		System.out.println("download " + ternModule.getName());
+	}
+
+	@Override
+	public int getTotal() {
+		return 1;
+	}
+
+}
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesSelectionWizardPage.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesSelectionWizardPage.java
index 91ac37cd0..18828ea55 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesSelectionWizardPage.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesSelectionWizardPage.java
@@ -1,33 +1,57 @@
+/**
+ *  Copyright (c) 2013-2014 Angelo ZERR.
+ *  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
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
+ */
 package tern.eclipse.ide.tools.internal.ui.wizards;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
-import com.eclipsesource.json.JsonObject;
-import com.eclipsesource.json.JsonObject.Member;
-
+import tern.eclipse.ide.core.ITernRepositoryManager;
+import tern.eclipse.ide.core.TernCorePlugin;
 import tern.eclipse.ide.tools.internal.ui.TernToolsUIMessages;
+import tern.eclipse.ide.tools.internal.ui.TernToolsUIPlugin;
 import tern.eclipse.ide.ui.controls.TernModulesBlock;
-import tern.server.BasicTernPlugin;
-import tern.server.ITernDef;
+import tern.eclipse.ide.ui.viewers.TernRepositoryLabelProvider;
+import tern.repository.ITernRepository;
 import tern.server.ITernModule;
-import tern.server.ITernPlugin;
-import tern.utils.TernModuleHelper;
+import tern.utils.TernRepositoryHelper;
 
+/**
+ * Wizard page used to load repository.json and select tern modules to download.
+ *
+ */
 public class DownloadTernModulesSelectionWizardPage extends
 		TernWizardPage<DownloadOptions> {
 
@@ -35,6 +59,12 @@ public class DownloadTernModulesSelectionWizardPage extends
 
 	private TernModulesBlock modulesBlock;
 
+	private Button refreshButton;
+
+	private ComboViewer repositoryViewer;
+
+	private Text repositoryURL;
+
 	public DownloadTernModulesSelectionWizardPage() {
 		super(PAGE);
 		setTitle(TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_title);
@@ -51,9 +81,12 @@ protected Composite createUI(Composite parent) {
 		layout.marginWidth = 0;
 		container.setLayout(layout);
 
-		IResource resource = super.getResource();
-		IProject project = resource != null ? resource.getProject() : null;
-		modulesBlock = new TernModulesBlock(project, null);
+		// Local repository
+		createLocalRepository(container);
+		// Repository URL
+		createRepositoryURL(container);
+		// Tern Modules list
+		modulesBlock = new TernModulesBlock(null, null);
 		Control control = modulesBlock.createControl(container);
 		modulesBlock
 				.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -71,51 +104,191 @@ public void selectionChanged(SelectionChangedEvent event) {
 		return container;
 	}
 
-	@Override
-	protected void initialize() {
-		try {
-			InputStream in = DownloadTernModulesSelectionWizardPage.class
-					.getResourceAsStream("TO_DELETE_repository.json");
-			JsonObject repository = JsonObject.readFrom(new InputStreamReader(
-					in));
-
-			ITernModule module = null;
-			List<ITernModule> modules = new ArrayList<ITernModule>();
-			for (Member member : repository) {
-				module = new BasicTernPlugin(member.getName());
-				modules.add(module);
+	/**
+	 * Create a combo which hosts local tern repository.
+	 * 
+	 * @param parent
+	 */
+	private void createLocalRepository(Composite parent) {
+		Composite container = new Composite(parent, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		container.setLayout(layout);
+
+		// Label
+		Label repositoryNameLabel = new Label(container, SWT.NONE);
+		repositoryNameLabel
+				.setText(TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_localRespositoryName_text);
+
+		// Combo repository
+		repositoryViewer = new ComboViewer(container, SWT.DROP_DOWN
+				| SWT.READ_ONLY);
+		repositoryViewer.getControl().setLayoutData(
+				new GridData(GridData.FILL_HORIZONTAL));
+		repositoryViewer.setLabelProvider(TernRepositoryLabelProvider
+				.getInstance());
+		repositoryViewer.setContentProvider(ArrayContentProvider.getInstance());
+
+		Collection<ITernRepository> repositories = TernCorePlugin
+				.getTernRepositoryManager().getRepositories();
+		repositoryViewer.setInput(repositories);
+
+		final Text repositoryPath = new Text(container, SWT.WRAP
+				| SWT.READ_ONLY);
+		GridData data = new GridData(GridData.FILL_HORIZONTAL);
+		data.horizontalSpan = 2;
+		repositoryPath.setLayoutData(data);
+
+		repositoryViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+
+					@Override
+					public void selectionChanged(SelectionChangedEvent event) {
+						ITernRepository repository = (ITernRepository) ((IStructuredSelection) event
+								.getSelection()).getFirstElement();
+						repositoryPath.setText(repository
+								.getTernBaseDirAsString());
+					}
+				});
+
+		// Select and display info about the default tern repository
+		ITernRepository defaultRepository = TernCorePlugin
+				.getTernRepositoryManager().getRepository(
+						ITernRepositoryManager.DEFAULT_REPOSITORY_NAME);
+		if (defaultRepository != null) {
+			repositoryViewer.setSelection(new StructuredSelection(
+					defaultRepository));
+			repositoryPath.setText(defaultRepository.getTernBaseDirAsString());
+		}
+	}
+
+	/**
+	 * Create the repository URL text field.
+	 * 
+	 * @param parent
+	 */
+	protected void createRepositoryURL(Composite parent) {
+		Composite container = new Composite(parent, SWT.NONE);
+		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 3;
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		container.setLayout(layout);
+
+		Label repositoryURLLabel = new Label(container, SWT.NONE);
+		repositoryURLLabel
+				.setText(TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_repositoryURL_text);
+
+		repositoryURL = new Text(container, SWT.BORDER);
+		repositoryURL.setText(TernRepositoryHelper.DEFAULT_TERN_REPOSITORY_URL);
+		repositoryURL.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		refreshButton = new Button(container, SWT.PUSH);
+		refreshButton.setText(TernToolsUIMessages.Button_refresh);
+		repositoryURL.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		refreshButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				refreshButton.setEnabled(false);
+				Job refreshJob = new RefreshRepositoryJob(repositoryURL
+						.getText());
+				refreshJob.schedule();
+
 			}
-			modulesBlock.setTernModules(modules
-					.toArray(ITernModule.EMPTY_MODULE));
-		} catch (IOException e) {
-			e.printStackTrace();
+		});
+	}
+
+	private class RefreshRepositoryJob extends Job {
+
+		private final String url;
+
+		public RefreshRepositoryJob(String url) {
+			super(TernToolsUIMessages.RefreshRepositoryJob_name);
+			this.url = url;
 		}
+
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+			if (monitor.isCanceled()) {
+				return Status.CANCEL_STATUS;
+			}
+			monitor.beginTask(NLS.bind(
+					TernToolsUIMessages.RefreshRepositoryJob_loading, url), 1);
+			// load tern repository.json with HTTP client and refresh UI
+			try {
+				List<ITernModule> modules = TernRepositoryHelper
+						.loadModules(url);
+				monitor.worked(1);
+				// repository is loaded correctly, refresh UI
+				refreshModules(modules, null);
+
+			} catch (Throwable e) {
+				// error while loading repository.json
+				refreshModules(Collections.EMPTY_LIST, e);
+			}
+			monitor.done();
+			return Status.OK_STATUS;
+		}
+
+		private void refreshModules(final List<ITernModule> modules,
+				final Throwable e) {
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					refreshButton.setEnabled(true);
+					modulesBlock.setTernModules(modules
+							.toArray(ITernModule.EMPTY_MODULE));
+					if (e != null) {
+						IStatus status = new Status(
+								IStatus.ERROR,
+								TernToolsUIPlugin.PLUGIN_ID,
+								IStatus.ERROR,
+								NLS.bind(
+										TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_errorMessage,
+										url), e);
+						ErrorDialog
+								.openError(
+										Display.getDefault().getActiveShell(),
+										TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_errorTitle,
+										NLS.bind(
+												TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_errorMessage,
+												url), status);
+					}
+				}
+			});
+		}
+	}
+
+	@Override
+	protected void initialize() {
+		Job refreshJob = new RefreshRepositoryJob(repositoryURL.getText());
+		refreshJob.schedule();
 	}
 
 	@Override
 	protected String validate() {
+		Object[] objModules = modulesBlock.getCheckedModules();
+		if (objModules.length == 0) {
+			return TernToolsUIMessages.DownloadTernModulesSelectionWizardPage_modules_selection_validation;
+		}
 		return null;
 	}
 
 	@Override
 	protected void updateModel(DownloadOptions model) {
-		Object[] modules = modulesBlock.getCheckedModules();
-		List<ITernDef> defs = new ArrayList<ITernDef>();
-		List<ITernPlugin> plugins = new ArrayList<ITernPlugin>();
+		Object[] objModules = modulesBlock.getCheckedModules();
+		ITernModule[] modules = new ITernModule[objModules.length];
 		ITernModule module = null;
-		for (int i = 0; i < modules.length; i++) {
-			module = (ITernModule) modules[i];
-			TernModuleHelper.update(defs, plugins, module);
+		for (int i = 0; i < objModules.length; i++) {
+			module = (ITernModule) objModules[i];
+			modules[i] = module;
 		}
-		/*
-		 * model.setTernDefs(defs.toArray(ITernDef.EMPTY_DEF));
-		 * model.setTernPlugins(plugins.toArray(ITernPlugin.EMPTY_PLUGIN));
-		 * ITernRepository repository =
-		 * TernCorePlugin.getTernRepositoryManager()
-		 * .getRepository(modulesBlock.getProject());
-		 * model.setRepository(repository);
-		 * model.setProject(modulesBlock.getProject());
-		 */
+		model.setRepository((ITernRepository) ((IStructuredSelection) repositoryViewer
+				.getSelection()).getFirstElement());
+		model.setTernModules(modules);
 	}
 
 }
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesWizard.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesWizard.java
index f2173934c..f150635f9 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesWizard.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/DownloadTernModulesWizard.java
@@ -11,6 +11,7 @@ public class DownloadTernModulesWizard extends TernWizard<DownloadOptions>
 	@Override
 	public void addPages() {
 		super.addPage(new DownloadTernModulesSelectionWizardPage());
+		super.addOperation(new DownloadTernModulesOperation());
 	}
 
 	@Override
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/IOperation.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/IOperation.java
index ba0b06623..549bbec43 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/IOperation.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/IOperation.java
@@ -13,11 +13,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-public interface IOperation {
+public interface IOperation<T> {
 
 	void init();
 
-	void run(IProgressMonitor monitor) throws CoreException;
+	void run(IProgressMonitor monitor, T model) throws CoreException;
 	
 	int getTotal();
 	
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/NewFileOperation.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/NewFileOperation.java
index 88990dc05..186427978 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/NewFileOperation.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/NewFileOperation.java
@@ -51,7 +51,8 @@ public void init() {
 	}
 
 	@Override
-	public void run(IProgressMonitor monitor) throws CoreException {
+	public void run(IProgressMonitor monitor, Object model)
+			throws CoreException {
 		doFinish(containerName, fileName, monitor);
 	}
 
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/TernWizard.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/TernWizard.java
index 30dd4ac31..e90bcad5b 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/TernWizard.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/TernWizard.java
@@ -63,7 +63,7 @@ public void run(IProgressMonitor monitor)
 				monitor.beginTask(getTaskLabel(), total);
 				try {
 					for (IOperation operation : operations) {
-						operation.run(monitor);
+						operation.run(monitor, model);
 					}
 				} catch (Throwable e) {
 					throw new InvocationTargetException(e);
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/ExportScriptsOperation.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/ExportScriptsOperation.java
deleted file mode 100644
index 84cc991eb..000000000
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/ExportScriptsOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *  Copyright (c) 2013-2014 Angelo ZERR.
- *  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
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *  Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
- */
-package tern.eclipse.ide.tools.internal.ui.wizards.webbrowser;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import tern.eclipse.ide.tools.internal.ui.wizards.IOperation;
-
-public class ExportScriptsOperation implements IOperation {
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void run(IProgressMonitor monitor) throws CoreException {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public int getTotal() {
-		return 1;
-	}
-
-}
diff --git a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/TernModulesSelectionWizardPage.java b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/TernModulesSelectionWizardPage.java
index 9e1090221..c131f0d93 100644
--- a/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/TernModulesSelectionWizardPage.java
+++ b/eclipse/tern.eclipse.ide.tools.ui/src/tern/eclipse/ide/tools/internal/ui/wizards/webbrowser/TernModulesSelectionWizardPage.java
@@ -23,12 +23,12 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-import tern.ITernRepository;
 import tern.eclipse.ide.core.TernCorePlugin;
 import tern.eclipse.ide.tools.core.webbrowser.EditorOptions;
 import tern.eclipse.ide.tools.internal.ui.TernToolsUIMessages;
 import tern.eclipse.ide.tools.internal.ui.wizards.TernWizardPage;
 import tern.eclipse.ide.ui.controls.TernModulesBlock;
+import tern.repository.ITernRepository;
 import tern.server.ITernDef;
 import tern.server.ITernModule;
 import tern.server.ITernPlugin;
diff --git a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/dialogs/EditRepositoryDialog.java b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/dialogs/EditRepositoryDialog.java
index 6a5fe5730..279754c36 100644
--- a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/dialogs/EditRepositoryDialog.java
+++ b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/dialogs/EditRepositoryDialog.java
@@ -31,10 +31,10 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import tern.ITernRepository;
-import tern.TernRepository;
 import tern.eclipse.ide.core.ITernRepositoryManager;
 import tern.eclipse.ide.internal.ui.TernUIMessages;
+import tern.repository.ITernRepository;
+import tern.repository.TernRepository;
 import tern.utils.StringUtils;
 
 /**
diff --git a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/preferences/TernRepositoryPreferencesPage.java b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/preferences/TernRepositoryPreferencesPage.java
index 8e5179e89..8423983e4 100644
--- a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/preferences/TernRepositoryPreferencesPage.java
+++ b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/internal/ui/preferences/TernRepositoryPreferencesPage.java
@@ -26,7 +26,6 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 
-import tern.ITernRepository;
 import tern.eclipse.ide.core.ITernRepositoryManager;
 import tern.eclipse.ide.core.TernCorePlugin;
 import tern.eclipse.ide.core.preferences.TernCorePreferenceConstants;
@@ -34,6 +33,7 @@
 import tern.eclipse.ide.ui.ImageResource;
 import tern.eclipse.ide.ui.controls.TernRepositoryBlock;
 import tern.eclipse.ide.ui.preferences.PropertyPreferencePage;
+import tern.repository.ITernRepository;
 
 /**
  * Tern dev preferences page used for global and project preferences.
diff --git a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/controls/TernRepositoryBlock.java b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/controls/TernRepositoryBlock.java
index 3cf2ebfb5..611a28cd9 100644
--- a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/controls/TernRepositoryBlock.java
+++ b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/controls/TernRepositoryBlock.java
@@ -38,9 +38,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 
-import tern.ITernRepository;
 import tern.TernException;
-import tern.TernRepository;
 import tern.eclipse.ide.core.TernCorePlugin;
 import tern.eclipse.ide.internal.ui.TernUIMessages;
 import tern.eclipse.ide.internal.ui.Trace;
@@ -49,6 +47,8 @@
 import tern.eclipse.ide.ui.TernUIPlugin;
 import tern.eclipse.ide.ui.viewers.TernModuleLabelProvider;
 import tern.eclipse.ide.ui.viewers.TernRepositoryLabelProvider;
+import tern.repository.ITernRepository;
+import tern.repository.TernRepository;
 
 /**
  * Tern repositoryy block.
diff --git a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/viewers/TernRepositoryLabelProvider.java b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/viewers/TernRepositoryLabelProvider.java
index 6c3efe073..6587204c8 100644
--- a/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/viewers/TernRepositoryLabelProvider.java
+++ b/eclipse/tern.eclipse.ide.ui/src/tern/eclipse/ide/ui/viewers/TernRepositoryLabelProvider.java
@@ -16,7 +16,7 @@
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 
-import tern.ITernRepository;
+import tern.repository.ITernRepository;
 import tern.server.ITernModule;
 
 /**
@@ -64,4 +64,9 @@ public Image getColumnImage(Object element, int columnIndex) {
 		}
 		return null;
 	}
+
+	@Override
+	public String getText(Object element) {
+		return getColumnText(element, 0);
+	}
 }