Skip to content

Commit

Permalink
Update example code to jakarta namespace and Tycho 4.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
vogella committed Jun 6, 2024
1 parent 9854498 commit 9e4a057
Show file tree
Hide file tree
Showing 32 changed files with 391 additions and 354 deletions.
Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
20 changes: 19 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
2 changes: 1 addition & 1 deletion com.example.e4.product/com.example.e4.product
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<plugin id="com.example.e4.rcp"/>
<plugin id="com.sun.jna"/>
<plugin id="com.sun.jna.platform"/>
<plugin id="javax.annotation"/>
<plugin id="jakarta.annotation"/>
<plugin id="javax.inject"/>
<plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
Expand Down
4 changes: 2 additions & 2 deletions com.example.e4.rcp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.e4.ui.di;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: javax.annotation;version="0.0.0",
javax.inject
Import-Package: jakarta.annotation;version="0.0.0",
jakarta.inject
Automatic-Module-Name: com.example.e4.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.Arrays;
import java.util.List;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;

import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.di.Persist;
Expand Down
2 changes: 1 addition & 1 deletion com.vogella.contribute.parts/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: com.vogella.contribute.parts
Model-Fragment: parts.e4xmi
Import-Package: javax.annotation
Import-Package: jakarta.annotation
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vogella.contribute.parts;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.jface.widgets.TextFactory;
import org.eclipse.swt.SWT;
Expand Down
4 changes: 2 additions & 2 deletions com.vogella.nattable/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Nattable
Bundle-SymbolicName: com.vogella.nattable;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: VOGELLA
Require-Bundle: javax.inject;bundle-version="0.0.0",
Require-Bundle: jakarta.inject;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.swt;bundle-version="0.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
Expand All @@ -20,5 +20,5 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.nebula.widgets.nattable.extension.e4;bundle-version="1.2.0",
com.vogella.tasks.model;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-14
Import-Package: javax.annotation;version="1.3.5"
Import-Package: jakarta.annotation;version="1.3.5"
Automatic-Module-Name: com.vogella.nattable
2 changes: 1 addition & 1 deletion com.vogella.nattable/com.vogella.nattable.product
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<plugin id="com.vogella.tasks.events"/>
<plugin id="com.vogella.tasks.model"/>
<plugin id="com.vogella.tasks.services"/>
<plugin id="javax.annotation"/>
<plugin id="jakarta.annotation"/>
<plugin id="javax.inject"/>
<plugin id="org.apache.batik.constants"/>
<plugin id="org.apache.batik.css"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import java.util.List;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import java.util.List;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.nebula.widgets.nattable.NatTable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.Arrays;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;

import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.di.Persist;
Expand Down
2 changes: 1 addition & 1 deletion com.vogella.tasks.services/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Vendor: VOGELLA
Automatic-Module-Name: com.vogella.tasks.services
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.vogella.tasks.model,
javax.inject;version="1.0.0",
jakarta.inject;version="[2.0.0,3.0.0)",
org.osgi.service.component.annotations;resolution:=optional
Bundle-ActivationPolicy: lazy
Provide-Capability: osgi.service; objectClass=com.vogella.tasks.model.TaskService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;

import javax.inject.Inject;
import jakarta.inject.Inject;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.eclipse.e4.core.services.events.IEventBroker;
import org.osgi.service.component.annotations.Component;
Expand Down
4 changes: 2 additions & 2 deletions com.vogella.tasks.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
org.eclipse.jface
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: com.vogella.tasks.ui
Import-Package: javax.annotation;version="1.3.5",
javax.inject;version="1.0.0"
Import-Package: jakarta.annotation,
jakarta.inject
Require-Capability: osgi.service;filter:="(objectClass=com.vogella.tasks.model.TaskService)"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;

import javax.inject.Named;
import jakarta.inject.Named;

import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import java.util.List;

import javax.inject.Named;
import jakarta.inject.Named;

import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

package com.vogella.tasks.ui.handlers;

import javax.inject.Named;
import jakarta.inject.Named;

import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.List;
import java.util.stream.Collectors;

import javax.inject.Named;
import jakarta.inject.Named;

import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vogella.tasks.ui.parts;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;

import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.di.extensions.EventTopic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import java.util.HashMap;
import java.util.Map;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.inject.Inject;

import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;

import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import java.util.List;
import java.util.Map;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.inject.Inject;
import jakarta.inject.Named;

import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import javax.swing.event.ListSelectionEvent;

import org.eclipse.core.databinding.beans.typed.BeanProperties;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vogella.tasks.ui.toolcontrols;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
Expand Down
Loading

0 comments on commit 9e4a057

Please sign in to comment.