copyrights update

39 files changed, 312 insertions, 273 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AEDesc.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AEDesc.java
index 81f78734f2..b61fef5582 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AEDesc.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AEDesc.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSTrapezoid.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSTrapezoid.java
index 22502ff1fc..6c09a7572e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSTrapezoid.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSTrapezoid.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUCaret.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUCaret.java
index 79a89c2aa9..4e0305f39c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUCaret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUCaret.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUTab.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUTab.java
index 4ecd132060..001e274cc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUTab.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUTab.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUUnhighlightData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUUnhighlightData.java
index 535056b728..1bffd70cad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUUnhighlightData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSUUnhighlightData.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AlertStdCFStringAlertParamRec.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AlertStdCFStringAlertParamRec.java
index 71fad2db13..2a1afa4eda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AlertStdCFStringAlertParamRec.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/AlertStdCFStringAlertParamRec.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/BitMap.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/BitMap.java
index 11ed251638..6aedea291d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/BitMap.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/BitMap.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CFRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CFRange.java
index 464d994827..6729dbcfe7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CFRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CFRange.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGPoint.java
index b0956d1343..1f4d39e2f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGPoint.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGRect.java
index 4fd6327f33..662566d7ed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/CGRect.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ColorPickerInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ColorPickerInfo.java
index caf6bed1d5..af8621c24b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ColorPickerInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ColorPickerInfo.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlButtonContentInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlButtonContentInfo.java
index 4c89c7f3ad..e7b71bd73c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlButtonContentInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlButtonContentInfo.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlFontStyleRec.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlFontStyleRec.java
index 702658ec6e..4fb875d92c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlFontStyleRec.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlFontStyleRec.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabEntry.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabEntry.java
index 9cf3eb67c5..0093112d37 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabEntry.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabEntry.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabInfoRecV1.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabInfoRecV1.java
index c5be8e74b4..cc52a62701 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabInfoRecV1.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ControlTabInfoRecV1.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Cursor.java
index 054175a7d2..54b73757cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Cursor.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCallbacks.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCallbacks.java
index 052a3f67ba..f4c82e8f8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCallbacks.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCallbacks.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCustomCallbacks.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCustomCallbacks.java
index d48751b8e5..9481d7a0ed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCustomCallbacks.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserCustomCallbacks.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewColumnDesc.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewColumnDesc.java
index 9c5c962573..edbe31a40d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewColumnDesc.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewColumnDesc.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewHeaderDesc.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewHeaderDesc.java
index 3b9eab9f06..5ee3ae2cd2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewHeaderDesc.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/DataBrowserListViewHeaderDesc.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/EventRecord.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/EventRecord.java
index cc01509363..f2c1f7f62c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/EventRecord.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/EventRecord.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 public class EventRecord {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontInfo.java
index 8bb98559b8..7b81fa4073 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontInfo.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontSelectionQDStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontSelectionQDStyle.java
index 99886a0296..146b967e1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontSelectionQDStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/FontSelectionQDStyle.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/GDevice.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/GDevice.java
index fabebc67ef..ee2cca829c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/GDevice.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/GDevice.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HICommand.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HICommand.java
index e10e776f34..b000188d1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HICommand.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HICommand.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HMHelpContentRec.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HMHelpContentRec.java
index 89c9b2d4ea..f6a5f3901a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HMHelpContentRec.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/HMHelpContentRec.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/MenuTrackingData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/MenuTrackingData.java
index a6406d5a8c..b4e8a38b5f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/MenuTrackingData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/MenuTrackingData.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavDialogCreationOptions.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavDialogCreationOptions.java
index 17e9392abb..c4bedb00b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavDialogCreationOptions.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavDialogCreationOptions.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavReplyRecord.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavReplyRecord.java
index b42495f88f..d6417a1584 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavReplyRecord.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/NavReplyRecord.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 74a1eb08e7..e3c9f95a5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMRect.java
index f33587da3c..17e681b9d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMRect.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMResolution.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMResolution.java
index 844df1591b..49a6111b1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMResolution.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PMResolution.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PixMap.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PixMap.java
index 8bf4ad64f1..1cf3268388 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PixMap.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/PixMap.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Point.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Point.java
index ef41e4ca1a..dcd3923c7d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Point.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Point.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/RGBColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/RGBColor.java
index a8a061ae9d..912f32bd1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/RGBColor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/RGBColor.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Rect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Rect.java
index d015ece345..3be058ec1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Rect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/Rect.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNBackground.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNBackground.java
index d99d7dad93..b4d74f0123 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNBackground.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNBackground.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNLongRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNLongRect.java
index ee00ba50da..404a4ba57d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNLongRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/TXNLongRect.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;
 
  
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ThemeButtonDrawInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ThemeButtonDrawInfo.java
index 9671770f2a..beb9f4c7ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ThemeButtonDrawInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ThemeButtonDrawInfo.java
@@ -1,14 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
  * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ *
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *******************************************************************************/
+ **********************************************************************/
 package org.eclipse.swt.internal.carbon;