[pmd-devel] pmd-eclipse/src/net/sourceforge/pmd/eclipse/preferences PMDPreferencePage.java,1.11,1.12

[Philippe H. <phh...@us...>]

Update of /cvsroot/pmd/pmd-eclipse/src/net/sourceforge/pmd/eclipse/preferences
In directory sc8-pr-cvs1:/tmp/cvs-serv24646/src/net/sourceforge/pmd/eclipse/preferences

Modified Files:
	PMDPreferencePage.java 
Log Message:
Merging from eclipse-v2 development branch

Index: PMDPreferencePage.java
===================================================================
RCS file: /cvsroot/pmd/pmd-eclipse/src/net/sourceforge/pmd/eclipse/preferences/PMDPreferencePage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PMDPreferencePage.java	16 Oct 2003 22:26:37 -0000	1.11
--- PMDPreferencePage.java	30 Nov 2003 22:57:44 -0000	1.12
***************
*** 63,68 ****
   * 
   * $Log$
   * Revision 1.11  2003/10/16 22:26:37  phherlin
!  * Fix bug #810858.
   * Complete refactoring of rule set generation. Using a DOM tree and the Xerces 2 serializer.
   *
--- 63,74 ----
   * 
   * $Log$
+  * Revision 1.12  2003/11/30 22:57:44  phherlin
+  * Merging from eclipse-v2 development branch
+  *
+  * Revision 1.11.2.1  2003/11/07 14:30:08  phherlin
+  * Fixing : ruleset description may be null
+  *
   * Revision 1.11  2003/10/16 22:26:37  phherlin
!  * Fix bug #810858.
   * Complete refactoring of rule set generation. Using a DOM tree and the Xerces 2 serializer.
   *
***************
*** 490,494 ****
                                      getMessage(PMDConstants.MSGKEY_PREF_RULESET_DIALOG_TITLE),
                                      getMessage(PMDConstants.MSGKEY_PREF_RULESET_DIALOG_RULESET_DESCRIPTION),
!                                     ruleSet.getDescription().trim(),
                                      null);
                              flContinue = input.open() == InputDialog.OK;
--- 496,500 ----
                                      getMessage(PMDConstants.MSGKEY_PREF_RULESET_DIALOG_TITLE),
                                      getMessage(PMDConstants.MSGKEY_PREF_RULESET_DIALOG_RULESET_DESCRIPTION),
!                                     ruleSet.getDescription() == null ? "" : ruleSet.getDescription().trim(),
                                      null);
                              flContinue = input.open() == InputDialog.OK;