diff options
| author | Eike Stepper | 2019-12-13 19:06:44 +0000 |
|---|---|---|
| committer | Eike Stepper | 2019-12-13 19:56:07 +0000 |
| commit | 3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch) | |
| tree | 8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.emf.cdo.examples.installer/examples | |
| parent | 3960a2be32acacca909cdc5868d1a0f018c15827 (diff) | |
| download | cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip | |
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.installer/examples')
126 files changed, 974 insertions, 267 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs index b61ffcacfa..6b35f57b85 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF index 973ad0f33f..025ffc27b5 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true -Bundle-Version: 4.2.500.qualifier +Bundle-Version: 4.3.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)", @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)" Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)" Bundle-ClassPath: . -Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.500";x-internal:=true, - org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.500";x-internal:=true, +Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.3.0";x-internal:=true, + org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.3.0";x-internal:=true, org.eclipse.wb.swt;version="4.2.100";x-internal:=true Automatic-Module-Name: org.eclipse.emf.cdo.examples.client.offline diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml index 5e44d93fea..48aa17d3a6 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.client.offline</artifactId> - <version>4.2.500-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java index fd1af78f0e..65ba4c79ee 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/AbstractView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -75,6 +75,7 @@ public abstract class AbstractView<T extends IContainer<?>> extends ViewPart { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { String text = events.getText(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java index 7af1a2fcd3..6c5e58e6d4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/Application.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -36,6 +36,7 @@ public class Application implements IApplication public static Node NODE; + @Override public Object start(IApplicationContext context) { Display display = PlatformUI.createDisplay(); @@ -60,6 +61,7 @@ public class Application implements IApplication System.out.println("Node: " + NODE); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { NODE.start(); @@ -98,6 +100,7 @@ public class Application implements IApplication return IApplication.EXIT_OK; } + @Override public void stop() { if (!PlatformUI.isWorkbenchRunning()) @@ -109,6 +112,7 @@ public class Application implements IApplication final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java index 39b20651da..9e62c6b796 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2016, 2019 Eike Stepper (Loehne, 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 @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class ClientPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setFixed(true); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java index baf96c238f..2b8ceb48c4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2016, 2019 Eike Stepper (Loehne, 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 @@ -94,6 +94,7 @@ public class ClientView extends AbstractView<CDOSession> IRepository repository = Application.NODE.getObject(IRepository.class); repository.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { updateEnablement(); @@ -102,6 +103,7 @@ public class ClientView extends AbstractView<CDOSession> final IListener transactionListener = new IListener() { + @Override public void notifyEvent(IEvent event) { updateEnablement(); @@ -131,6 +133,7 @@ public class ClientView extends AbstractView<CDOSession> { treeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { ITreeSelection selection = (ITreeSelection)treeViewer.getSelection(); @@ -177,6 +180,7 @@ public class ClientView extends AbstractView<CDOSession> menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { ITreeSelection selection = (ITreeSelection)treeViewer.getSelection(); @@ -225,6 +229,7 @@ public class ClientView extends AbstractView<CDOSession> { PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { CDOTransaction transaction = Application.NODE.getObject(CDOTransaction.class); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java index a70f2adb78..e17fcb984f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class FailoverMonitorPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java index 18b0d01237..d4bf8bae82 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -69,6 +69,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> final Channel channel = scope.getChannel(agent.getConnectorDescription()); agent.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof SignalScheduledEvent) @@ -77,6 +78,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> { scope.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!scope.isDisposed()) @@ -192,6 +194,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> { getDisplay().syncExec(new Runnable() { + @Override public void run() { controlResized(null); @@ -204,11 +207,13 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void controlMoved(ControlEvent e) { // Do nothing } + @Override public void controlResized(ControlEvent e) { try @@ -245,6 +250,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void paintControl(PaintEvent e) { if (!resizing) @@ -260,6 +266,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor> } } + @Override public void run() { if (isDisposed()) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java index c0748a519d..625a2fce84 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverRepositoryPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class FailoverRepositoryPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java index 234892ace9..e3d2421bff 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class NormalRepositoryPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java index 7cff333026..8f0ed500d8 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/RepositoryDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -111,12 +111,14 @@ public class RepositoryDetails extends Composite updateUI(); repository.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (!isDisposed()) { getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateUI(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java index 6169f708de..f2d66e6f9a 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/Node.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -60,6 +60,7 @@ public final class Node implements IElement, Comparable<Node> return settings.getProperty(NodeType.NAME_PROPERTY); } + @Override public Properties getSettings() { return settings; @@ -70,16 +71,19 @@ public final class Node implements IElement, Comparable<Node> return settings.getProperty(key); } + @Override public void showSettings() { type.showSettings(this); } + @Override public Image getImage() { return type.getInstanceImage(); } + @Override public Composite getDetailsControl() { return type.getDetailsControl(this); @@ -123,6 +127,7 @@ public final class Node implements IElement, Comparable<Node> return getName(); } + @Override public int compareTo(Node o) { return getName().compareTo(o.getName()); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java index e556d7301a..eb84db5472 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -148,6 +148,7 @@ public class NodeManager extends Container<Object> return false; } + @Override public NodeType[] getElements() { return elements; diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java index 0c914a8073..77b1de9c84 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2019 Eike Stepper (Loehne, 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 @@ -119,6 +119,7 @@ public class NodeManagerDialog extends TitleAreaDialog treeViewer.setContentProvider(itemProvider); treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setCurrentElement(); @@ -127,6 +128,7 @@ public class NodeManagerDialog extends TitleAreaDialog treeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { if (getCurrentNode() != null) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java index 3616452de3..eeec392de7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -130,11 +130,13 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return properties; } + @Override public Properties getSettings() { return settings; } + @Override public void showSettings() { showSettings(null); @@ -180,6 +182,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return null; } + @Override public Image getImage() { return ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/Folder.gif"); @@ -202,6 +205,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return name; } + @Override public Composite getDetailsControl() { return getDetailsControl(null); @@ -416,6 +420,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement final Text text = new Text(parent, SWT.BORDER); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { if (!dialog.isUpdatingDetails()) @@ -460,6 +465,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement comboViewer.setLabelProvider(new LabelProvider()); comboViewer.setContentProvider(new IStructuredContentProvider() { + @Override public Object[] getElements(Object inputElement) { List<Node> result = new ArrayList<Node>(); @@ -476,10 +482,12 @@ public abstract class NodeType extends SetContainer<Node> implements IElement return result.toArray(new Node[result.size()]); } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void dispose() { } @@ -487,6 +495,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement comboViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (!dialog.isUpdatingDetails()) @@ -554,6 +563,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement { session.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (session.getRepositoryInfo().getState() != State.INITIAL) @@ -591,6 +601,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement CDOSessionConfigurationFactory factory = new CDOSessionConfigurationFactory() { + @Override public CDONet4jSessionConfiguration createSessionConfiguration() { String serverAddress = "localhost:" + serverNode.getSetting(PORT_PROPERTY); @@ -645,6 +656,7 @@ public abstract class NodeType extends SetContainer<Node> implements IElement transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); transaction.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.classpath index c83506765b..075009d774 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs index b61ffcacfa..6b35f57b85 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF index d59c8608ee..230ed9d7b6 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client;singleton:=true -Bundle-Version: 4.1.400.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide.application;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/pom.xml index 4c982d8663..2cf01cf7f6 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.client</artifactId> - <version>4.1.400-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs index b61ffcacfa..6b35f57b85 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF index 08a281dbbd..f07c27674c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true -Bundle-Version: 4.1.400.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml index 45aa576a15..d9eef2de63 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.clone</artifactId> - <version>4.1.400-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java index 520ac96d36..756b30c73d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -88,6 +88,7 @@ public abstract class AbstractOfflineExampleServer repository.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof RepositoryTypeChangedEvent) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java index 45995872e9..a98fa42483 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011, 2012, 2016, 2019 Eike Stepper (Loehne, 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 @@ -74,6 +74,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer { return new CDOSessionConfigurationFactory() { + @Override public CDONet4jSessionConfiguration createSessionConfiguration() { IConnector connector = createConnector("localhost:" + OfflineExampleUtil.MASTER_PORT); @@ -90,6 +91,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP)); configuration.addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof SessionOpenedEvent) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs index 02375399fc..a76956f9fd 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF index 54562cee74..44713e2b77 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company.edit; singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.examples.company.provider.CompanyEditPlugin$Implementation -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/pom.xml index a04294a987..0893abfd28 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.company.edit</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java index a83cdd77e7..41ff3420c3 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -318,6 +318,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public ComposeableAdapterFactory getRootAdapterFactory() { return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); @@ -328,6 +329,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { this.parentAdapterFactory = parentAdapterFactory; @@ -387,6 +389,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) { return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); @@ -396,6 +399,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return childCreationExtenderManager; @@ -406,6 +410,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void addListener(INotifyChangedListener notifyChangedListener) { changeNotifier.addListener(notifyChangedListener); @@ -416,6 +421,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void removeListener(INotifyChangedListener notifyChangedListener) { changeNotifier.removeListener(notifyChangedListener); @@ -427,6 +433,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * end-user-doc --> * @generated */ + @Override public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); @@ -442,6 +449,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void dispose() { if (companyItemProvider != null) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs index 02375399fc..a76956f9fd 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF index b8fec0e96b..f0b8c06256 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company; singleton:=true -Bundle-Version: 4.0.700.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.700", - org.eclipse.emf.cdo.examples.company.impl;version="4.0.700", - org.eclipse.emf.cdo.examples.company.util;version="4.0.700", - org.eclipse.emf.cdo.examples.company.validation;version="4.0.700" +Export-Package: org.eclipse.emf.cdo.examples.company;version="4.1.0", + org.eclipse.emf.cdo.examples.company.impl;version="4.1.0", + org.eclipse.emf.cdo.examples.company.util;version="4.1.0", + org.eclipse.emf.cdo.examples.company.validation;version="4.1.0" Automatic-Module-Name: org.eclipse.emf.cdo.examples.company diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/pom.xml index 2a3fed3de0..5cbae9e6c9 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.company</artifactId> - <version>4.0.700-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java index f7c1aa8a3b..ecfed682bf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -208,6 +208,7 @@ public enum VAT implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public int getValue() { return value; @@ -217,6 +218,7 @@ public enum VAT implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; @@ -226,6 +228,7 @@ public enum VAT implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getLiteral() { return literal; diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java index d3d40cf50e..8b2a7c829e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -67,6 +67,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getName() { return (String)eGet(CompanyPackage.Literals.ADDRESSABLE__NAME, true); @@ -76,6 +77,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { eSet(CompanyPackage.Literals.ADDRESSABLE__NAME, newName); @@ -85,6 +87,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getStreet() { return (String)eGet(CompanyPackage.Literals.ADDRESSABLE__STREET, true); @@ -94,6 +97,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setStreet(String newStreet) { eSet(CompanyPackage.Literals.ADDRESSABLE__STREET, newStreet); @@ -103,6 +107,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getCity() { return (String)eGet(CompanyPackage.Literals.ADDRESSABLE__CITY, true); @@ -112,6 +117,7 @@ public abstract class AddressableImpl extends CDOObjectImpl implements Addressab * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setCity(String newCity) { eSet(CompanyPackage.Literals.ADDRESSABLE__CITY, newCity); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java index 18e0c7156a..5fcc6749e4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -67,6 +67,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getName() { return (String)eGet(CompanyPackage.Literals.CATEGORY__NAME, true); @@ -76,6 +77,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { eSet(CompanyPackage.Literals.CATEGORY__NAME, newName); @@ -85,6 +87,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Category> getCategories() { @@ -95,6 +98,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Product> getProducts() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java index 2bdc06fe19..a68d7d55e0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -136,6 +136,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Supplier createSupplier() { SupplierImpl supplier = new SupplierImpl(); @@ -146,6 +147,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public PurchaseOrder createPurchaseOrder() { PurchaseOrderImpl purchaseOrder = new PurchaseOrderImpl(); @@ -156,6 +158,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public OrderDetail createOrderDetail() { OrderDetailImpl orderDetail = new OrderDetailImpl(); @@ -189,6 +192,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Category createCategory() { CategoryImpl category = new CategoryImpl(); @@ -199,6 +203,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Product createProduct() { ProductImpl product = new ProductImpl(); @@ -209,6 +214,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Company createCompany() { CompanyImpl company = new CompanyImpl(); @@ -219,6 +225,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Customer createCustomer() { CustomerImpl customer = new CustomerImpl(); @@ -229,6 +236,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Order createOrder() { OrderImpl order = new OrderImpl(); @@ -239,6 +247,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public SalesOrder createSalesOrder() { SalesOrderImpl salesOrder = new SalesOrderImpl(); @@ -249,6 +258,7 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public CompanyPackage getCompanyPackage() { return (CompanyPackage)getEPackage(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java index 609994afa4..2ecc10b2a2 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -61,6 +61,7 @@ public class CompanyImpl extends AddressableImpl implements Company * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Category> getCategories() { @@ -71,6 +72,7 @@ public class CompanyImpl extends AddressableImpl implements Company * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Supplier> getSuppliers() { @@ -81,6 +83,7 @@ public class CompanyImpl extends AddressableImpl implements Company * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<PurchaseOrder> getPurchaseOrders() { @@ -91,6 +94,7 @@ public class CompanyImpl extends AddressableImpl implements Company * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Customer> getCustomers() { @@ -101,6 +105,7 @@ public class CompanyImpl extends AddressableImpl implements Company * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<SalesOrder> getSalesOrders() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java index 2867b0a3ef..6313da9224 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java @@ -172,6 +172,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public EClass getAddressable() { return addressableEClass; @@ -183,6 +184,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public EAttribute getAddressable_Name() { return (EAttribute)addressableEClass.getEStructuralFeatures().get(0); @@ -194,6 +196,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public EAttribute getAddressable_Street() { return (EAttribute)addressableEClass.getEStructuralFeatures().get(1); @@ -205,6 +208,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public EAttribute getAddressable_City() { return (EAttribute)addressableEClass.getEStructuralFeatures().get(2); @@ -214,6 +218,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getSupplier() { return supplierEClass; @@ -223,6 +228,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getSupplier_PurchaseOrders() { return (EReference)supplierEClass.getEStructuralFeatures().get(0); @@ -232,6 +238,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getSupplier_Preferred() { return (EAttribute)supplierEClass.getEStructuralFeatures().get(1); @@ -241,6 +248,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getPurchaseOrder() { return purchaseOrderEClass; @@ -250,6 +258,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPurchaseOrder_Date() { return (EAttribute)purchaseOrderEClass.getEStructuralFeatures().get(0); @@ -259,6 +268,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getPurchaseOrder_Supplier() { return (EReference)purchaseOrderEClass.getEStructuralFeatures().get(1); @@ -268,6 +278,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getOrderDetail() { return orderDetailEClass; @@ -277,6 +288,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrderDetail_Order() { return (EReference)orderDetailEClass.getEStructuralFeatures().get(0); @@ -286,6 +298,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrderDetail_Product() { return (EReference)orderDetailEClass.getEStructuralFeatures().get(1); @@ -295,6 +308,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOrderDetail_Price() { return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(2); @@ -304,6 +318,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EEnum getVAT() { return vatEEnum; @@ -313,6 +328,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getCategory() { return categoryEClass; @@ -322,6 +338,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getCategory_Name() { return (EAttribute)categoryEClass.getEStructuralFeatures().get(0); @@ -331,6 +348,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCategory_Categories() { return (EReference)categoryEClass.getEStructuralFeatures().get(1); @@ -340,6 +358,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCategory_Products() { return (EReference)categoryEClass.getEStructuralFeatures().get(2); @@ -349,6 +368,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getProduct() { return productEClass; @@ -358,6 +378,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getProduct_Name() { return (EAttribute)productEClass.getEStructuralFeatures().get(0); @@ -367,6 +388,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getProduct_OrderDetails() { return (EReference)productEClass.getEStructuralFeatures().get(1); @@ -376,6 +398,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getProduct_Vat() { return (EAttribute)productEClass.getEStructuralFeatures().get(2); @@ -385,6 +408,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getProduct_Description() { return (EAttribute)productEClass.getEStructuralFeatures().get(3); @@ -396,6 +420,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public EAttribute getProduct_Price() { return (EAttribute)productEClass.getEStructuralFeatures().get(4); @@ -405,6 +430,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getCompany() { return companyEClass; @@ -414,6 +440,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCompany_Categories() { return (EReference)companyEClass.getEStructuralFeatures().get(0); @@ -423,6 +450,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCompany_Suppliers() { return (EReference)companyEClass.getEStructuralFeatures().get(1); @@ -432,6 +460,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCompany_PurchaseOrders() { return (EReference)companyEClass.getEStructuralFeatures().get(3); @@ -441,6 +470,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCompany_Customers() { return (EReference)companyEClass.getEStructuralFeatures().get(2); @@ -450,6 +480,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCompany_SalesOrders() { return (EReference)companyEClass.getEStructuralFeatures().get(4); @@ -459,6 +490,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getCustomer() { return customerEClass; @@ -468,6 +500,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getCustomer_SalesOrders() { return (EReference)customerEClass.getEStructuralFeatures().get(0); @@ -477,6 +510,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getOrder() { return orderEClass; @@ -486,6 +520,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrder_OrderDetails() { return (EReference)orderEClass.getEStructuralFeatures().get(0); @@ -495,6 +530,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getSalesOrder() { return salesOrderEClass; @@ -504,6 +540,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getSalesOrder_Id() { return (EAttribute)salesOrderEClass.getEStructuralFeatures().get(0); @@ -513,6 +550,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getSalesOrder_Customer() { return (EReference)salesOrderEClass.getEStructuralFeatures().get(1); @@ -522,6 +560,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public CompanyFactory getCompanyFactory() { return (CompanyFactory)getEFactoryInstance(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java index db953281fe..8d142e30b7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -53,6 +53,7 @@ public class CustomerImpl extends AddressableImpl implements Customer * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<SalesOrder> getSalesOrders() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java index a20ed78589..2d093f7d1f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -67,6 +67,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Order getOrder() { return (Order)eGet(CompanyPackage.Literals.ORDER_DETAIL__ORDER, true); @@ -76,6 +77,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setOrder(Order newOrder) { eSet(CompanyPackage.Literals.ORDER_DETAIL__ORDER, newOrder); @@ -85,6 +87,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Product getProduct() { return (Product)eGet(CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true); @@ -94,6 +97,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setProduct(Product newProduct) { eSet(CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, newProduct); @@ -103,6 +107,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public float getPrice() { return (Float)eGet(CompanyPackage.Literals.ORDER_DETAIL__PRICE, true); @@ -112,6 +117,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setPrice(float newPrice) { eSet(CompanyPackage.Literals.ORDER_DETAIL__PRICE, newPrice); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java index 123a7f7d74..ed31e05f69 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -65,6 +65,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<OrderDetail> getOrderDetails() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java index c438c47d4e..2f0608428f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -70,6 +70,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getName() { return (String)eGet(CompanyPackage.Literals.PRODUCT__NAME, true); @@ -79,6 +80,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { eSet(CompanyPackage.Literals.PRODUCT__NAME, newName); @@ -88,6 +90,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<OrderDetail> getOrderDetails() { @@ -98,6 +101,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public VAT getVat() { return (VAT)eGet(CompanyPackage.Literals.PRODUCT__VAT, true); @@ -107,6 +111,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setVat(VAT newVat) { eSet(CompanyPackage.Literals.PRODUCT__VAT, newVat); @@ -116,6 +121,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getDescription() { return (String)eGet(CompanyPackage.Literals.PRODUCT__DESCRIPTION, true); @@ -125,6 +131,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setDescription(String newDescription) { eSet(CompanyPackage.Literals.PRODUCT__DESCRIPTION, newDescription); @@ -136,6 +143,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public float getPrice() { return (Float)eGet(CompanyPackage.Literals.PRODUCT__PRICE, true); @@ -147,6 +155,7 @@ public class ProductImpl extends CDOObjectImpl implements Product * @since 4.0 <!-- end-user-doc --> * @generated */ + @Override public void setPrice(float newPrice) { eSet(CompanyPackage.Literals.PRODUCT__PRICE, newPrice); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java index 6e63d5232d..b0b60d1f8e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -55,6 +55,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Date getDate() { return (Date)eGet(CompanyPackage.Literals.PURCHASE_ORDER__DATE, true); @@ -64,6 +65,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setDate(Date newDate) { eSet(CompanyPackage.Literals.PURCHASE_ORDER__DATE, newDate); @@ -73,6 +75,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Supplier getSupplier() { return (Supplier)eGet(CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true); @@ -82,6 +85,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setSupplier(Supplier newSupplier) { eSet(CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, newSupplier); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java index 89bce679c4..02aead9422 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -53,6 +53,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public int getId() { return (Integer)eGet(CompanyPackage.Literals.SALES_ORDER__ID, true); @@ -62,6 +63,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setId(int newId) { eSet(CompanyPackage.Literals.SALES_ORDER__ID, newId); @@ -71,6 +73,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Customer getCustomer() { return (Customer)eGet(CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true); @@ -80,6 +83,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setCustomer(Customer newCustomer) { eSet(CompanyPackage.Literals.SALES_ORDER__CUSTOMER, newCustomer); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java index c92d2437e2..ea762a1967 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -54,6 +54,7 @@ public class SupplierImpl extends AddressableImpl implements Supplier * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<PurchaseOrder> getPurchaseOrders() { @@ -64,6 +65,7 @@ public class SupplierImpl extends AddressableImpl implements Supplier * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public boolean isPreferred() { return (Boolean)eGet(CompanyPackage.Literals.SUPPLIER__PREFERRED, true); @@ -73,6 +75,7 @@ public class SupplierImpl extends AddressableImpl implements Supplier * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setPreferred(boolean newPreferred) { eSet(CompanyPackage.Literals.SUPPLIER__PREFERRED, newPreferred); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.classpath index c83506765b..075009d774 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs index b61ffcacfa..6b35f57b85 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF index 05b92a0470..0e74c60639 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.master;singleton:=true -Bundle-Version: 4.1.600.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.admin;bundle-version="[4.1.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml index 3d9176162e..a11b9827cb 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.emf.cdo.examples.master</artifactId> - <version>4.1.600-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs index ec1df18c13..ce2d75b6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF index 120415537d..0ebcad02db 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.business.edit;singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.gastro.business.provider.BusinessEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.gastro.business.provider;version="4.0.300" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/pom.xml index 2773530d92..59b5f430fd 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.business.edit</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java index 5826834f60..4659f9b27e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -184,6 +184,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public ComposeableAdapterFactory getRootAdapterFactory() { return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); @@ -194,6 +195,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { this.parentAdapterFactory = parentAdapterFactory; @@ -245,6 +247,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void addListener(INotifyChangedListener notifyChangedListener) { changeNotifier.addListener(notifyChangedListener); @@ -255,6 +258,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void removeListener(INotifyChangedListener notifyChangedListener) { changeNotifier.removeListener(notifyChangedListener); @@ -266,6 +270,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * end-user-doc --> * @generated */ + @Override public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); @@ -281,6 +286,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void dispose() { if (businessDayItemProvider != null) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs index ec1df18c13..ce2d75b6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF index be00ba4f15..4fbe66edcc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.business;singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.business;version="4.0.600", - org.gastro.business.impl;version="4.0.600", - org.gastro.business.util;version="4.0.600" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gastro.business;version="4.1.0", + org.gastro.business.impl;version="4.1.0", + org.gastro.business.util;version="4.1.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/pom.xml index 42c0bb064f..9939b6b558 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.business</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java index a0856e854a..9310d0913d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -259,6 +259,7 @@ public enum OrderState implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public int getValue() { return value; @@ -268,6 +269,7 @@ public enum OrderState implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; @@ -277,6 +279,7 @@ public enum OrderState implements Enumerator * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public String getLiteral() { return literal; diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java index 660151f1b0..ad41696271 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -76,6 +76,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Date getDate() { return (Date)eGet(BusinessPackage.Literals.BUSINESS_DAY__DATE, true); @@ -85,6 +86,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setDate(Date newDate) { eSet(BusinessPackage.Literals.BUSINESS_DAY__DATE, newDate); @@ -94,6 +96,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public MenuCard getMenuCard() { return (MenuCard)eGet(BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true); @@ -103,6 +106,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setMenuCard(MenuCard newMenuCard) { eSet(BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, newMenuCard); @@ -112,6 +116,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Order> getOrders() { @@ -122,6 +127,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Waiter> getWaiters() { @@ -132,6 +138,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public boolean isClosed() { return (Boolean)eGet(BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true); @@ -141,6 +148,7 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setClosed(boolean newClosed) { eSet(BusinessPackage.Literals.BUSINESS_DAY__CLOSED, newClosed); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java index 522286894b..1f0018f058 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -124,6 +124,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public BusinessDay createBusinessDay() { BusinessDayImpl businessDay = new BusinessDayImpl(); @@ -134,6 +135,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Order createOrder() { OrderImpl order = new OrderImpl(); @@ -144,6 +146,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public OrderDetail createOrderDetail() { OrderDetailImpl orderDetail = new OrderDetailImpl(); @@ -154,6 +157,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Waiter createWaiter() { WaiterImpl waiter = new WaiterImpl(); @@ -187,6 +191,7 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public BusinessPackage getBusinessPackage() { return (BusinessPackage)getEPackage(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java index c92b75b4a9..2b44adfe1b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -135,6 +135,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getBusinessDay() { return businessDayEClass; @@ -144,6 +145,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getBusinessDay_Date() { return (EAttribute)businessDayEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getBusinessDay_MenuCard() { return (EReference)businessDayEClass.getEStructuralFeatures().get(1); @@ -162,6 +165,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getBusinessDay_Orders() { return (EReference)businessDayEClass.getEStructuralFeatures().get(2); @@ -171,6 +175,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getBusinessDay_Waiters() { return (EReference)businessDayEClass.getEStructuralFeatures().get(3); @@ -180,6 +185,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getBusinessDay_Closed() { return (EAttribute)businessDayEClass.getEStructuralFeatures().get(4); @@ -189,6 +195,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getOrder() { return orderEClass; @@ -198,6 +205,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrder_BusinessDay() { return (EReference)orderEClass.getEStructuralFeatures().get(0); @@ -207,6 +215,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrder_Table() { return (EReference)orderEClass.getEStructuralFeatures().get(1); @@ -216,6 +225,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrder_OrderDetails() { return (EReference)orderEClass.getEStructuralFeatures().get(2); @@ -225,6 +235,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOrder_Number() { return (EAttribute)orderEClass.getEStructuralFeatures().get(3); @@ -234,6 +245,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getOrderDetail() { return orderDetailEClass; @@ -243,6 +255,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrderDetail_Order() { return (EReference)orderDetailEClass.getEStructuralFeatures().get(0); @@ -252,6 +265,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getOrderDetail_Offering() { return (EReference)orderDetailEClass.getEStructuralFeatures().get(1); @@ -261,6 +275,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOrderDetail_Quantity() { return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(2); @@ -270,6 +285,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOrderDetail_State() { return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(3); @@ -279,6 +295,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOrderDetail_Price() { return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(4); @@ -288,6 +305,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EClass getWaiter() { return waiterEClass; @@ -297,6 +315,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getWaiter_BusinessDay() { return (EReference)waiterEClass.getEStructuralFeatures().get(0); @@ -306,6 +325,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getWaiter_Tables() { return (EReference)waiterEClass.getEStructuralFeatures().get(1); @@ -315,6 +335,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EReference getWaiter_Employee() { return (EReference)waiterEClass.getEStructuralFeatures().get(2); @@ -324,6 +345,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getWaiter_From() { return (EAttribute)waiterEClass.getEStructuralFeatures().get(3); @@ -333,6 +355,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EAttribute getWaiter_Until() { return (EAttribute)waiterEClass.getEStructuralFeatures().get(4); @@ -342,6 +365,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EEnum getOrderState() { return orderStateEEnum; @@ -351,6 +375,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public BusinessFactory getBusinessFactory() { return (BusinessFactory)getEFactoryInstance(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java index 53432ed680..2a643b8770 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -73,6 +73,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Order getOrder() { return (Order)eGet(BusinessPackage.Literals.ORDER_DETAIL__ORDER, true); @@ -82,6 +83,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setOrder(Order newOrder) { eSet(BusinessPackage.Literals.ORDER_DETAIL__ORDER, newOrder); @@ -91,6 +93,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Offering getOffering() { return (Offering)eGet(BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true); @@ -100,6 +103,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setOffering(Offering newOffering) { eSet(BusinessPackage.Literals.ORDER_DETAIL__OFFERING, newOffering); @@ -109,6 +113,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public int getQuantity() { return (Integer)eGet(BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true); @@ -118,6 +123,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setQuantity(int newQuantity) { eSet(BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, newQuantity); @@ -127,6 +133,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public OrderState getState() { return (OrderState)eGet(BusinessPackage.Literals.ORDER_DETAIL__STATE, true); @@ -136,6 +143,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setState(OrderState newState) { eSet(BusinessPackage.Literals.ORDER_DETAIL__STATE, newState); @@ -146,6 +154,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail * * @generated NOT */ + @Override public float getPrice() { Offering offering = getOffering(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java index 56434b06ae..bab396f496 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -73,6 +73,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public BusinessDay getBusinessDay() { return (BusinessDay)eGet(BusinessPackage.Literals.ORDER__BUSINESS_DAY, true); @@ -82,6 +83,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setBusinessDay(BusinessDay newBusinessDay) { eSet(BusinessPackage.Literals.ORDER__BUSINESS_DAY, newBusinessDay); @@ -91,6 +93,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Table getTable() { return (Table)eGet(BusinessPackage.Literals.ORDER__TABLE, true); @@ -100,6 +103,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setTable(Table newTable) { eSet(BusinessPackage.Literals.ORDER__TABLE, newTable); @@ -109,6 +113,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<OrderDetail> getOrderDetails() { @@ -119,6 +124,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public int getNumber() { return (Integer)eGet(BusinessPackage.Literals.ORDER__NUMBER, true); @@ -128,6 +134,7 @@ public class OrderImpl extends CDOObjectImpl implements Order * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setNumber(int newNumber) { eSet(BusinessPackage.Literals.ORDER__NUMBER, newNumber); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java index 17ef9e6981..65957531b7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -76,6 +76,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public BusinessDay getBusinessDay() { return (BusinessDay)eGet(BusinessPackage.Literals.WAITER__BUSINESS_DAY, true); @@ -85,6 +86,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setBusinessDay(BusinessDay newBusinessDay) { eSet(BusinessPackage.Literals.WAITER__BUSINESS_DAY, newBusinessDay); @@ -94,6 +96,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Table> getTables() { @@ -104,6 +107,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Employee getEmployee() { return (Employee)eGet(BusinessPackage.Literals.WAITER__EMPLOYEE, true); @@ -113,6 +117,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setEmployee(Employee newEmployee) { eSet(BusinessPackage.Literals.WAITER__EMPLOYEE, newEmployee); @@ -122,6 +127,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Date getFrom() { return (Date)eGet(BusinessPackage.Literals.WAITER__FROM, true); @@ -131,6 +137,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setFrom(Date newFrom) { eSet(BusinessPackage.Literals.WAITER__FROM, newFrom); @@ -140,6 +147,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public Date getUntil() { return (Date)eGet(BusinessPackage.Literals.WAITER__UNTIL, true); @@ -149,6 +157,7 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void setUntil(Date newUntil) { eSet(BusinessPackage.Literals.WAITER__UNTIL, newUntil); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs index ec1df18c13..ce2d75b6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF index 7d39965562..a50b45e6f9 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.gastro.inventory.provider;version="4.0.300" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/pom.xml index 0900b65307..203339274d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.inventory.edit</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java index 3f4ca9051d..b73c604f6f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -354,6 +354,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public ComposeableAdapterFactory getRootAdapterFactory() { return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); @@ -364,6 +365,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { this.parentAdapterFactory = parentAdapterFactory; @@ -417,6 +419,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public void addListener(INotifyChangedListener notifyChangedListener) { changeNotifier.addListener(notifyChangedListener); @@ -427,6 +430,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public void removeListener(INotifyChangedListener notifyChangedListener) { changeNotifier.removeListener(notifyChangedListener); @@ -438,6 +442,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public void fireNotifyChanged(Notification notification) { changeNotifier.fireNotifyChanged(notification); @@ -453,6 +458,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory * * @generated */ + @Override public void dispose() { if (stockItemProvider != null) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs index ec1df18c13..ce2d75b6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF index 2105d280d4..07eff44fb4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.inventory;singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.inventory;version="4.0.600", - org.gastro.inventory.impl;version="4.0.600", - org.gastro.inventory.util;version="4.0.600" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gastro.inventory;version="4.1.0", + org.gastro.inventory.impl;version="4.1.0", + org.gastro.inventory.util;version="4.1.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/pom.xml index e3520c39f6..ba845b4902 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017, 2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.inventory</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java index 2bec6e5aac..0782f1d918 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -50,6 +50,7 @@ public interface Recipe extends Product */ EList<Ingredient> getIngredients(); + @Override /** * Returns the value of the '<em><b>Department</b></em>' container reference. It is bidirectional and its opposite is * '{@link org.gastro.inventory.Department#getRecipes <em>Recipes</em>}'. <!-- begin-user-doc --> @@ -79,6 +80,7 @@ public interface Recipe extends Product */ void setDepartment(Department value); + @Override /** * Returns the value of the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> * <p> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java index 8d7aeb8169..e53f666efd 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -60,6 +60,7 @@ public interface StockProduct extends Product */ void setStock(Stock value); + @Override /** * Returns the value of the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> * <p> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java index a372cc7b2c..607b6c200a 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -65,6 +65,7 @@ public class DepartmentImpl extends StationImpl implements Department * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Recipe> getRecipes() { @@ -76,6 +77,7 @@ public class DepartmentImpl extends StationImpl implements Department * * @generated */ + @Override public Restaurant getRestaurant() { return (Restaurant)eGet(InventoryPackage.Literals.DEPARTMENT__RESTAURANT, true); @@ -86,6 +88,7 @@ public class DepartmentImpl extends StationImpl implements Department * * @generated */ + @Override public void setRestaurant(Restaurant newRestaurant) { eSet(InventoryPackage.Literals.DEPARTMENT__RESTAURANT, newRestaurant); @@ -96,6 +99,7 @@ public class DepartmentImpl extends StationImpl implements Department * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Employee> getEmployees() { @@ -107,6 +111,7 @@ public class DepartmentImpl extends StationImpl implements Department * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Stock> getStocks() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java index b8390591a9..7177961b9c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -72,6 +72,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee * * @generated */ + @Override public Department getDepartment() { return (Department)eGet(InventoryPackage.Literals.EMPLOYEE__DEPARTMENT, true); @@ -82,6 +83,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee * * @generated */ + @Override public void setDepartment(Department newDepartment) { eSet(InventoryPackage.Literals.EMPLOYEE__DEPARTMENT, newDepartment); @@ -92,6 +94,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee * * @generated */ + @Override public String getName() { return (String)eGet(InventoryPackage.Literals.EMPLOYEE__NAME, true); @@ -102,6 +105,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee * * @generated */ + @Override public void setName(String newName) { eSet(InventoryPackage.Literals.EMPLOYEE__NAME, newName); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java index 1d1063aa22..5aeabacfc2 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -74,6 +74,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public Recipe getRecipe() { return (Recipe)eGet(InventoryPackage.Literals.INGREDIENT__RECIPE, true); @@ -84,6 +85,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public void setRecipe(Recipe newRecipe) { eSet(InventoryPackage.Literals.INGREDIENT__RECIPE, newRecipe); @@ -94,6 +96,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public Product getProduct() { return (Product)eGet(InventoryPackage.Literals.INGREDIENT__PRODUCT, true); @@ -104,6 +107,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public void setProduct(Product newProduct) { eSet(InventoryPackage.Literals.INGREDIENT__PRODUCT, newProduct); @@ -114,6 +118,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public int getQuantity() { return (Integer)eGet(InventoryPackage.Literals.INGREDIENT__QUANTITY, true); @@ -124,6 +129,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient * * @generated */ + @Override public void setQuantity(int newQuantity) { eSet(InventoryPackage.Literals.INGREDIENT__QUANTITY, newQuantity); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java index 97b7e3a81a..1f89774460 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -114,6 +114,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Stock createStock() { StockImpl stock = new StockImpl(); @@ -125,6 +126,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public StockProduct createStockProduct() { StockProductImpl stockProduct = new StockProductImpl(); @@ -136,6 +138,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Recipe createRecipe() { RecipeImpl recipe = new RecipeImpl(); @@ -147,6 +150,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Ingredient createIngredient() { IngredientImpl ingredient = new IngredientImpl(); @@ -158,6 +162,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public MenuCard createMenuCard() { MenuCardImpl menuCard = new MenuCardImpl(); @@ -169,6 +174,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Restaurant createRestaurant() { RestaurantImpl restaurant = new RestaurantImpl(); @@ -180,6 +186,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Department createDepartment() { DepartmentImpl department = new DepartmentImpl(); @@ -191,6 +198,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Offering createOffering() { OfferingImpl offering = new OfferingImpl(); @@ -202,6 +210,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Table createTable() { TableImpl table = new TableImpl(); @@ -213,6 +222,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Employee createEmployee() { EmployeeImpl employee = new EmployeeImpl(); @@ -224,6 +234,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public Section createSection() { SectionImpl section = new SectionImpl(); @@ -235,6 +246,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto * * @generated */ + @Override public InventoryPackage getInventoryPackage() { return (InventoryPackage)getEPackage(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java index 2b9283c60c..876dcf5122 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -202,6 +202,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getStock() { return stockEClass; @@ -212,6 +213,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getStock_Products() { return (EReference)stockEClass.getEStructuralFeatures().get(0); @@ -222,6 +224,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getStock_Name() { return (EAttribute)stockEClass.getEStructuralFeatures().get(1); @@ -232,6 +235,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getStock_Department() { return (EReference)stockEClass.getEStructuralFeatures().get(2); @@ -242,6 +246,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getProduct() { return productEClass; @@ -252,6 +257,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getProduct_Name() { return (EAttribute)productEClass.getEStructuralFeatures().get(0); @@ -262,6 +268,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getStockProduct() { return stockProductEClass; @@ -272,6 +279,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getStockProduct_Stock() { return (EReference)stockProductEClass.getEStructuralFeatures().get(0); @@ -282,6 +290,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getStockProduct_Cost() { return (EAttribute)stockProductEClass.getEStructuralFeatures().get(1); @@ -292,6 +301,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getStockProduct_Available() { return (EAttribute)stockProductEClass.getEStructuralFeatures().get(2); @@ -302,6 +312,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getStockProduct_OrderLimit() { return (EAttribute)stockProductEClass.getEStructuralFeatures().get(3); @@ -312,6 +323,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getRecipe() { return recipeEClass; @@ -322,6 +334,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRecipe_Ingredients() { return (EReference)recipeEClass.getEStructuralFeatures().get(0); @@ -332,6 +345,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRecipe_Department() { return (EReference)recipeEClass.getEStructuralFeatures().get(1); @@ -342,6 +356,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getRecipe_Cost() { return (EAttribute)recipeEClass.getEStructuralFeatures().get(2); @@ -352,6 +367,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getIngredient() { return ingredientEClass; @@ -362,6 +378,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getIngredient_Recipe() { return (EReference)ingredientEClass.getEStructuralFeatures().get(0); @@ -372,6 +389,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getIngredient_Product() { return (EReference)ingredientEClass.getEStructuralFeatures().get(1); @@ -382,6 +400,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getIngredient_Quantity() { return (EAttribute)ingredientEClass.getEStructuralFeatures().get(2); @@ -392,6 +411,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getMenuCard() { return menuCardEClass; @@ -402,6 +422,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getMenuCard_Title() { return (EAttribute)menuCardEClass.getEStructuralFeatures().get(0); @@ -412,6 +433,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getMenuCard_Restaurant() { return (EReference)menuCardEClass.getEStructuralFeatures().get(1); @@ -422,6 +444,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getMenuCard_Sections() { return (EReference)menuCardEClass.getEStructuralFeatures().get(2); @@ -432,6 +455,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getRestaurant() { return restaurantEClass; @@ -442,6 +466,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getRestaurant_Name() { return (EAttribute)restaurantEClass.getEStructuralFeatures().get(0); @@ -452,6 +477,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRestaurant_Departments() { return (EReference)restaurantEClass.getEStructuralFeatures().get(1); @@ -462,6 +488,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRestaurant_MenuCards() { return (EReference)restaurantEClass.getEStructuralFeatures().get(2); @@ -472,6 +499,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRestaurant_Tables() { return (EReference)restaurantEClass.getEStructuralFeatures().get(3); @@ -482,6 +510,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getRestaurant_Stations() { return (EReference)restaurantEClass.getEStructuralFeatures().get(4); @@ -492,6 +521,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getDepartment() { return departmentEClass; @@ -502,6 +532,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getDepartment_Recipes() { return (EReference)departmentEClass.getEStructuralFeatures().get(0); @@ -512,6 +543,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getDepartment_Restaurant() { return (EReference)departmentEClass.getEStructuralFeatures().get(1); @@ -522,6 +554,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getDepartment_Employees() { return (EReference)departmentEClass.getEStructuralFeatures().get(2); @@ -532,6 +565,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getDepartment_Stocks() { return (EReference)departmentEClass.getEStructuralFeatures().get(3); @@ -542,6 +576,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getOffering() { return offeringEClass; @@ -552,6 +587,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getOffering_Product() { return (EReference)offeringEClass.getEStructuralFeatures().get(0); @@ -562,6 +598,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getOffering_Name() { return (EAttribute)offeringEClass.getEStructuralFeatures().get(1); @@ -572,6 +609,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getOffering_Description() { return (EAttribute)offeringEClass.getEStructuralFeatures().get(2); @@ -582,6 +620,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getOffering_Price() { return (EAttribute)offeringEClass.getEStructuralFeatures().get(3); @@ -592,6 +631,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getOffering_Section() { return (EReference)offeringEClass.getEStructuralFeatures().get(4); @@ -602,6 +642,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getTable() { return tableEClass; @@ -612,6 +653,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getTable_Seats() { return (EAttribute)tableEClass.getEStructuralFeatures().get(0); @@ -622,6 +664,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getTable_Restaurant() { return (EReference)tableEClass.getEStructuralFeatures().get(1); @@ -632,6 +675,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getEmployee() { return employeeEClass; @@ -642,6 +686,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getEmployee_Department() { return (EReference)employeeEClass.getEStructuralFeatures().get(0); @@ -652,6 +697,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getEmployee_Name() { return (EAttribute)employeeEClass.getEStructuralFeatures().get(1); @@ -662,6 +708,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getStation() { return stationEClass; @@ -672,6 +719,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getStation_StationID() { return (EAttribute)stationEClass.getEStructuralFeatures().get(0); @@ -682,6 +730,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EClass getSection() { return sectionEClass; @@ -692,6 +741,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getSection_MenuCard() { return (EReference)sectionEClass.getEStructuralFeatures().get(0); @@ -702,6 +752,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EReference getSection_Offerings() { return (EReference)sectionEClass.getEStructuralFeatures().get(1); @@ -712,6 +763,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getSection_Title() { return (EAttribute)sectionEClass.getEStructuralFeatures().get(2); @@ -722,6 +774,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public EAttribute getSection_Text() { return (EAttribute)sectionEClass.getEStructuralFeatures().get(3); @@ -732,6 +785,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka * * @generated */ + @Override public InventoryFactory getInventoryFactory() { return (InventoryFactory)getEFactoryInstance(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java index b4fa4e2232..b827712131 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -75,6 +75,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard * * @generated */ + @Override public String getTitle() { return (String)eGet(InventoryPackage.Literals.MENU_CARD__TITLE, true); @@ -85,6 +86,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard * * @generated */ + @Override public void setTitle(String newTitle) { eSet(InventoryPackage.Literals.MENU_CARD__TITLE, newTitle); @@ -95,6 +97,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard * * @generated */ + @Override public Restaurant getRestaurant() { return (Restaurant)eGet(InventoryPackage.Literals.MENU_CARD__RESTAURANT, true); @@ -105,6 +108,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard * * @generated */ + @Override public void setRestaurant(Restaurant newRestaurant) { eSet(InventoryPackage.Literals.MENU_CARD__RESTAURANT, newRestaurant); @@ -115,6 +119,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Section> getSections() { diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java index 8f43bf4226..3fab666093 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -76,6 +76,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public Product getProduct() { return (Product)eGet(InventoryPackage.Literals.OFFERING__PRODUCT, true); @@ -86,6 +87,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public void setProduct(Product newProduct) { eSet(InventoryPackage.Literals.OFFERING__PRODUCT, newProduct); @@ -96,6 +98,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public String getName() { return (String)eGet(InventoryPackage.Literals.OFFERING__NAME, true); @@ -106,6 +109,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public void setName(String newName) { eSet(InventoryPackage.Literals.OFFERING__NAME, newName); @@ -116,6 +120,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public String getDescription() { return (String)eGet(InventoryPackage.Literals.OFFERING__DESCRIPTION, true); @@ -126,6 +131,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public void setDescription(String newDescription) { eSet(InventoryPackage.Literals.OFFERING__DESCRIPTION, newDescription); @@ -136,6 +142,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public float getPrice() { return (Float)eGet(InventoryPackage.Literals.OFFERING__PRICE, true); @@ -146,6 +153,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public void setPrice(float newPrice) { eSet(InventoryPackage.Literals.OFFERING__PRICE, newPrice); @@ -156,6 +164,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public Section getSection() { return (Section)eGet(InventoryPackage.Literals.OFFERING__SECTION, true); @@ -166,6 +175,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering * * @generated */ + @Override public void setSection(Section newSection) { eSet(InventoryPackage.Literals.OFFERING__SECTION, newSection); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java index 82745e645a..da9959e283 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -70,6 +70,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product * * @generated */ + @Override public String getName() { return (String)eGet(InventoryPackage.Literals.PRODUCT__NAME, true); @@ -80,6 +81,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product * * @generated */ + @Override public void setName(String newName) { eSet(InventoryPackage.Literals.PRODUCT__NAME, newName); @@ -90,6 +92,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product * * @generated NOT */ + @Override public abstract float getCost(); } // ProductImpl diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java index 1a99209ea1..75f5ec6a1f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -62,6 +62,7 @@ public class RecipeImpl extends ProductImpl implements Recipe * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Ingredient> getIngredients() { @@ -73,6 +74,7 @@ public class RecipeImpl extends ProductImpl implements Recipe * * @generated */ + @Override public Department getDepartment() { return (Department)eGet(InventoryPackage.Literals.RECIPE__DEPARTMENT, true); @@ -83,6 +85,7 @@ public class RecipeImpl extends ProductImpl implements Recipe * * @generated */ + @Override public void setDepartment(Department newDepartment) { eSet(InventoryPackage.Literals.RECIPE__DEPARTMENT, newDepartment); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java index e3c6ce493a..01ced281c7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -80,6 +80,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated */ + @Override public String getName() { return (String)eGet(InventoryPackage.Literals.RESTAURANT__NAME, true); @@ -90,6 +91,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated */ + @Override public void setName(String newName) { eSet(InventoryPackage.Literals.RESTAURANT__NAME, newName); @@ -100,6 +102,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Department> getDepartments() { @@ -111,6 +114,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<MenuCard> getMenuCards() { @@ -122,6 +126,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Table> getTables() { @@ -133,6 +138,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant * * @generated NOT */ + @Override public EList<Station> getStations() { EList<Station> stations = new BasicEList<Station>(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java index 9ed14e7e5d..37783516bf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -76,6 +76,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public MenuCard getMenuCard() { return (MenuCard)eGet(InventoryPackage.Literals.SECTION__MENU_CARD, true); @@ -86,6 +87,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public void setMenuCard(MenuCard newMenuCard) { eSet(InventoryPackage.Literals.SECTION__MENU_CARD, newMenuCard); @@ -96,6 +98,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<Offering> getOfferings() { @@ -107,6 +110,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public String getTitle() { return (String)eGet(InventoryPackage.Literals.SECTION__TITLE, true); @@ -117,6 +121,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public void setTitle(String newTitle) { eSet(InventoryPackage.Literals.SECTION__TITLE, newTitle); @@ -127,6 +132,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public String getText() { return (String)eGet(InventoryPackage.Literals.SECTION__TEXT, true); @@ -137,6 +143,7 @@ public class SectionImpl extends CDOObjectImpl implements Section * * @generated */ + @Override public void setText(String newText) { eSet(InventoryPackage.Literals.SECTION__TEXT, newText); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java index 101019afb1..3eb1d3c0dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -70,6 +70,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station * * @generated */ + @Override public String getStationID() { return (String)eGet(InventoryPackage.Literals.STATION__STATION_ID, true); @@ -80,6 +81,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station * * @generated */ + @Override public void setStationID(String newStationID) { eSet(InventoryPackage.Literals.STATION__STATION_ID, newStationID); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java index 055d2b742d..392cfcae3f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -75,6 +75,7 @@ public class StockImpl extends CDOObjectImpl implements Stock * * @generated */ + @Override @SuppressWarnings("unchecked") public EList<StockProduct> getProducts() { @@ -86,6 +87,7 @@ public class StockImpl extends CDOObjectImpl implements Stock * * @generated */ + @Override public String getName() { return (String)eGet(InventoryPackage.Literals.STOCK__NAME, true); @@ -96,6 +98,7 @@ public class StockImpl extends CDOObjectImpl implements Stock * * @generated */ + @Override public void setName(String newName) { eSet(InventoryPackage.Literals.STOCK__NAME, newName); @@ -106,6 +109,7 @@ public class StockImpl extends CDOObjectImpl implements Stock * * @generated */ + @Override public Department getDepartment() { return (Department)eGet(InventoryPackage.Literals.STOCK__DEPARTMENT, true); @@ -116,6 +120,7 @@ public class StockImpl extends CDOObjectImpl implements Stock * * @generated */ + @Override public void setDepartment(Department newDepartment) { eSet(InventoryPackage.Literals.STOCK__DEPARTMENT, newDepartment); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java index 820e5e7a89..c9ac15c338 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -62,6 +62,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public Stock getStock() { return (Stock)eGet(InventoryPackage.Literals.STOCK_PRODUCT__STOCK, true); @@ -72,6 +73,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public void setStock(Stock newStock) { eSet(InventoryPackage.Literals.STOCK_PRODUCT__STOCK, newStock); @@ -93,6 +95,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public void setCost(float newCost) { eSet(InventoryPackage.Literals.STOCK_PRODUCT__COST, newCost); @@ -103,6 +106,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public int getAvailable() { return (Integer)eGet(InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true); @@ -113,6 +117,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public void setAvailable(int newAvailable) { eSet(InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, newAvailable); @@ -123,6 +128,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public int getOrderLimit() { return (Integer)eGet(InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true); @@ -133,6 +139,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @generated */ + @Override public void setOrderLimit(int newOrderLimit) { eSet(InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, newOrderLimit); @@ -143,6 +150,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct * * @ADDED */ + @Override public Department getDepartment() { Stock stock = getStock(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java index a014721d45..4b92231f77 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -59,6 +59,7 @@ public class TableImpl extends StationImpl implements Table * * @generated */ + @Override public int getSeats() { return (Integer)eGet(InventoryPackage.Literals.TABLE__SEATS, true); @@ -69,6 +70,7 @@ public class TableImpl extends StationImpl implements Table * * @generated */ + @Override public void setSeats(int newSeats) { eSet(InventoryPackage.Literals.TABLE__SEATS, newSeats); @@ -79,6 +81,7 @@ public class TableImpl extends StationImpl implements Table * * @generated */ + @Override public Restaurant getRestaurant() { return (Restaurant)eGet(InventoryPackage.Literals.TABLE__RESTAURANT, true); @@ -89,6 +92,7 @@ public class TableImpl extends StationImpl implements Table * * @generated */ + @Override public void setRestaurant(Restaurant newRestaurant) { eSet(InventoryPackage.Literals.TABLE__RESTAURANT, newRestaurant); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF index cb727fd020..94a42e3fb0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true -Bundle-Version: 4.0.700.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.gastro.rcp.internal.department.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true, - org.gastro.rcp.internal.department;version="4.0.700";x-internal:=true + org.gastro.rcp.internal.department;version="4.1.0";x-internal:=true Automatic-Module-Name: org.gastro.rcp.department diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/pom.xml index 078ca68991..d3c59ca47c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2018 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017-2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.rcp.department</artifactId> - <version>4.0.700-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/DepartmentPerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/DepartmentPerspective.java index 157626fc24..543abe2ea4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/DepartmentPerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/DepartmentPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2019 Eike Stepper (Loehne, 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 @@ -21,6 +21,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class DepartmentPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java index 773dec1e17..b66207075c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -69,6 +69,7 @@ public class OrdersView extends ViewPart { treeViewer.getTree().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -120,6 +121,7 @@ public class OrdersView extends ViewPart treeViewer = new TreeViewer(parent, SWT.NONE); treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Object object = ((IStructuredSelection)event.getSelection()).getFirstElement(); @@ -128,6 +130,7 @@ public class OrdersView extends ViewPart OrderDetail orderDetail = (OrderDetail)object; IModel.INSTANCE.modify(orderDetail, new ITransactionalOperation<OrderDetail>() { + @Override public Object execute(OrderDetail orderDetail) { orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF index 7d15f38c42..b35d7d62f0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true -Bundle-Version: 4.0.600.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Activator: org.gastro.rcp.internal.table.Activator Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: com.swtdesigner;version="4.0.500";x-internal:=true, - org.gastro.rcp.internal.table;version="4.0.600";x-internal:=true + org.gastro.rcp.internal.table;version="4.1.0";x-internal:=true Automatic-Module-Name: org.gastro.rcp.table diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/pom.xml index eeaa5b2d66..bdd93a0a2f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2018 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017-2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.rcp.table</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TablePerspective.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TablePerspective.java index f8c69ac21e..1c6dca4d26 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TablePerspective.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TablePerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2019 Eike Stepper (Loehne, 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 @@ -21,6 +21,7 @@ import org.eclipse.ui.IPerspectiveFactory; */ public class TablePerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TableView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TableView.java index 48cc383e08..d32e37244c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TableView.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/TableView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2019 Eike Stepper (Loehne, 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 @@ -107,6 +107,7 @@ public class TableView extends ViewPart { menuViewer.getTree().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -138,6 +139,7 @@ public class TableView extends ViewPart { menuViewer.getTree().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -211,6 +213,7 @@ public class TableView extends ViewPart menuViewer = new TreeViewer(shelfItem.getBody(), SWT.NONE); menuViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { EObject item = (EObject)((IStructuredSelection)event.getSelection()).getFirstElement(); @@ -668,6 +671,7 @@ public class TableView extends ViewPart { ITransactionalOperation<BusinessDay> operation = new ITransactionalOperation<BusinessDay>() { + @Override public Object execute(BusinessDay businessDay) { businessDay.cdoWriteLock().lock(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF index 25fbad8d0a..8d3340e569 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.rcp; singleton:=true -Bundle-Version: 4.1.600.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, @@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili org.eclipse.nebula.widgets.gallery;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, org.eclipse.nebula.widgets.pshelf;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.internal.rcp;version="4.1.600";x-internal:=true, - org.gastro.rcp;version="4.1.600" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: org.gastro.internal.rcp;version="4.2.0";x-internal:=true, + org.gastro.rcp;version="4.2.0" Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/pom.xml index 254b1fbc9c..1b95e10591 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2018 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017-2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.rcp</artifactId> - <version>4.1.600-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java index 65229e8831..16c29e6b24 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -30,6 +30,7 @@ public class Application implements IApplication * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) */ + @Override public Object start(IApplicationContext context) { Display display = PlatformUI.createDisplay(); @@ -53,6 +54,7 @@ public class Application implements IApplication * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#stop() */ + @Override public void stop() { final IWorkbench workbench = PlatformUI.getWorkbench(); @@ -63,6 +65,7 @@ public class Application implements IApplication final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Configuration.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Configuration.java index 4e8654e8e9..1f34adc813 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Configuration.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Configuration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2019 Eike Stepper (Loehne, 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 @@ -41,31 +41,37 @@ public class Configuration implements IConfiguration this.properties = properties; } + @Override public String getPerspective() { return properties.getProperty("perspective"); } + @Override public String getStation() { return properties.getProperty("station"); } + @Override public String getServer() { return properties.getProperty("server"); } + @Override public String getRepository() { return properties.getProperty("repository"); } + @Override public String getRestaurant() { return properties.getProperty("restaurant"); } + @Override public Date getBusinessDay() { return new Date(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java index 082fef1449..bb6ad49c1c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -70,11 +70,13 @@ public class Model extends Lifecycle implements IModel adapterFactory = new ComposedAdapterFactory(EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry()); } + @Override public AdapterFactory getAdapterFactory() { return adapterFactory; } + @Override public synchronized Restaurant getRestaurant() { if (restaurant == null) @@ -110,6 +112,7 @@ public class Model extends Lifecycle implements IModel return restaurant; } + @Override public synchronized BusinessDay getBusinessDay() { if (businessDay == null) @@ -157,6 +160,7 @@ public class Model extends Lifecycle implements IModel return businessDay; } + @Override public synchronized Station getStation() { if (station == null) @@ -175,6 +179,7 @@ public class Model extends Lifecycle implements IModel return station; } + @Override public <T extends CDOObject> Object modify(T object, ITransactionalOperation<T> operation) { CDOTransaction transaction = session.openTransaction(); diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.classpath index 16057af74c..0ffcc15f9e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen/"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF index d643b058b5..d8375a989c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.server.web;singleton:=true -Bundle-Version: 4.1.500.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Activator: org.gastro.server.internal.web.OM$Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -16,12 +16,12 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)", org.gastro.server;bundle-version="[4.0.0,5.0.0)", org.gastro.business;bundle-version="[4.0.0,5.0.0)", org.gastro.inventory;bundle-version="[4.0.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.3.0,4.0.0)", javax.servlet.http;version="[2.3.0,4.0.0)", org.apache.commons.lang;version="[2.3.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Export-Package: org.gastro.server.internal.web;version="4.1.500";x-internal:=true, +Export-Package: org.gastro.server.internal.web;version="4.2.0";x-internal:=true, templates;version="4.1.100";x-internal:=true Automatic-Module-Name: org.gastro.server.web diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/pom.xml index b7e17911b4..0d38a553db 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.server.web</artifactId> - <version>4.1.500-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.classpath index 64c5e31b7a..eca7bdba8f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF index ea0c057e29..0e104d99ec 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.server;singleton:=true -Bundle-Version: 4.0.600.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Version: 4.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", @@ -18,7 +18,7 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)", org.h2.util;version="[1.0.0,2.0.0)" Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.gastro.internal.server;version="4.0.600";x-internal:=true, - org.gastro.server;version="4.0.600" +Export-Package: org.gastro.internal.server;version="4.1.0";x-internal:=true, + org.gastro.server;version="4.1.0" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.gastro.server diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml index e0ce8134a0..5170279060 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2018 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017-2019 Eike Stepper (Loehne, 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 @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.server</artifactId> - <version>4.0.600-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.classpath b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.classpath index c83506765b..075009d774 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs index 3413c04844..0dbd6328dc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -95,11 +95,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -107,17 +108,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -201,11 +205,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -235,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -259,13 +266,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -312,6 +323,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -348,9 +361,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -376,6 +392,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/META-INF/MANIFEST.MF index 6cdf75c50e..59532a5cfd 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.testclient -Bundle-Version: 4.0.500.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Version: 4.1.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)", org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional, org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/pom.xml index 20ca362f7e..b058705a42 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/pom.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.testclient/pom.xml @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.gastro.testclient</artifactId> - <version>4.0.500-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |