Author: rob.stryker(a)jboss.com Date: 2011-06-09 01:05:53 -0400 (Thu, 09 Jun 2011) New Revision: 31942 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java Log: JBIDE-9085 - as7 should now show custom options and not just non-editable fields. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-09 01:17:33 UTC (rev 31941) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-09 05:05:53 UTC (rev 31942) @@ -18,6 +18,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; @@ -95,9 +96,13 @@ // } public static boolean isJBoss7(IServer server) { - return server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70); + return isJBoss7(server.getServerType()); } + public static boolean isJBoss7(IServerType type) { + return type.getId().equals(IJBossToolingConstants.SERVER_AS_70); + } + public static void createStandardFolders(IServer server) { // create metadata area File location = JBossServerCorePlugin.getServerStateLocation(server).toFile(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-06-09 01:17:33 UTC (rev 31941) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-06-09 05:05:53 UTC (rev 31942) @@ -19,7 +19,7 @@ import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant.IDeploymentPageCallback; public class RSEDeploymentPageCallback implements IDeploymentPageCallback { - public boolean metadataEnabled() { + public boolean metadataEnabled(IServerWorkingCopy copy) { return false; } public String getServerLocation(IServerWorkingCopy wc) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 01:17:33 UTC (rev 31941) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 05:05:53 UTC (rev 31942) @@ -53,6 +53,7 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.ui.ServerUICore; import org.eclipse.wst.server.ui.internal.command.ServerCommand; @@ -75,14 +76,16 @@ public class DeploymentModuleOptionCompositeAssistant implements PropertyChangeListener { public static interface IDeploymentPageCallback { - public boolean metadataEnabled(); + public boolean metadataEnabled(IServerWorkingCopy copy); public String getServerLocation(IServerWorkingCopy wc); public String getServerConfigName(IServerWorkingCopy wc); public void propertyChange(PropertyChangeEvent evt, DeploymentModuleOptionCompositeAssistant composite); } public static class LocalDeploymentPageCallback implements IDeploymentPageCallback { - public boolean metadataEnabled() { + public boolean metadataEnabled(IServerWorkingCopy copy) { + if( ServerUtil.isJBoss7(copy.getServerType())) + return false; return true; } @@ -344,8 +347,6 @@ boolean showRadios = true; if( rt == null || rt.loadAdapter(IJBossServerRuntime.class, null) == null) showRadios = false; - if( ServerUtil.isJBoss7(getServer().getServer())) - showRadios = false; return showRadios; } public static interface IBrowseBehavior { @@ -382,7 +383,7 @@ : serverRadio.getSelection() ? serverRadio : customRadio; String mode = page.getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD); - boolean metaEnabled = callbackMappings.get(mode).metadataEnabled(); + boolean metaEnabled = callbackMappings.get(mode).metadataEnabled(page.getServer()); metadataRadio.setEnabled(metaEnabled); } @@ -797,7 +798,7 @@ public void propertyChange(PropertyChangeEvent evt) { if( getShowRadios() && evt.getPropertyName().equals( IDeployableServer.SERVER_MODE)) { String mode = page.getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD); - metadataRadio.setEnabled(callbackMappings.get(mode).metadataEnabled()); + metadataRadio.setEnabled(callbackMappings.get(mode).metadataEnabled(page.getServer())); // String originalDeployLocation = page.getServer().getOriginal().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM); // String wcDeployLocation = page.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM); if(!metadataRadio.isEnabled() && metadataRadio.getSelection()) {