JBIDE-16521 - zipped publish checkbox in server editor was broken

jbosstools · Feb 12, 2014 · ea38665 · ea38665
1 parent 785217a
commit ea38665
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/...g.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java b/...g.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
@@ -206,6 +206,7 @@ public IProvideCredentials getFirstCredentialProvider(IServerProvider serverProv
 	}
 
 	private ArrayList<PublisherWrapper> publishers;	
+	@Deprecated
 	public IJBossServerPublisher getPublisher(IServer server, IModule[] module, String deployMethod) {
 		if( publishers == null ) 
 			loadPublishers();
@@ -220,6 +221,7 @@ public IJBossServerPublisher getPublisher(IServer server, IModule[] module, Stri
 		return null;
 	}
 
+	@Deprecated
 	private void loadPublishers() {
 		ArrayList<PublisherWrapper> publishers = new ArrayList<PublisherWrapper>();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
@@ -255,6 +257,7 @@ public int compare(PublisherWrapper o1, PublisherWrapper o2) {
 		Collections.sort(this.publishers, comparator);
 	}
 
+	@Deprecated
 	private class PublisherWrapper {
 		private int priority;
 		private IJBossServerPublisher publisher;
@@ -280,6 +283,7 @@ public String toString() {
 		}
 	}
 
+	@Deprecated
 	public IJBossServerPublisher[] getZippedPublishers() {
 		if( publishers == null ) 
 			loadPublishers();

diff --git a/.../jbossui/org/jboss/ide/eclipse/as/ui/editor/internal/JBossDeploymentOptionsComposite.java b/.../jbossui/org/jboss/ide/eclipse/as/ui/editor/internal/JBossDeploymentOptionsComposite.java
@@ -455,21 +455,10 @@ public void radioSelected(Object c) {
 	}
 
 	protected boolean isZippedPublisherAvailable() {
-		/*
-		 * Maybe use IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer());
-		 * But this class has no reference to the server, and it also might not want to go by stored data,
-		 * but rather the combo in the ModuleDeploymentPage somehow? 
-		 */
-
-		// String method = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer()).getId();
-		String method = LocalPublishMethod.LOCAL_PUBLISH_METHOD;
-		IJBossServerPublisher[] publishers = 
-			ExtensionManager.getDefault().getZippedPublishers();
-		for( int i = 0; i < publishers.length; i++ ) {
-			if( publishers[i].accepts(method, getServer().getServer(), null))
-				return true;
-		}
-		return false;
+		// Zipped publisher is always available after rewrite.
+		// ASTools now depends on archives and doesn't need to do weird logic
+		// to find a zipped publisher
+		return true;
 	}
 
 	public class SetDeployDirCommand extends ServerCommand {