From 4ddf0a0e8a3e157b836a7de41889c7d89d40178d Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Tue, 14 Jan 2014 07:40:38 +0100
Subject: Fix copyrights
---
.../.settings/org.eclipse.jdt.ui.prefs | 2 +-
plugins/org.eclipse.emf.cdo.expressions/build.properties | 4 +---
plugins/org.eclipse.emf.cdo.expressions/copyright.txt | 8 --------
.../src/org/eclipse/emf/cdo/expressions/EvaluationContext.java | 2 +-
.../eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java | 2 +-
.../src/org/eclipse/emf/cdo/expressions/util/ExpressionsUtil.java | 2 +-
6 files changed, 5 insertions(+), 15 deletions(-)
delete mode 100644 plugins/org.eclipse.emf.cdo.expressions/copyright.txt
(limited to 'plugins/org.eclipse.emf.cdo.expressions')
diff --git a/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs
index 3fc140fcdc..72f4c75fe8 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.expressions/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=/*\r\n * Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n *//**\r\n * @author Eike Stepper\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n\r\n\r\n\r\n${exception_var}.printStackTrace();${body_statement}${body_statement}return ${field};${field} \= ${param};
+org.eclipse.jdt.ui.text.custom_code_templates=/*\r\n * Copyright (c) 2004-2014 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n *//**\r\n * @author Eike Stepper\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}\r\n\r\n\r\n\r\n${exception_var}.printStackTrace();${body_statement}${body_statement}return ${field};${field} \= ${param};
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/plugins/org.eclipse.emf.cdo.expressions/build.properties b/plugins/org.eclipse.emf.cdo.expressions/build.properties
index c063fa2aa6..fa87060f09 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/build.properties
+++ b/plugins/org.eclipse.emf.cdo.expressions/build.properties
@@ -14,13 +14,11 @@ bin.includes = .,\
META-INF/,\
plugin.xml,\
plugin.properties,\
- copyright.txt,\
about.html
jars.compile.order = .
source.. = src/
output.. = bin/
-src.includes = about.html,\
- copyright.txt
+src.includes = about.html
doc.project = org.eclipse.emf.cdo.doc
diff --git a/plugins/org.eclipse.emf.cdo.expressions/copyright.txt b/plugins/org.eclipse.emf.cdo.expressions/copyright.txt
deleted file mode 100644
index 1c77978050..0000000000
--- a/plugins/org.eclipse.emf.cdo.expressions/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
-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/epl-v10.html
-
-Contributors:
- Eike Stepper - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/EvaluationContext.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/EvaluationContext.java
index 886f39fc01..33450e2635 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/EvaluationContext.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/EvaluationContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* 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
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
index 35f6782079..fe3bcb76f3 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* 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
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsUtil.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsUtil.java
index e473e4065f..0f8f3231a5 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsUtil.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/ExpressionsUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
* 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
--
cgit v1.2.3