From ea38665a71c5ba2005897a486d134d911d055ce0 Mon Sep 17 00:00:00 2001 From: Rob Stryker Date: Wed, 12 Feb 2014 21:53:56 +0800 Subject: [PATCH] JBIDE-16521 - zipped publish checkbox in server editor was broken JBIDE-16521 - zipped publish checkbox in server editor was broken --- .../ide/eclipse/as/core/ExtensionManager.java | 4 ++++ .../JBossDeploymentOptionsComposite.java | 19 ++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java b/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java index 3df5244589..e52c5e7da8 100755 --- a/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java +++ b/as/plugins/org.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 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 publishers = new ArrayList(); 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/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/internal/JBossDeploymentOptionsComposite.java b/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/internal/JBossDeploymentOptionsComposite.java index 42445d6ddd..7ea1ed98c4 100644 --- a/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/internal/JBossDeploymentOptionsComposite.java +++ b/as/plugins/org.jboss.ide.eclipse.as.ui/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 {