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

[Robert Stryker]

  User: rawb    
  Date: 06/08/11 21:02:06

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages 
                        ViewPreferencePage.java
  Log:
  Changes to allow for a simplified descriptor viewer
  
  Revision  Changes    Path
  1.3       +18 -6     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ViewPreferencePage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ViewPreferencePage.java	31 Jul 2006 19:43:42 -0000	1.2
  +++ ViewPreferencePage.java	12 Aug 2006 01:02:06 -0000	1.3
  @@ -64,8 +64,10 @@
   	private HashMap providerToGroup;
   	private ArrayList preferenceComposites;
   	private PageBook book;
  +	private Composite mainComposite;
   	ServerViewProvider[] providers;
   	
  +	
   	public ViewPreferencePage() {
   		providerToGroup = new HashMap();
   		preferenceComposites = new ArrayList();
  @@ -117,16 +119,26 @@
       }
   
   
  +    public void dispose() {
  +    	super.dispose();
  +		ViewProviderPreferenceComposite comp;
  +		for( int i = 0; i < preferenceComposites.size(); i++ ) {
  +			comp = (ViewProviderPreferenceComposite)preferenceComposites.get(i);
  +			comp.dispose();
  +		}
  +    }
  +    
  +    
   	protected Control createContents(Composite p) {
   		providerToGroup = new HashMap();
  -		Composite c = new Composite(p, SWT.NONE);
  -		c.setLayout(new FormLayout());
  +		mainComposite = new Composite(p, SWT.NONE); 
  +		mainComposite.setLayout(new FormLayout());
   		
  -	    addEnablementComposite(c);
  -	    addExtensionPreferencePages(c);
  +	    addEnablementComposite(mainComposite);
  +	    addExtensionPreferencePages(mainComposite);
   	    addListeners();
   		
  -		return c;
  +		return mainComposite;
   	}
   	
   	protected void addListeners() {
  @@ -264,7 +276,7 @@
   			g.setText(providers[i].getName() + " Preferences");
   			g.setLayout(new FillLayout());
   			ViewProviderPreferenceComposite c = 
  -				providers[i].getDelegate().createPreferenceComposite(g, SWT.NONE);
  +				providers[i].getDelegate().createPreferenceComposite(g);
   			if( c != null ) preferenceComposites.add(c);
   			providerToGroup.put(providers[i], g);
   		}