Skip to content

Commit

Permalink
Update to Eclipse 2024-09
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaskrause
thomaskrause committed Nov 26, 2024
1 parent e6e0137 commit e9336cb
Show file tree
Hide file tree
Showing 36 changed files with 96 additions and 97 deletions.
4 changes: 2 additions & 2 deletions bundles/org.corpus_tools.hexatomic.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime,
slf4j.api;bundle-version="2.0.7",
ch.qos.logback.classic;bundle-version="1.4.11",
ch.qos.logback.core;bundle-version="1.4.11",
javax.inject;bundle-version="1.0.0",
javax.annotation;bundle-version="1.3.5"
jakarta.annotation-api;bundle-version="2.1.1",
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.corpus_tools.hexatomic.core
6 changes: 3 additions & 3 deletions ...us_tools.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/ProjectManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

package org.corpus_tools.hexatomic.core;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
Expand All @@ -32,9 +35,6 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.corpus_tools.hexatomic.core.events.salt.SaltNotificationFactory;
import org.corpus_tools.hexatomic.core.handlers.OpenSaltDocumentHandler;
Expand Down
6 changes: 3 additions & 3 deletions ...us_tools.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/UiStatusReport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

package org.corpus_tools.hexatomic.core;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.Objects;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
Expand Down
4 changes: 2 additions & 2 deletions ...ols.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/errors/ErrorService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

package org.corpus_tools.hexatomic.core.errors;

import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/main/java/org/corpus_tools/hexatomic/core/events/salt/SaltNotificationFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

package org.corpus_tools.hexatomic.core.events.salt;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.SaltHelper;
import org.corpus_tools.salt.ISaltFactory;
import org.corpus_tools.salt.SaltFactory;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/corpus_tools/hexatomic/core/handlers/AutoGenerateNodeNamesHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

package org.corpus_tools.hexatomic.core.handlers;

import jakarta.inject.Inject;
import jakarta.inject.Named;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Named;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
Expand Down
4 changes: 2 additions & 2 deletions ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/ExitHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import javax.inject.Named;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
4 changes: 2 additions & 2 deletions ...ic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/NewSaltProjectHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import javax.inject.Named;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
2 changes: 1 addition & 1 deletion ....core/src/main/java/org/corpus_tools/hexatomic/core/handlers/OpenSaltDocumentHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

package org.corpus_tools.hexatomic.core.handlers;

import jakarta.inject.Named;
import java.util.Optional;
import javax.inject.Named;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
Expand Down
4 changes: 2 additions & 2 deletions ...c.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/OpenSaltProjectHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

import static org.corpus_tools.hexatomic.core.Preferences.LAST_PROJECT_LOCATION;

import javax.inject.Inject;
import javax.inject.Named;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
Expand Down
2 changes: 1 addition & 1 deletion ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/RedoHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
6 changes: 3 additions & 3 deletions ....hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/SaveAsHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.FileChooserProvider;
import org.corpus_tools.hexatomic.core.ProjectManager;
Expand Down
2 changes: 1 addition & 1 deletion ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/SaveHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.eclipse.e4.core.di.annotations.CanExecute;
Expand Down
2 changes: 1 addition & 1 deletion ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/handlers/UndoHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package org.corpus_tools.hexatomic.core.handlers;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
Expand Down
2 changes: 1 addition & 1 deletion ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/ui/PreferencesDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package org.corpus_tools.hexatomic.core.ui;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.Preferences;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
Expand Down
4 changes: 2 additions & 2 deletions ...rpus_tools.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/ui/StatusBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

package org.corpus_tools.hexatomic.core.ui;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import java.util.Timer;
import java.util.TimerTask;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.core.Topics;
import org.corpus_tools.hexatomic.core.UiStatusReport;
import org.corpus_tools.hexatomic.styles.ColorPalette;
Expand Down
2 changes: 1 addition & 1 deletion ...ols.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/update/UpdateRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

package org.corpus_tools.hexatomic.core.update;

import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.core.Preferences;
import org.corpus_tools.hexatomic.core.Topics;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.corpus_tools.hexatomic.corpusedit/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.osgi,
org.eclipse.emf.common,
org.eclipse.e4.ui.workbench,
slf4j.api;bundle-version="2.0.7",
javax.inject;bundle-version="1.0.0",
javax.annotation;bundle-version="1.3.5"
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5",
jakarta.annotation-api;bundle-version="1.3.5"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.corpus_tools.hexatomic.corpusedit
Bundle-ClassPath: .
Expand Down
4 changes: 2 additions & 2 deletions ...c.corpusedit/src/main/java/org/corpus_tools/hexatomic/corpusedit/CorpusStructureView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

package org.corpus_tools.hexatomic.corpusedit;

import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.core.CommandParams;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.SaltHelper;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.corpus_tools.hexatomic.formats/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench,
com.google.guava,
org.eclipse.e4.ui.workbench,
slf4j.api;bundle-version="2.0.7",
javax.inject;bundle-version="1.0.0"
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
Automatic-Module-Name: org.corpus.tools.hexatomic.formats
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Activator: org.corpus_tools.hexatomic.formats.Activator
Expand Down
2 changes: 1 addition & 1 deletion ...omic.formats/src/main/java/org/corpus_tools/hexatomic/formats/exporter/ExportHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package org.corpus_tools.hexatomic.formats.exporter;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.corpus_tools.hexatomic.core.events.salt.SaltNotificationFactory;
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.corpus_tools.hexatomic.graph/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.jface,
org.eclipse.jface.text,
org.eclipse.e4.core.services,
org.eclipse.nebula.widgets.chips,
org.antlr.runtime;bundle-version="4.7.2",
slf4j.api;bundle-version="2.0.7",
javax.inject;bundle-version="1.0.0",
javax.annotation;bundle-version="1.3.5"
org.antlr.antlr4-runtime;bundle-version="4.13.2",
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1",
jakarta.annotation-api;bundle-version="2.1.1"
Automatic-Module-Name: org.corpus_tools.hexatomic.edit.graph
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.console,
Expand Down
6 changes: 3 additions & 3 deletions ...pus_tools.hexatomic.graph/src/main/java/org/corpus_tools/hexatomic/graph/GraphEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Range;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
Expand All @@ -35,9 +38,6 @@
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.console.ConsoleView;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.Topics;
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.corpus_tools.hexatomic.grid/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Require-Bundle: org.corpus_tools.hexatomic.core,
org.apache.commons.lang3,
org.corpus-tools.salt-extensions;bundle-version="3.4.2",
slf4j.api;bundle-version="2.0.7",
javax.inject;bundle-version="1.0.0",
javax.annotation;bundle-version="1.3.5"
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1",
jakarta.annotation-api;bundle-version="2.1.1"
Automatic-Module-Name: org.corpus_tools.hexatomic.grid
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.grid,
Expand Down
8 changes: 4 additions & 4 deletions ...corpus_tools.hexatomic.grid/src/main/java/org/corpus_tools/hexatomic/grid/GridEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

package org.corpus_tools.hexatomic.grid;

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.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.Topics;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
Expand Down
2 changes: 1 addition & 1 deletion ...c.grid/src/main/java/org/corpus_tools/hexatomic/grid/internal/data/GraphDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

package org.corpus_tools.hexatomic.grid.internal.data;

import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Expand All @@ -33,7 +34,6 @@
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.corpus_tools.hexatomic.core.errors.HexatomicRuntimeException;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/corpus_tools/hexatomic/grid/internal/layers/GridColumnHeaderLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

package org.corpus_tools.hexatomic.grid.internal.layers;

import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.errors.ErrorService;
import org.corpus_tools.hexatomic.grid.internal.data.ColumnHeaderDataProvider;
import org.corpus_tools.hexatomic.grid.internal.handlers.DisplayAnnotationRenameDialogOnColumnCommandHandler;
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.corpus_tools.hexatomic.textviewer/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.osgi,
org.eclipse.emf.common,
org.eclipse.e4.core.services,
slf4j.api;bundle-version="2.0.7",
javax.inject;bundle-version="1.0.0",
javax.annotation;bundle-version="1.3.5"
jakarta.annotation-api;bundle-version="2.1.1",
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
Automatic-Module-Name: org.corpus_tools.hexatomic.textview
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.textviewer
6 changes: 3 additions & 3 deletions ....hexatomic.textviewer/src/main/java/org/corpus_tools/hexatomic/textviewer/TextViewer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

package org.corpus_tools.hexatomic.textviewer;

import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.inject.Inject;
import java.util.Optional;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.hexatomic.core.Topics;
import org.corpus_tools.hexatomic.core.handlers.OpenSaltDocumentHandler;
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/src/development/add-new-editor.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A part consists of two components:
Add a Java class to your bundle project.
This class does not need to inherit any interface, but should have a method with the `@PostConstruct` annotation.
```java
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;

/* ... */

Expand Down Expand Up @@ -112,7 +112,7 @@ When posting an event, you have to use the topic `DOCUMENT_CLOSED` and give the

```java

import javax.annotation.PreDestroy;
import jakarta.annotation.PreDestroy;
import org.corpus_tools.hexatomic.core.Topics;

/* ... */
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/src/development/data-model/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The currently opened Salt project is part of the global state of the application
For an overview of how dependency injection works in Eclipse-based applications such as Hexatomic, see Lars Vogel's tutorial ["Dependency injection and Eclipse"](http://web.archive.org/web/20190807184652/https://www.vogella.com/tutorials/EclipseRCP/article.html#dependency-injection-and-eclipse).

```java
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.corpus_tools.hexatomic.core.ProjectManager;
import org.corpus_tools.salt.common.SaltProject;

Expand Down
1 change: 0 additions & 1 deletion features/org.corpus_tools.hexatomic/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<import plugin="com.google.guava"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.nebula.widgets.chips"/>
<import plugin="org.antlr.runtime" version="4.7.2" match="greaterOrEqual"/>
<import plugin="org.corpus-tools.pepper-framework"/>
<import plugin="org.eclipse.e4.core.commands"/>
<import plugin="org.eclipse.e4.core.di"/>
Expand Down
Loading

0 comments on commit e9336cb

Please sign in to comment.