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

Robert Stryker rawblem at gmail.com
Thu Nov 9 19:30:21 EST 2006


  User: rawb    
  Date: 06/11/09 19:30:21

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui   
                        JBossServerUIPlugin.java Messages.properties
                        JBossServerUISharedImages.java
  Log:
  Rewrote ui entirely
  
  Revision  Changes    Path
  1.15      +3 -129    jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerUIPlugin.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- JBossServerUIPlugin.java	11 Aug 2006 21:30:20 -0000	1.14
  +++ JBossServerUIPlugin.java	10 Nov 2006 00:30:21 -0000	1.15
  @@ -27,28 +27,20 @@
   import java.util.MissingResourceException;
   import java.util.ResourceBundle;
   
  -import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IConfigurationElement;
   import org.eclipse.core.runtime.IExtensionRegistry;
   import org.eclipse.core.runtime.Platform;
  -import org.eclipse.core.runtime.Preferences;
  -import org.eclipse.jface.resource.ImageDescriptor;
  -import org.eclipse.swt.graphics.Image;
   import org.eclipse.ui.IStartup;
   import org.eclipse.ui.plugin.AbstractUIPlugin;
   import org.jboss.ide.eclipse.as.core.JBossServerCore;
  -import org.jboss.ide.eclipse.as.core.util.ASDebug;
  -import org.jboss.ide.eclipse.as.ui.viewproviders.JBossServerViewExtension;
  -import org.osgi.framework.Bundle;
  +import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
   import org.osgi.framework.BundleContext;
   
   /**
    * The main plugin class to be used in the desktop.
    */
   public class JBossServerUIPlugin extends AbstractUIPlugin implements IStartup {
  -	//The shared instance.
   	private static JBossServerUIPlugin plugin;
  -	//Resource bundle.
   	private ResourceBundle resourceBundle;
   
   	// UI plugin id
  @@ -115,126 +107,6 @@
   	
   	
   	
  -	
  -	public static class ServerViewProvider {
  -		public static final String EXTENSION_ENABLED = "EXTENSION_ENABLED_";
  -		public static final String EXTENSION_WEIGHT = "EXTENSION_WEIGHT_";
  -		
  -		public static final String ID_LABEL = "id";
  -		public static final String NAME_LABEL = "name";
  -		public static final String DESCRIPTION_LABEL = "description";
  -		public static final String PROVIDER_LABEL = "providerClass";
  -		public static final String ICON_LABEL = "icon";
  -		
  -		
  -		private IConfigurationElement element;
  -		private JBossServerViewExtension extension;
  -		
  -		private ImageDescriptor iconDescriptor;
  -		private Image icon;
  -		
  -		private boolean enabled;
  -		private int weight;
  -		
  -		public ServerViewProvider(IConfigurationElement element) {
  -			this.element = element;
  -			
  -			// Am I enabled?
  -			Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
  -
  -			
  -			String enabledKey = EXTENSION_ENABLED + getId();
  -			setEnabled( prefs.contains(enabledKey) ? prefs.getBoolean(enabledKey) : true );
  -
  -			String weightKey = EXTENSION_WEIGHT + getId();
  -			setWeight( prefs.contains(weightKey) ? prefs.getInt(weightKey) : 0 );
  -			
  -			Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle();
  -			try {
  -				iconDescriptor = 
  -					ImageDescriptor.createFromURL(pluginBundle.getEntry(getIconLocation()));
  -			} catch( Exception e ) {
  -			}
  -			
  -			
  -		}
  -		
  -		public String getId() {
  -			return element.getAttribute(ID_LABEL);
  -		}
  -		
  -		public String getName() {
  -			return element.getAttribute(NAME_LABEL);
  -		}
  -		
  -		public String getDescription() {
  -			return element.getAttribute(DESCRIPTION_LABEL);
  -		}
  -		
  -		public String getIconLocation() {
  -			return element.getAttribute(ICON_LABEL);
  -		}
  -		
  -		public Image getImage() {
  -			if( icon == null && iconDescriptor != null ) {
  -				icon = iconDescriptor.createImage();
  -			}
  -			return icon;
  -		}
  -		
  -		public JBossServerViewExtension getDelegate() {
  -			try {
  -				if( extension == null ) {
  -					extension = (JBossServerViewExtension)element.createExecutableExtension(PROVIDER_LABEL);
  -					extension.setViewProvider(this);
  -				}
  -			} catch( CoreException ce ) {
  -				ce.printStackTrace();
  -			}
  -			return extension;
  -		}
  -		
  -		public String getDelegateName() {
  -			return element.getAttribute(PROVIDER_LABEL);
  -		}
  -		
  -		public boolean isEnabled() {
  -			return enabled;
  -		}
  -		
  -		public void setEnabled(boolean enable) {
  -			if( enable && !enabled ) {
  -				enabled = true;
  -				getDelegate().enable();
  -			} else if( !enable && enabled ) {
  -				enabled = false;
  -				getDelegate().disable();
  -			}
  -		}
  -		
  -		
  -		public int getWeight() {
  -			return weight;
  -		}
  -		
  -		public void setWeight(int weight) {
  -			this.weight = weight;
  -		}
  -		
  -		public void dispose() {
  -			getDelegate().dispose();
  -			if( icon != null ) 
  -				icon.dispose();
  -			
  -			Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
  -
  -			prefs.setValue(EXTENSION_ENABLED + getId(), enabled);
  -			prefs.setValue(EXTENSION_WEIGHT + getId(), weight);
  -			JBossServerUIPlugin.getDefault().savePluginPreferences();
  -		}
  -	}
  -
  -	
   	private ServerViewProvider[] serverViewExtensions;
   	public ServerViewProvider[] getEnabledViewProviders() {
   		getAllServerViewProviders();
  @@ -286,4 +158,6 @@
   		}
   	}
   	
  +	
  +	
   }
  
  
  
  1.12      +6 -6      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.properties
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Messages.properties	28 Sep 2006 22:18:02 -0000	1.11
  +++ Messages.properties	10 Nov 2006 00:30:21 -0000	1.12
  @@ -90,12 +90,12 @@
   
   #preference page
   
  -PreferencePageServerTimeouts=Server Timeouts;
  -PreferencePageStartTimeouts=Start Timeout;
  -PreferencePageStopTimeouts=Stop Timeout;
  -PreferencePageUponTimeout=Upon Timeout: ;
  -PreferencePageUponTimeoutAbort=Abort Server Start;
  -PreferencePageUponTimeoutIgnore=Set Server State to "Started";
  +PreferencePageServerTimeouts=Server Timeouts
  +PreferencePageStartTimeouts=Start Timeout
  +PreferencePageStopTimeouts=Stop Timeout
  +PreferencePageUponTimeout=Upon Timeout: 
  +PreferencePageUponTimeoutAbort=Abort Server Start
  +PreferencePageUponTimeoutIgnore=Set Server State to "Started"
   
   #View Preference Page
   ViewPreferencePageName=Name
  
  
  
  1.5       +9 -13     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerUISharedImages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- JBossServerUISharedImages.java	27 Jul 2006 06:34:00 -0000	1.4
  +++ JBossServerUISharedImages.java	10 Nov 2006 00:30:21 -0000	1.5
  @@ -26,6 +26,7 @@
   
   import org.eclipse.jface.resource.ImageDescriptor;
   import org.eclipse.swt.graphics.Image;
  +import org.eclipse.wst.server.ui.internal.ImageResource;
   import org.osgi.framework.Bundle;
   
   /**
  @@ -41,12 +42,9 @@
   	public static final String WIZBAN_JBOSS32_LOGO = "jboss32logo";
   	public static final String WIZBAN_JBOSS40_LOGO = "jboss40logo";
   	
  -	public static final String CONSOLE_IMAGE = "CONSOLE_IMAGE";
  -	public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE";
  -	public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE";
   	public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
   	public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE";
  -	
  +	public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
   	
   	
   	private static JBossServerUISharedImages instance;
  @@ -66,22 +64,20 @@
   		descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif"));
   		descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif"));
   		
  -		
  -		descriptors.put(CONSOLE_IMAGE, createImageDescriptor(pluginBundle, "/icons/console.gif"));
  -		descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif"));
  -		descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/unpublish.gif"));
  -		descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "/icons/twiddle.gif"));
  +		descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif"));
   		descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
   		
  -		
   		Iterator iter = descriptors.keySet().iterator();
  -		while (iter.hasNext())
  -		{
  +
  +		while (iter.hasNext()) {
   			String key = (String) iter.next();
   			ImageDescriptor descriptor = descriptor(key);
   			images.put(key,  descriptor.createImage());	
   		}
   		
  +		
  +		images.put(GENERIC_SERVER_IMAGE, ImageResource.getImageDescriptor(ImageResource.IMG_CTOOL_NEW_SERVER).createImage());
  +		descriptors.put(GENERIC_SERVER_IMAGE, ImageDescriptor.createFromImage((Image)images.get(GENERIC_SERVER_IMAGE)));
   	}
   	
   	private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String relativePath)
  
  
  



More information about the jboss-cvs-commits mailing list