[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages ...

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/07 17:33:41

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages 
                        PackageInfoWizardPage.java
  Log:
  removed custom manifest UI (removing from API eventually)
  
  Revision  Changes    Path
  1.13      +2 -71     jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/PackageInfoWizardPage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageInfoWizardPage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/pages/PackageInfoWizardPage.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- PackageInfoWizardPage.java	23 Feb 2007 18:57:31 -0000	1.12
  +++ PackageInfoWizardPage.java	7 Mar 2007 22:33:41 -0000	1.13
  @@ -24,7 +24,6 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  -import org.jboss.ide.eclipse.packages.core.model.internal.PackageImpl;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   import org.jboss.ide.eclipse.packages.ui.PackagesUIMessages;
   import org.jboss.ide.eclipse.packages.ui.PackagesUIPlugin;
  @@ -40,12 +39,8 @@
   	private Text packageNameText;
   	private Button compressedButton;
   	private Button explodedButton;
  -	private Button customManifestCheck;
  -	private Text manifestText;
  -	private Button manifestBrowseButton;
   	private String packageName;
   	private boolean packageExploded;
  -	private boolean manifestEnabled;
   	private IFile manifestFile;
   	private PackageDestinationComposite destinationComposite;
   	private IPackage pkg;
  @@ -79,9 +74,9 @@
   		new Label(pkgNameComposite, SWT.NONE).setImage(PackagesUIPlugin.getImage(PackagesUIPlugin.IMG_PACKAGE));
   		
   		packageNameText = new Text(pkgNameComposite, SWT.BORDER);
  -		packageName = "Untitled." + wizard.getPackageExtension();
  +		packageName = wizard.getProject().getName() + "." + wizard.getPackageExtension();
   		packageNameText.setText(packageName);
  -		packageNameText.setSelection(0, "Untitled.".length()-1);
  +		packageNameText.setSelection(0, wizard.getProject().getName().length());
   		expand(packageNameText);
   		
   		GridData pkgNameData = new GridData(GridData.FILL_HORIZONTAL);
  @@ -115,33 +110,6 @@
   		});
   		destinationComposite.setLayoutData(destinationTextData);
   		
  -		customManifestCheck = new Button(infoGroup , SWT.CHECK);
  -		customManifestCheck.setText(PackagesUIMessages.PackageInfoWizardPage_customManifest_label);
  -		customManifestCheck.addSelectionListener(new SelectionAdapter () {
  -			public void widgetSelected(SelectionEvent e) {
  -				boolean checked = customManifestCheck.getSelection();
  -				manifestBrowseButton.setEnabled(checked);
  -				manifestEnabled = checked;
  -				validate();
  -			}
  -		});
  -		
  -		manifestText = new Text(infoGroup, SWT.BORDER);
  -		expand(manifestText);
  -		manifestText.addModifyListener(new ModifyListener() {
  -			public void modifyText(ModifyEvent e) {
  -				if (validate())
  -				{
  -					manifestFile = wizard.getProject().getFile(manifestText.getText()); 
  -				}
  -			}
  -		});
  -		
  -		manifestBrowseButton = new Button(infoGroup, SWT.PUSH);
  -		manifestBrowseButton.setText(PackagesUIMessages.PackageInfoWizardPage_manifestBrowseButton_label);
  -		manifestText.setEnabled(false);
  -		manifestBrowseButton.setEnabled(false);
  -		
   		Group packageTypeGroup = new Group(main, SWT.NONE);
   		packageTypeGroup.setLayout(new GridLayout(1, false));
   		packageTypeGroup.setText(PackagesUIMessages.PackageInfoWizardPage_packageTypeGroup_label);
  @@ -189,18 +157,6 @@
   				destinationComposite.setPackageNodeDestination(pkg.getParent());
   			}
   			
  -			if (pkg.hasManifest())
  -			{
  -				PackageImpl pkgImpl = (PackageImpl) pkg;
  -				
  -				manifestEnabled = true;
  -				manifestFile = pkgImpl.getManifestFile();
  -				manifestText.setText(manifestFile.getLocation().toString());
  -				manifestText.setEnabled(true);
  -				manifestBrowseButton.setEnabled(true);
  -				customManifestCheck.setSelection(true);
  -			}
  -			
   			if (pkg.isExploded())
   			{
   				explodedButton.setEnabled(true);
  @@ -222,19 +178,6 @@
   			setErrorMessage(null);
   		}
   		
  -		if (customManifestCheck.getSelection())
  -		{
  -			if (manifestText.getText() == null || manifestText.getText().length() == 0)
  -			{
  -				setErrorMessage(PackagesUIMessages.PackageInfoWizardPage_error_noManifest);
  -				setPageComplete(false);
  -				return false;
  -			}
  -			else {
  -				setErrorMessage(null);
  -			}
  -		}
  -		
   		Object destination = getPackageDestination();
   		if (destination instanceof IPackageNode)
   		{
  @@ -341,10 +284,6 @@
   		
   		pkg.setName(getPackageName());
   		pkg.setExploded(isPackageExploded());
  -		if (isManifestEnabled())
  -		{
  -			pkg.setManifest(getManifestFile());
  -		}
   		
   		if (!destContainer.equals(wizard.getProject()) && destContainer instanceof IContainer) {
   			pkg.setDestinationContainer((IContainer)destContainer);
  @@ -368,14 +307,6 @@
   		return packageExploded;
   	}
   
  -	public boolean isManifestEnabled() {
  -		return manifestEnabled;
  -	}
  -
  -	public IFile getManifestFile() {
  -		return manifestFile;
  -	}
  -
   	public Object getPackageDestination() {
   		return destinationComposite.getPackageNodeDestination();
   	}