Skip to content

Commit 9e4a057

Browse files
committed
Update example code to jakarta namespace and Tycho 4.0.8
1 parent 9854498 commit 9e4a057

File tree

32 files changed

+391
-354
lines changed

32 files changed

+391
-354
lines changed

.mvn/wrapper/maven-wrapper.jar

-48.4 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

+19-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,19 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip

com.example.e4.product/com.example.e4.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<plugin id="com.example.e4.rcp"/>
2020
<plugin id="com.sun.jna"/>
2121
<plugin id="com.sun.jna.platform"/>
22-
<plugin id="javax.annotation"/>
22+
<plugin id="jakarta.annotation"/>
2323
<plugin id="javax.inject"/>
2424
<plugin id="org.apache.batik.constants"/>
2525
<plugin id="org.apache.batik.css"/>

com.example.e4.rcp/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
1414
org.eclipse.e4.ui.di;bundle-version="0.0.0",
1515
org.eclipse.e4.core.contexts;bundle-version="0.0.0"
1616
Bundle-RequiredExecutionEnvironment: JavaSE-17
17-
Import-Package: javax.annotation;version="0.0.0",
18-
javax.inject
17+
Import-Package: jakarta.annotation;version="0.0.0",
18+
jakarta.inject
1919
Automatic-Module-Name: com.example.e4.rcp

com.example.e4.rcp/src/com/example/e4/rcp/parts/SamplePart.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.util.Arrays;
44
import java.util.List;
55

6-
import javax.annotation.PostConstruct;
7-
import javax.inject.Inject;
6+
import jakarta.annotation.PostConstruct;
7+
import jakarta.inject.Inject;
88

99
import org.eclipse.e4.ui.di.Focus;
1010
import org.eclipse.e4.ui.di.Persist;

com.vogella.contribute.parts/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
1313
Bundle-RequiredExecutionEnvironment: JavaSE-17
1414
Automatic-Module-Name: com.vogella.contribute.parts
1515
Model-Fragment: parts.e4xmi
16-
Import-Package: javax.annotation
16+
Import-Package: jakarta.annotation
1717
Bundle-ActivationPolicy: lazy

com.vogella.contribute.parts/src/com/vogella/contribute/parts/AdditionalInformationPart.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.vogella.contribute.parts;
22

3-
import javax.annotation.PostConstruct;
3+
import jakarta.annotation.PostConstruct;
44

55
import org.eclipse.jface.widgets.TextFactory;
66
import org.eclipse.swt.SWT;

com.vogella.nattable/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Nattable
44
Bundle-SymbolicName: com.vogella.nattable;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: VOGELLA
7-
Require-Bundle: javax.inject;bundle-version="0.0.0",
7+
Require-Bundle: jakarta.inject;bundle-version="0.0.0",
88
org.eclipse.core.runtime;bundle-version="0.0.0",
99
org.eclipse.swt;bundle-version="0.0.0",
1010
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
@@ -20,5 +20,5 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
2020
org.eclipse.nebula.widgets.nattable.extension.e4;bundle-version="1.2.0",
2121
com.vogella.tasks.model;bundle-version="1.0.0"
2222
Bundle-RequiredExecutionEnvironment: JavaSE-14
23-
Import-Package: javax.annotation;version="1.3.5"
23+
Import-Package: jakarta.annotation;version="1.3.5"
2424
Automatic-Module-Name: com.vogella.nattable

com.vogella.nattable/com.vogella.nattable.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin id="com.vogella.tasks.events"/>
2727
<plugin id="com.vogella.tasks.model"/>
2828
<plugin id="com.vogella.tasks.services"/>
29-
<plugin id="javax.annotation"/>
29+
<plugin id="jakarta.annotation"/>
3030
<plugin id="javax.inject"/>
3131
<plugin id="org.apache.batik.constants"/>
3232
<plugin id="org.apache.batik.css"/>

com.vogella.nattable/src/com/vogella/nattable/parts/NatTableAdvancedExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import java.util.List;
55

6-
import javax.annotation.PostConstruct;
6+
import jakarta.annotation.PostConstruct;
77

88
import org.eclipse.nebula.widgets.nattable.NatTable;
99
import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

com.vogella.nattable/src/com/vogella/nattable/parts/NatTableEditorExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import java.util.List;
55

6-
import javax.annotation.PostConstruct;
6+
import jakarta.annotation.PostConstruct;
77

88
import org.eclipse.nebula.widgets.nattable.NatTable;
99
import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;

com.vogella.nattable/src/com/vogella/nattable/parts/NattableExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.List;
55
import java.util.Map;
66

7-
import javax.annotation.PostConstruct;
7+
import jakarta.annotation.PostConstruct;
88

99
import org.eclipse.jface.layout.GridDataFactory;
1010
import org.eclipse.nebula.widgets.nattable.NatTable;

com.vogella.nattable/src/com/vogella/nattable/parts/SamplePart.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.Arrays;
44
import java.util.List;
5-
import javax.annotation.PostConstruct;
6-
import javax.inject.Inject;
5+
import jakarta.annotation.PostConstruct;
6+
import jakarta.inject.Inject;
77

88
import org.eclipse.e4.ui.di.Focus;
99
import org.eclipse.e4.ui.di.Persist;

com.vogella.tasks.services/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bundle-Vendor: VOGELLA
77
Automatic-Module-Name: com.vogella.tasks.services
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Import-Package: com.vogella.tasks.model,
10-
javax.inject;version="1.0.0",
10+
jakarta.inject;version="[2.0.0,3.0.0)",
1111
org.osgi.service.component.annotations;resolution:=optional
1212
Bundle-ActivationPolicy: lazy
1313
Provide-Capability: osgi.service; objectClass=com.vogella.tasks.model.TaskService

com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.function.Consumer;
1010
import java.util.stream.Collectors;
1111

12-
import javax.inject.Inject;
12+
import jakarta.inject.Inject;
1313

1414
import org.eclipse.e4.core.services.events.IEventBroker;
1515

com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.function.Consumer;
1010
import java.util.stream.Collectors;
1111

12-
import javax.inject.Inject;
12+
import jakarta.inject.Inject;
1313

1414
import org.eclipse.e4.core.services.events.IEventBroker;
1515
import org.osgi.service.component.annotations.Component;

com.vogella.tasks.ui/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
2525
org.eclipse.jface
2626
Bundle-RequiredExecutionEnvironment: JavaSE-17
2727
Automatic-Module-Name: com.vogella.tasks.ui
28-
Import-Package: javax.annotation;version="1.3.5",
29-
javax.inject;version="1.0.0"
28+
Import-Package: jakarta.annotation,
29+
jakarta.inject
3030
Require-Capability: osgi.service;filter:="(objectClass=com.vogella.tasks.model.TaskService)"

com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/OpenEditorHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import javax.inject.Named;
5+
import jakarta.inject.Named;
66

77
import org.eclipse.e4.core.di.annotations.CanExecute;
88
import org.eclipse.e4.core.di.annotations.Execute;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTaskHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import java.util.List;
55

6-
import javax.inject.Named;
6+
import jakarta.inject.Named;
77

88
import org.eclipse.e4.core.di.annotations.CanExecute;
99
import org.eclipse.e4.core.di.annotations.Execute;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/SwitchPerspectiveHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
package com.vogella.tasks.ui.handlers;
33

4-
import javax.inject.Named;
4+
import jakarta.inject.Named;
55

66
import org.eclipse.e4.core.di.annotations.Execute;
77
import org.eclipse.e4.ui.workbench.modeling.EPartService;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/TasksCopyHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.List;
44
import java.util.stream.Collectors;
55

6-
import javax.inject.Named;
6+
import jakarta.inject.Named;
77

88
import org.eclipse.e4.core.di.annotations.CanExecute;
99
import org.eclipse.e4.core.di.annotations.Execute;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.stream.Collectors;
1313
import java.util.stream.Stream;
1414

15-
import javax.annotation.PostConstruct;
15+
import jakarta.annotation.PostConstruct;
1616

1717
import org.eclipse.jface.bindings.keys.KeyStroke;
1818
import org.eclipse.jface.fieldassist.ContentProposalAdapter;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.vogella.tasks.ui.parts;
22

3-
import javax.annotation.PostConstruct;
4-
import javax.inject.Inject;
3+
import jakarta.annotation.PostConstruct;
4+
import jakarta.inject.Inject;
55

66
import org.eclipse.e4.core.di.annotations.Optional;
77
import org.eclipse.e4.core.di.extensions.EventTopic;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TaskEditorPart.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import javax.annotation.PostConstruct;
7-
import javax.annotation.PreDestroy;
8-
import javax.inject.Inject;
6+
import jakarta.annotation.PostConstruct;
7+
import jakarta.annotation.PreDestroy;
8+
import jakarta.inject.Inject;
99

1010
import org.eclipse.core.databinding.Binding;
1111
import org.eclipse.core.databinding.DataBindingContext;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDeletionPart.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.annotation.PostConstruct;
6-
import javax.inject.Inject;
5+
import jakarta.annotation.PostConstruct;
6+
import jakarta.inject.Inject;
77

88
import org.eclipse.core.databinding.beans.typed.BeanProperties;
99
import org.eclipse.core.databinding.observable.list.WritableList;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDetailsPart.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import java.util.List;
55
import java.util.Map;
66

7-
import javax.annotation.PostConstruct;
8-
import javax.annotation.PreDestroy;
9-
import javax.inject.Inject;
10-
import javax.inject.Named;
7+
import jakarta.annotation.PostConstruct;
8+
import jakarta.annotation.PreDestroy;
9+
import jakarta.inject.Inject;
10+
import jakarta.inject.Named;
1111

1212
import org.eclipse.core.databinding.Binding;
1313
import org.eclipse.core.databinding.DataBindingContext;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoOverviewPart.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.Map;
55
import java.util.stream.Collectors;
66

7-
import javax.annotation.PostConstruct;
8-
import javax.inject.Inject;
7+
import jakarta.annotation.PostConstruct;
8+
import jakarta.inject.Inject;
99
import javax.swing.event.ListSelectionEvent;
1010

1111
import org.eclipse.core.databinding.beans.typed.BeanProperties;

com.vogella.tasks.ui/src/com/vogella/tasks/ui/toolcontrols/SearchToolControl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.vogella.tasks.ui.toolcontrols;
22

3-
import javax.annotation.PostConstruct;
3+
import jakarta.annotation.PostConstruct;
44

55
import org.eclipse.swt.SWT;
66
import org.eclipse.swt.widgets.Composite;

0 commit comments

Comments
 (0)