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

[Marshall Culpepper]

  User: mculpepper
  Date: 06/11/08 14:54:44

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers 
                        PackagesLabelProvider.java
  Log:
  made a ton of bug fixes, re-modeled the working copy API to actually make sense (thanks rob!).. we're approaching a working implementation
  
  Revision  Changes    Path
  1.2       +4 -1      jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesLabelProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesLabelProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesLabelProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PackagesLabelProvider.java	6 Nov 2006 21:36:52 -0000	1.1
  +++ PackagesLabelProvider.java	8 Nov 2006 19:54:44 -0000	1.2
  @@ -132,7 +132,10 @@
   					text += " : " + fileset.getIncludesPattern();
   				return text;
   			} else {
  -				return fileset.getIncludesPattern();
  +				String text = fileset.getSourceFolder().lastSegment();
  +				if (fileset.getIncludesPattern() != null)
  +					text += " : " + fileset.getIncludesPattern();
  +				return text;
   			}
   		}