[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions ...

[Robert Stryker]

  User: rawb    
  Date: 06/12/13 13:32:13

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions  
                        ServerViewProvider.java
                        JBossServerViewExtension.java
  Log:
  Allowed a mechanism so that if an image path is not given via extension point, the implementing view provider can use one from another location, presumably a shared image from the platform, or wherever it chooses. 
  
  Revision  Changes    Path
  1.3       +5 -4      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerViewProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerViewProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerViewProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ServerViewProvider.java	29 Nov 2006 18:39:27 -0000	1.2
  +++ ServerViewProvider.java	13 Dec 2006 18:32:13 -0000	1.3
  @@ -70,9 +70,10 @@
   	public Image getImage() {
   		if( icon == null && iconDescriptor != null ) {
   			icon = iconDescriptor.createImage();
  -		}
  -		if( icon.isDisposed() && iconDescriptor != null ) {
  -			icon = iconDescriptor.createImage(); 
  +		} else if( icon == null && iconDescriptor == null ){
  +			icon = getDelegate().createIcon();
  +		} else if( icon != null && icon.isDisposed()) {
  +			icon = iconDescriptor == null ? getDelegate().createIcon() : iconDescriptor.createImage();
   		}
   		return icon;
   	}
  @@ -118,7 +119,7 @@
   	
   	public void dispose() {
   		getDelegate().dispose();
  -		if( icon != null ) 
  +		if( icon != null && iconDescriptor != null ) 
   			icon.dispose();
   		
   		Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
  
  
  
  1.3       +5 -0      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerViewExtension.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- JBossServerViewExtension.java	15 Nov 2006 22:26:57 -0000	1.2
  +++ JBossServerViewExtension.java	13 Dec 2006 18:32:13 -0000	1.3
  @@ -3,6 +3,7 @@
   import org.eclipse.jface.action.IMenuManager;
   import org.eclipse.jface.viewers.ITreeContentProvider;
   import org.eclipse.jface.viewers.LabelProvider;
  +import org.eclipse.swt.graphics.Image;
   import org.eclipse.swt.widgets.Composite;
   import org.eclipse.swt.widgets.Shell;
   import org.eclipse.ui.views.properties.IPropertySheetPage;
  @@ -61,6 +62,10 @@
   		return null;
   	}
   	
  +	public Image createIcon() {
  +		return null;
  +	}
  +	
   	protected void refreshViewer() {
   		refreshViewer(null);
   	}