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

[Robert Stryker]

  User: rawb    
  Date: 06/07/27 02:34:00

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui  
                        JBossServerUIPlugin.java
                        JBossServerUISharedImages.java
  Log:
  Implemented xpath editor in properties view. Other changes made to fascilitate this implementation (added to DescriptorModel, etc). Also fixed bugs, re-added classpath to server configuration so user can customize.
  
  Revision  Changes    Path
  1.13      +43 -6     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.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- JBossServerUIPlugin.java	19 Jul 2006 16:22:43 -0000	1.12
  +++ JBossServerUIPlugin.java	27 Jul 2006 06:34:00 -0000	1.13
  @@ -22,6 +22,8 @@
   package org.jboss.ide.eclipse.as.ui;
   
   import java.util.ArrayList;
  +import java.util.Arrays;
  +import java.util.Comparator;
   import java.util.MissingResourceException;
   import java.util.ResourceBundle;
   
  @@ -116,6 +118,7 @@
   	
   	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";
  @@ -131,14 +134,20 @@
   		private Image icon;
   		
   		private boolean enabled;
  +		private int weight;
   		
   		public ServerViewProvider(IConfigurationElement element) {
   			this.element = element;
  -			this.enabled = false;
   			
   			// Am I enabled?
   			Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
  -			String key = EXTENSION_ENABLED + getId();
  +
  +			
  +			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 {
  @@ -147,8 +156,6 @@
   			} catch( Exception e ) {
   			}
   			
  -			// If its a new user, all categories must default to showing
  -			setEnabled( prefs.contains(key) ? prefs.getBoolean(key) : true );
   			
   		}
   		
  @@ -205,14 +212,26 @@
   			}
   		}
   		
  +		
  +		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();
  -			String key = EXTENSION_ENABLED + getId();
  -			prefs.setValue(key, enabled);
  +
  +			prefs.setValue(EXTENSION_ENABLED + getId(), enabled);
  +			prefs.setValue(EXTENSION_WEIGHT + getId(), weight);
  +			
  +			
   		}
   	}
   
  @@ -228,6 +247,16 @@
   		}
   		ServerViewProvider[] providers = new ServerViewProvider[list.size()];
   		list.toArray(providers);
  +		
  +		Arrays.sort(providers, new Comparator() {
  +			public int compare(Object arg0, Object arg1) {
  +				if( arg0 instanceof ServerViewProvider && arg1 instanceof ServerViewProvider) {
  +					return ((ServerViewProvider)arg0).getWeight() - ((ServerViewProvider)arg1).getWeight();
  +				}
  +				return 0;
  +			}
  +		});
  +
   		return providers;
   	}
   	
  @@ -235,6 +264,14 @@
   		if( serverViewExtensions == null ) {
   			loadAllServerViewProviders();
   		}
  +		Arrays.sort(serverViewExtensions, new Comparator() {
  +			public int compare(Object arg0, Object arg1) {
  +				if( arg0 instanceof ServerViewProvider && arg1 instanceof ServerViewProvider) {
  +					return ((ServerViewProvider)arg0).getWeight() - ((ServerViewProvider)arg1).getWeight();
  +				}
  +				return 0;
  +			}
  +		});
   		return serverViewExtensions;
   	}
   	private void loadAllServerViewProviders() {
  
  
  
  1.4       +3 -0      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- JBossServerUISharedImages.java	2 Jun 2006 16:52:31 -0000	1.3
  +++ JBossServerUISharedImages.java	27 Jul 2006 06:34:00 -0000	1.4
  @@ -45,6 +45,8 @@
   	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";
  +	
   	
   	
   	private static JBossServerUISharedImages instance;
  @@ -69,6 +71,7 @@
   		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(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
   		
   		
   		Iterator iter = descriptors.keySet().iterator();