[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/23 16:57:46

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages 
                        PublishAction.java
  Log:
  
  
  Revision  Changes    Path
  1.3       +42 -8     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PublishAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PublishAction.java	17 Feb 2007 18:06:40 -0000	1.2
  +++ PublishAction.java	23 Feb 2007 21:57:46 -0000	1.3
  @@ -44,7 +44,7 @@
   			if( servers == null || "".equals(servers)) {
   				servers = showSelectServersDialog(node);
   			}
  -			PackagesBuildListener.publish(node);
  +			PackagesBuildListener.publish(node, servers);
   		}
   	}
   	
  @@ -62,10 +62,9 @@
   	}
   	
   	protected String showSelectServersDialog(IPackage node) {
  -		String servers = null;
   		SelectServerWizard wiz = new SelectServerWizard(node);
   		new WizardDialog(new Shell(), wiz).open();
  -		return node.getProperty(PackagesBuildListener.DEPLOY_SERVERS);
  +		return wiz.getServers();
   	}
   
   	
  @@ -76,6 +75,9 @@
   			this.pack = pack;
   		}
   		public boolean performFinish() {
  +			System.out.println("servers: " + getServers());
  +			System.out.println("autodeploy: " + getAutoDeploy());
  +			System.out.println("always publish to these: " + getAlwaysPublish());
   			pack.setProperty(PackagesBuildListener.DEPLOY_SERVERS, getServers());
   			pack.setProperty(PackagesBuildListener.AUTO_DEPLOY, getAutoDeploy());
   			return true;
  @@ -91,14 +93,18 @@
   		protected String getAutoDeploy() {
   			return page.getAutoDeploy();
   		}
  +		protected String getAlwaysPublish() {
  +			return page.getAlwaysPublish();
  +		}
   	}
   	
   	protected class SelectServerWizardPage extends WizardPage {
   		protected IPackage pack;
   		protected ListViewer viewer;
  -		protected Button autoDeploy;
  +		protected Button autoDeploy, alwaysPublish;
   		protected String viewerResult = "";
   		protected String deployResult = Boolean.toString(false);
  +		protected String alwaysPublishResult = Boolean.toString(false);
   		
   		protected SelectServerWizardPage(IPackage pack) {
   			super("Wizard Page Name");
  @@ -128,18 +134,31 @@
   			
   			
   			
  +			this.alwaysPublish = new Button(mainComposite, SWT.CHECK);
  +			FormData always = new FormData();
  +			always.left = new FormAttachment(15,0);
  +			always.top = new FormAttachment(viewer.getList(), 5);
  +			alwaysPublish.setLayoutData(always);
  +			
  +			Label alwaysPublishLabel = new Label(mainComposite, SWT.NONE);
  +			FormData apl = new FormData();
  +			apl.top = new FormAttachment(viewer.getList(), 5);
  +			apl.left = new FormAttachment(alwaysPublish, 5);
  +			alwaysPublishLabel.setLayoutData(apl);
  +			alwaysPublishLabel.setText("Always publish to these servers");
  +
   			autoDeploy = new Button(mainComposite, SWT.CHECK);
   			FormData add = new FormData();
   			add.left = new FormAttachment(15,0);
  -			add.top = new FormAttachment(viewer.getList(), 5);
  +			add.top = new FormAttachment(alwaysPublish, 5);
   			autoDeploy.setLayoutData(add);
   			
   			Label autoDeployLabel = new Label(mainComposite, SWT.NONE);
   			FormData adl = new FormData();
  -			adl.top = new FormAttachment(viewer.getList(), 5);
  +			adl.top = new FormAttachment(alwaysPublishLabel, 7);
   			adl.left = new FormAttachment(autoDeploy, 5);
   			autoDeployLabel.setLayoutData(adl);
  -			autoDeployLabel.setText("Label Text");
  +			autoDeployLabel.setText("Auto-deploy to selected servers after builds");
   		}
   		protected void addListeners() {
   			autoDeploy.addSelectionListener(new SelectionListener() {
  @@ -147,7 +166,7 @@
   					widgetSelected(e);
   				}
   				public void widgetSelected(SelectionEvent e) {
  -					deployResult = Boolean.toString(autoDeploy.getSelection());
  +					deployResult = Boolean.toString(autoDeploy.getSelection() && autoDeploy.getEnabled());
   				}
   			});
   			viewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
  @@ -165,9 +184,21 @@
   				} 
   			} );
   			
  +			alwaysPublish.addSelectionListener(new SelectionListener() {
  +				public void widgetDefaultSelected(SelectionEvent e) {
  +					widgetSelected(e);
  +				}
  +				public void widgetSelected(SelectionEvent e) {
  +					autoDeploy.setEnabled(alwaysPublish.getSelection());
  +					deployResult = Boolean.toString(autoDeploy.getSelection() && autoDeploy.getEnabled());
  +					alwaysPublishResult = Boolean.toString(alwaysPublish.getSelection());
  +				} 
  +			});
  +			
   			viewer.setContentProvider(new ArrayContentProvider());
   			viewer.setLabelProvider(new PublishServerLabelProvider());
   			viewer.setInput(JBossServerCore.getAllDeployableServers());
  +			autoDeploy.setEnabled(false);
   		}
   			
   		protected String getServers() {
  @@ -176,6 +207,9 @@
   		protected String getAutoDeploy() {
   			return deployResult;
   		}
  +		protected String getAlwaysPublish() {
  +			return alwaysPublishResult;
  +		}
   	}
   	protected class PublishServerLabelProvider extends LabelProvider {
   	    public Image getImage(Object element) {