[jbosstools-commits] JBoss Tools SVN: r44047 - in trunk: examples/plugins/org.jboss.tools.project.examples/META-INF and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-09-26 11:11:57 -0400 (Wed, 26 Sep 2012)
New Revision: 44047

Removed:
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/
Modified:
   trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
   trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
Log:
JBIDE-12737 - Duplicate ECF transport classes

Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java	2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java	2012-09-26 15:11:57 UTC (rev 44047)
@@ -22,7 +22,7 @@
 import org.jboss.tools.central.JBossCentralActivator;
 import org.jboss.tools.central.model.FeedsEntry;
 import org.jboss.tools.project.examples.ProjectExamplesActivator;
-import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
+import org.jboss.tools.runtime.core.util.ECFTransport;
 
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndEntry;
@@ -183,14 +183,14 @@
 				File tempFile = File.createTempFile("news", ".xml");
 				tempFile.deleteOnExit();
 				OutputStream destination = new FileOutputStream(tempFile);
-				IStatus status = ECFExamplesTransport.getInstance().download(
+				IStatus status = ECFTransport.getInstance().download(
 						cacheFile.getName(), urlString, destination, monitor);
 				URL url = getURL();
 				if (monitor.isCanceled()) {
 					return getValidEntries(monitor);
 				}
 				if (status.isOK() && url != null) {
-					cacheModified = ECFExamplesTransport.getInstance().getLastModified(url);
+					cacheModified = ECFTransport.getInstance().getLastModified(url);
 					ProjectExamplesActivator.copyFile(tempFile, cacheFile);
 					tempFile.delete();
 					if (monitor.isCanceled()) {
@@ -250,7 +250,7 @@
 		}
 		long urlModified;
 		try {
-			urlModified = ECFExamplesTransport.getInstance().getLastModified(
+			urlModified = ECFTransport.getInstance().getLastModified(
 					url);
 		} catch (CoreException e) {
 			exception = e;

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF	2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF	2012-09-26 15:11:57 UTC (rev 44047)
@@ -33,7 +33,7 @@
  org.eclipse.equinox.p2.operations,
  org.eclipse.jst.server.core,
  org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.jboss.tools.runtime.core,
+ org.jboss.tools.runtime.core;visibility:=reexport,
  org.jboss.tools.runtime.ui,
  org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
  org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0",
@@ -48,7 +48,6 @@
  org.jboss.tools.project.examples.configurators,
  org.jboss.tools.project.examples.dialog,
  org.jboss.tools.project.examples.dialog.xpl,
- org.jboss.tools.project.examples.filetransfer,
  org.jboss.tools.project.examples.fixes,
  org.jboss.tools.project.examples.model,
  org.jboss.tools.project.examples.preferences,

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java	2012-09-26 15:04:09 UTC (rev 44046)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java	2012-09-26 15:11:57 UTC (rev 44047)
@@ -63,7 +63,7 @@
 import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
 import org.jboss.tools.project.examples.Messages;
 import org.jboss.tools.project.examples.ProjectExamplesActivator;
-import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
+import org.jboss.tools.runtime.core.util.ECFTransport;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -771,7 +771,7 @@
 				long urlModified = -1;
 				file = getFile(url);
 				try {
-					urlModified = ECFExamplesTransport.getInstance()
+					urlModified = ECFTransport.getInstance()
 							.getLastModified(url);
 				} catch (CoreException e) {
 					if (file.exists()) {
@@ -823,8 +823,8 @@
 		return file;
 	}
 
-	private static ECFExamplesTransport getTransport() {
-		return ECFExamplesTransport.getInstance();
+	private static ECFTransport getTransport() {
+		return ECFTransport.getInstance();
 	}
 
 	public static Document getDocument() throws ParserConfigurationException {