Merge pull request #93 from agrabovskis/master

Remove calls to code.inf.unibz.it

instasearch.feature/feature.xml

@@ -39,7 +39,6 @@ http://www.eclipse.org/org/documents/epl-v10.html
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.core.net"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.search"/>

instasearch/.project

@@ -34,7 +34,7 @@
 		<link>
 			<name>root_pom.xml</name>
 			<type>1</type>
-			<location>/Users/ajermakovics/Workspace/eclipse-instasearch/pom.xml</location>
+			<locationURI>UP/pom.xml</locationURI>
 		</link>
 	</linkedResources>
 	<variableList>

instasearch/META-INF/MANIFEST.MF

@@ -5,17 +5,14 @@ Bundle-SymbolicName: it.unibz.instasearch;singleton:=true
 Bundle-Version: 1.5.7.qualifier
 Bundle-Activator: it.unibz.instasearch.InstaSearchPlugin
 Bundle-DocURL: https://github.com/ajermakovics/eclipse-instasearch
-Bundle-UpdateLocation: http://code.inf.unibz.it/instasearch/downloads/ver.php
-ErrorReportURL: http://code.inf.unibz.it/instasearch/downloads/contact/send.php
+Bundle-UpdateLocation: http://dl.bintray.com/ajermakovics/InstaSearch/
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.apache.lucene;bundle-version="[2.9.1,2.9.2]",
  org.apache.lucene.analysis;bundle-version="[2.9.1,2.9.2)",
- org.apache.commons.httpclient,
  org.apache.commons.lang,
  org.eclipse.ui.ide,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.net,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.search,

instasearch/plugin.xml

@@ -63,15 +63,6 @@
                style="push"
                tooltip="Open Plugin's Preferences">
          </action>
-         <action
-               class="it.unibz.instasearch.actions.CheckUpdatesActionDelegate"
-               icon="icons/update.gif"
-               id="it.unibz.instasearch.actions.CheckUpdatesActionDelegate"
-               label="Check for Updates"
-               menubarPath="pulldown"
-               style="push"
-               tooltip="Check for Updates of the Plugin">
-         </action>
          <action
                class="it.unibz.instasearch.actions.DeleteIndexActionDelegate"
                id="it.unibz.instasearch.actions.DeleteIndexActionDelegate"

instasearch/src/it/unibz/instasearch/InstaSearchPlugin.java

@@ -17,7 +17,6 @@
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -32,7 +31,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -48,7 +46,6 @@ public final class InstaSearchPlugin extends AbstractUIPlugin {
 
 	private String indexDirLocation;
 	private InstaSearch instaSearch;
-	private ServiceTracker<IProxyService,IProxyService> proxyServiceTracker;
 	private boolean debug = false;
 
 	/**
@@ -216,23 +213,14 @@ public static String getHomePageLocation() {
 		return getBundleHeader(Constants.BUNDLE_DOCURL);
 	}
 
-	public static String getUpdateLocation() {
-
-		return getBundleHeader(Constants.BUNDLE_UPDATELOCATION);
-	}
-
-	public static String getErrorReportURL() {
-		return getBundleHeader("ErrorReportURL");
-	}
-
 	public static String getPluginName() {
 		return getBundleHeader(Constants.BUNDLE_NAME);
 	}
 
 	public static String getPluginId() {
 		return PLUGIN_ID;
 	}
-
+	
 	public static String getVersion() {
 		return getBundleHeader(Constants.BUNDLE_VERSION);
 	}
@@ -320,20 +308,6 @@ public static void removePreferenceChangeListener(IPropertyChangeListener listen
 			plugin.getPreferenceStore().removePropertyChangeListener(listener);
 	}
 
-	public IProxyService getProxyService() {
-		try {
-			if (proxyServiceTracker == null) {
-				proxyServiceTracker = new ServiceTracker<IProxyService,IProxyService>(getBundle().getBundleContext(), IProxyService.class, null);
-				proxyServiceTracker.open();
-			}
-			return proxyServiceTracker.getService();
-		} catch (Exception e) {
-			InstaSearchPlugin.log(e);
-		}
-
-		return null;
-	}
-
 	private void configureDebug() 
 	{
 		try {