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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/03 19:41:20

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/properties  
                        MainPreferencePage.java NodeWithProperties.java
  Log:
  the packages content provider now uses IAdaptable (which IPackageNode now implements) instead of NodeWtihProperties/IPackageNode directly. This will allow for more diverse models to be used w/ PackagesLabel/ContentProviders
  
  Revision  Changes    Path
  1.3       +15 -8     jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/properties/MainPreferencePage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MainPreferencePage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/properties/MainPreferencePage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MainPreferencePage.java	1 Mar 2007 23:48:28 -0000	1.2
  +++ MainPreferencePage.java	4 Mar 2007 00:41:20 -0000	1.3
  @@ -5,10 +5,12 @@
   import org.eclipse.swt.SWT;
   import org.eclipse.swt.events.SelectionEvent;
   import org.eclipse.swt.events.SelectionListener;
  +import org.eclipse.swt.layout.GridData;
   import org.eclipse.swt.layout.GridLayout;
   import org.eclipse.swt.widgets.Button;
   import org.eclipse.swt.widgets.Composite;
   import org.eclipse.swt.widgets.Control;
  +import org.eclipse.swt.widgets.Group;
   import org.eclipse.ui.IWorkbench;
   import org.eclipse.ui.IWorkbenchPreferencePage;
   import org.jboss.ide.eclipse.packages.ui.PackagesUIPlugin;
  @@ -31,18 +33,23 @@
   		Composite main = new Composite(parent, SWT.NONE);
   		main.setLayout(new GridLayout(1, false));
   		
  -		showPackageOutputPath = new Button(main, SWT.CHECK);
  -		showPackageOutputPath.setText("Show package output path in Project Packages view.");
  +		Group viewPrefGroup = new Group(main, SWT.NONE);
  +		viewPrefGroup.setText("Project Packages View");
  +		viewPrefGroup.setLayout(new GridLayout(1, false));
  +		viewPrefGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
  +		
  +		showPackageOutputPath = new Button(viewPrefGroup, SWT.CHECK);
  +		showPackageOutputPath.setText("Show full output path next to packages.");
   		showPackageOutputPath.setSelection(
   			prefs.getBoolean(PackagesUIPlugin.PREF_SHOW_PACKAGE_OUTPUT_PATH));
   		
  -		showFullFilesetRootDir = new Button(main, SWT.CHECK);
  -		showFullFilesetRootDir.setText("Show the full root directory of a fileset in the Project Packages view.");
  +		showFullFilesetRootDir = new Button(viewPrefGroup, SWT.CHECK);
  +		showFullFilesetRootDir.setText("Show the full root directory of filesets.");
   		showFullFilesetRootDir.setSelection(
   			prefs.getBoolean(PackagesUIPlugin.PREF_SHOW_FULL_FILESET_ROOT_DIR));
   		
  -		showProjectRoot = new Button(main, SWT.CHECK);
  -		showProjectRoot.setText("Show project root");
  +		showProjectRoot = new Button(viewPrefGroup, SWT.CHECK);
  +		showProjectRoot.setText("Show project at the root");
   		showProjectRoot.setSelection(
   			prefs.getBoolean(PackagesUIPlugin.PREF_SHOW_PROJECT_ROOT));
   		
  @@ -60,8 +67,8 @@
   			}
   		});
   		
  -		showAllProjects = new Button(main, SWT.CHECK);
  -		showAllProjects.setText("Show all projects");
  +		showAllProjects = new Button(viewPrefGroup, SWT.CHECK);
  +		showAllProjects.setText("Show all projects that contain packages");
   		showAllProjects.setSelection(
   			prefs.getBoolean(PackagesUIPlugin.PREF_SHOW_ALL_PROJECTS));
   		
  
  
  
  1.2       +2 -0      jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/properties/NodeWithProperties.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeWithProperties.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/properties/NodeWithProperties.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- NodeWithProperties.java	3 Mar 2007 01:28:46 -0000	1.1
  +++ NodeWithProperties.java	4 Mar 2007 00:41:20 -0000	1.2
  @@ -88,6 +88,8 @@
   		if (adapter == IPropertySource.class)
   		{
   			return this;
  +		} else if (adapter == IPackageNode.class) {
  +			return node;
   		}
   		return null;
   	}