[csseditor-cvs] net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare CssMergeViewerCreator.java,1.1.1.1,1.2 CssStructureCreator.java,1.2,1.3 CssMergeViewer.java,1.2,1.3 CssNode.java,1.2,1.3

[<ce...@us...>]

Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare
In directory sc8-pr-cvs1:/tmp/cvs-serv30009/src/net/sourceforge/csseditor/internal/compare

Modified Files:
	CssMergeViewerCreator.java CssStructureCreator.java 
	CssMergeViewer.java CssNode.java 
Log Message:
Cleanup

Index: CssMergeViewerCreator.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssMergeViewerCreator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CssMergeViewerCreator.java	14 Dec 2003 21:59:35 -0000	1.1.1.1
--- CssMergeViewerCreator.java	13 Jan 2004 17:10:28 -0000	1.2
***************
*** 25,29 ****
  public class CssMergeViewerCreator implements IViewerCreator {
  
!     /**
       * @see IViewerCreator#createViewer(Composite, CompareConfiguration)
       */
--- 25,29 ----
  public class CssMergeViewerCreator implements IViewerCreator {
  
!     /*
       * @see IViewerCreator#createViewer(Composite, CompareConfiguration)
       */

Index: CssStructureCreator.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssStructureCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssStructureCreator.java	27 Dec 2003 18:46:55 -0000	1.2
--- CssStructureCreator.java	13 Jan 2004 17:10:28 -0000	1.3
***************
*** 48,52 ****
  public class CssStructureCreator implements IStructureCreator {
  
!     /**
       * @see IStructureCreator#getName()
       */
--- 48,54 ----
  public class CssStructureCreator implements IStructureCreator {
  
!     // IStructureCreator Implementation ----------------------------------------
! 
!     /*
       * @see IStructureCreator#getName()
       */
***************
*** 56,60 ****
      }
  
!     /**
       * @see IStructureCreator#getStructure(Object)
       */
--- 58,62 ----
      }
  
!     /*
       * @see IStructureCreator#getStructure(Object)
       */
***************
*** 85,89 ****
      }
  
!     /**
       * @see IStructureCreator#locate(Object, Object)
       */
--- 87,91 ----
      }
  
!     /*
       * @see IStructureCreator#locate(Object, Object)
       */
***************
*** 93,97 ****
      }
  
!     /**
       * @see IStructureCreator#getContents(Object, boolean)
       */
--- 95,99 ----
      }
  
!     /*
       * @see IStructureCreator#getContents(Object, boolean)
       */
***************
*** 126,130 ****
      }
  
!     /**
       * @see IStructureCreator#save(IStructureComparator, Object)
       */
--- 128,132 ----
      }
  
!     /*
       * @see IStructureCreator#save(IStructureComparator, Object)
       */

Index: CssMergeViewer.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssMergeViewer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssMergeViewer.java	27 Dec 2003 18:46:55 -0000	1.2
--- CssMergeViewer.java	13 Jan 2004 17:10:28 -0000	1.3
***************
*** 73,77 ****
  
      /**
!      * @see TextMergeViewer#TextMergeViewer(Composite, int, CompareConfiguration)
       */
      public CssMergeViewer(Composite parent, int style,
--- 73,81 ----
  
      /**
!      * Constructor.
!      * 
!      * @param parent the parent control
!      * @param style SWT style bits for top level composite of this viewer
!      * @param configuration the configuration object
       */
      public CssMergeViewer(Composite parent, int style,
***************
*** 155,158 ****
--- 159,166 ----
      }
  
+     /**
+      * Updates the background color of the merge viewer to the value set in the
+      * preferences.
+      */
      private void updateBackgroundColor() {
          boolean defaultBackgroundColor = preferenceStore.getBoolean(

Index: CssNode.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssNode.java	27 Dec 2003 18:46:55 -0000	1.2
--- CssNode.java	13 Jan 2004 17:10:28 -0000	1.3
***************
*** 93,97 ****
                  "CssStructureViewer.styleSheet"); //$NON-NLS-1$
          }
!         return this.name;
      }
  
--- 93,97 ----
                  "CssStructureViewer.styleSheet"); //$NON-NLS-1$
          }
!         return name;
      }