Skip to content

Commit 8e6480d

Browse files
committed
Update Eclipse plugins to Java 17
- rename groups from 'fr.inria.atlanmod' to 'org.atlanmod'
1 parent efd8432 commit 8e6480d

97 files changed

Lines changed: 169 additions & 168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

plugins/eclipse/bundles/ui/META-INF/MANIFEST.MF

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Bundle-Name: NeoEMF Eclipse UI
44
Automatic-Module-Name: org.atlanmod.neoemf.eclipse.ui,
55
Bundle-SymbolicName: org.atlanmod.neoemf.eclipse.ui;singleton:=true
66
Bundle-Version: 2.1.1.qualifier
7-
Bundle-Activator: fr.inria.atlanmod.neoemf.eclipse.ui.NeoUIPlugin
7+
Bundle-Activator: org.atlanmod.neoemf.eclipse.ui.NeoUIPlugin
88
Bundle-Vendor: Atlanmod
9-
Bundle-RequiredExecutionEnvironment: JavaSE-11
9+
Bundle-RequiredExecutionEnvironment: JavaSE-17
1010
Bundle-ActivationPolicy: lazy
1111
Require-Bundle: org.eclipse.core.runtime,
1212
org.eclipse.core.resources,
@@ -39,10 +39,10 @@ Import-Package: org.eclipse.emf.common,
3939
org.eclipse.swt,
4040
org.eclipse.jface,
4141
org.osgi.framework
42-
Export-Package: fr.inria.atlanmod.neoemf.eclipse.ui,
43-
fr.inria.atlanmod.neoemf.eclipse.ui.command,
44-
fr.inria.atlanmod.neoemf.eclipse.ui.decorator,
45-
fr.inria.atlanmod.neoemf.eclipse.ui.editor,
46-
fr.inria.atlanmod.neoemf.eclipse.ui.importer,
47-
fr.inria.atlanmod.neoemf.eclipse.ui.tester,
48-
fr.inria.atlanmod.neoemf.eclipse.ui.wizard
42+
Export-Package: org.atlanmod.neoemf.eclipse.ui,
43+
org.atlanmod.neoemf.eclipse.ui.command,
44+
org.atlanmod.neoemf.eclipse.ui.decorator,
45+
org.atlanmod.neoemf.eclipse.ui.editor,
46+
org.atlanmod.neoemf.eclipse.ui.importer,
47+
org.atlanmod.neoemf.eclipse.ui.tester,
48+
org.atlanmod.neoemf.eclipse.ui.wizard

plugins/eclipse/bundles/ui/plugin.xml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<!-- Editors -->
66

77
<extension point="org.eclipse.ui.editors">
8-
<editor class="fr.inria.atlanmod.neoemf.eclipse.ui.editor.NeoEditor"
8+
<editor class="org.atlanmod.neoemf.eclipse.ui.editor.NeoEditor"
99
contributorClass="org.eclipse.emf.ecore.presentation.EcoreActionBarContributor"
1010
default="false"
1111
icon="icons/full/obj16/modelFile.gif"
12-
id="fr.inria.atlanmod.neoemf.ui.editor.NeoEditor"
12+
id="org.atlanmod.neoemf.ui.editor.NeoEditor"
1313
name="NeoEMF Editor">
1414
</editor>
1515
</extension>
@@ -20,9 +20,9 @@
2020
<modelImporterDescriptor description="Create the Ecore model, based on other Ecore or EMOF models"
2121
extensions="ecore,emof"
2222
icon="icons/full/obj16/model.gif"
23-
id="fr.inria.atlanmod.neoemf.ui.model.importer"
23+
id="org.atlanmod.neoemf.ui.model.importer"
2424
name="Ecore model (NeoEMF Native)"
25-
wizard="fr.inria.atlanmod.neoemf.eclipse.ui.wizard.NeoModelImporterWizard">
25+
wizard="org.atlanmod.neoemf.eclipse.ui.wizard.NeoModelImporterWizard">
2626
</modelImporterDescriptor>
2727
</extension>
2828

@@ -31,12 +31,12 @@
3131
<extension point="org.eclipse.ui.menus">
3232
<menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=additions">
3333
<menu icon="icons/full/obj16/neoemf.png" label="NeoEMF">
34-
<command commandId="fr.inria.atlanmod.neoemf.ui.backend.open" style="push">
34+
<command commandId="org.atlanmod.neoemf.ui.backend.open" style="push">
3535
<visibleWhen>
3636
<with variable="activeMenuSelection">
3737
<iterate ifEmpty="false">
3838
<adapt type="org.eclipse.core.resources.IFolder">
39-
<test property="fr.inria.atlanmod.neoemf.ui.backend.is" value="true" />
39+
<test property="org.atlanmod.neoemf.ui.backend.is" value="true" />
4040
</adapt>
4141
</iterate>
4242
</with>
@@ -45,7 +45,7 @@
4545

4646
<separator name="additions" visible="true" />
4747

48-
<command commandId="fr.inria.atlanmod.neoemf.ui.metamodel.migrate" style="push">
48+
<command commandId="org.atlanmod.neoemf.ui.metamodel.migrate" style="push">
4949
<visibleWhen>
5050
<with variable="activeMenuSelection">
5151
<iterate ifEmpty="false">
@@ -58,7 +58,7 @@
5858
</command>
5959

6060
<command
61-
commandId="fr.inria.atlanmod.neoemf.ui.metamodel.register"
61+
commandId="org.atlanmod.neoemf.ui.metamodel.register"
6262
icon="icons/full/obj16/register.png"
6363
style="push">
6464
<visibleWhen>
@@ -73,7 +73,7 @@
7373
</command>
7474

7575
<command
76-
commandId="fr.inria.atlanmod.neoemf.ui.metamodel.unregister"
76+
commandId="org.atlanmod.neoemf.ui.metamodel.unregister"
7777
icon="icons/full/obj16/unregister.png"
7878
style="push">
7979
<visibleWhen>
@@ -90,7 +90,7 @@
9090
</menuContribution>
9191

9292
<menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=additions">
93-
<command commandId="fr.inria.atlanmod.neoemf.ui.model.dynamic.create" style="push">
93+
<command commandId="org.atlanmod.neoemf.ui.model.dynamic.create" style="push">
9494
<visibleWhen>
9595
<with variable="activeMenuSelection">
9696
<iterate ifEmpty="false">
@@ -105,33 +105,33 @@
105105
<!-- Commands -->
106106

107107
<extension point="org.eclipse.ui.commands">
108-
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.OpenBackendCommand"
109-
id="fr.inria.atlanmod.neoemf.ui.backend.open"
108+
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.OpenBackendCommand"
109+
id="org.atlanmod.neoemf.ui.backend.open"
110110
name="Open Model Database" />
111111

112-
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.MigrateCommand"
113-
id="fr.inria.atlanmod.neoemf.ui.metamodel.migrate"
112+
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.MigrateCommand"
113+
id="org.atlanmod.neoemf.ui.metamodel.migrate"
114114
name="Migrate EMF Generator Model" />
115115

116-
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.RegisterMetamodelCommand"
117-
id="fr.inria.atlanmod.neoemf.ui.metamodel.register"
116+
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.RegisterMetamodelCommand"
117+
id="org.atlanmod.neoemf.ui.metamodel.register"
118118
name="Register EPackages" />
119119

120-
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.UnregisterMetamodelCommand"
121-
id="fr.inria.atlanmod.neoemf.ui.metamodel.unregister"
120+
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.UnregisterMetamodelCommand"
121+
id="org.atlanmod.neoemf.ui.metamodel.unregister"
122122
name="Unregister EPackages" />
123123

124-
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.CreateDynamicInstanceCommand"
125-
id="fr.inria.atlanmod.neoemf.ui.model.dynamic.create"
124+
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.CreateDynamicInstanceCommand"
125+
id="org.atlanmod.neoemf.ui.model.dynamic.create"
126126
name="Create NeoEMF Dynamic Instance..." />
127127
</extension>
128128

129129
<!-- Testers -->
130130

131131
<extension point="org.eclipse.core.expressions.propertyTesters">
132-
<propertyTester class="fr.inria.atlanmod.neoemf.eclipse.ui.tester.BackendPropertyTester"
133-
id="fr.inria.atlanmod.neoemf.ui.backend.test"
134-
namespace="fr.inria.atlanmod.neoemf.ui.backend"
132+
<propertyTester class="org.atlanmod.neoemf.eclipse.ui.tester.BackendPropertyTester"
133+
id="org.atlanmod.neoemf.ui.backend.test"
134+
namespace="org.atlanmod.neoemf.ui.backend"
135135
properties="is"
136136
type="org.eclipse.core.resources.IFolder" />
137137
</extension>
@@ -140,8 +140,8 @@
140140

141141
<extension point="org.eclipse.ui.decorators">
142142
<decorator
143-
class="fr.inria.atlanmod.neoemf.eclipse.ui.decorator.BackendDirectoryDecorator"
144-
id="fr.inria.atlanmod.neoemf.ui.backend.decorator"
143+
class="org.atlanmod.neoemf.eclipse.ui.decorator.BackendDirectoryDecorator"
144+
id="org.atlanmod.neoemf.ui.backend.decorator"
145145
label="NeoEMF Database Decorator"
146146
state="true"
147147
adaptable="true">

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/MetamodelRegistry.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/MetamodelRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui;
9+
package org.atlanmod.neoemf.eclipse.ui;
1010

1111
import fr.inria.atlanmod.neoemf.core.PersistenceFactory;
1212

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/NeoUIPlugin.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/NeoUIPlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui;
9+
package org.atlanmod.neoemf.eclipse.ui;
1010

1111
import org.eclipse.core.runtime.ILogListener;
1212
import org.eclipse.core.runtime.IStatus;
@@ -23,12 +23,12 @@ public class NeoUIPlugin extends AbstractUIPlugin {
2323
/**
2424
* The unique identifier of this plugin.
2525
*/
26-
public static final String PLUGIN_ID = "fr.inria.atlanmod.neoemf.eclipse.ui";
26+
public static final String PLUGIN_ID = "org.atlanmod.neoemf.eclipse.ui";
2727

2828
/**
2929
* The unique identifier of NeoEMF.
3030
*/
31-
public static final String CORE_ID = "fr.inria.atlanmod.neoemf.core";
31+
public static final String CORE_ID = "org.atlanmod.neoemf.core";
3232

3333
/**
3434
* The shared instance of this plug-in.

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/AbstractMetamodelCommand.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/AbstractMetamodelCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

1111
import org.eclipse.core.commands.AbstractHandler;
1212
import org.eclipse.core.commands.ExecutionEvent;

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionHandler.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

1111
import org.eclipse.core.commands.AbstractHandler;
1212
import org.eclipse.core.commands.ExecutionEvent;

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionManyHandler.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionManyHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

1111
import org.eclipse.core.commands.ExecutionEvent;
1212
import org.eclipse.jface.viewers.IStructuredSelection;

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionSingleHandler.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/AbstractSelectionSingleHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

1111
import org.eclipse.core.commands.ExecutionEvent;
1212
import org.eclipse.core.commands.ExecutionException;

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/CreateDynamicInstanceCommand.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/CreateDynamicInstanceCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

11-
import fr.inria.atlanmod.neoemf.eclipse.ui.wizard.DynamicModelWizard;
11+
import org.atlanmod.neoemf.eclipse.ui.wizard.DynamicModelWizard;
1212

1313
import org.eclipse.core.commands.ExecutionEvent;
1414
import org.eclipse.core.resources.IFile;

plugins/eclipse/bundles/ui/src/main/java/fr/inria/atlanmod/neoemf/eclipse/ui/command/MigrateCommand.java renamed to plugins/eclipse/bundles/ui/src/main/java/org/atlanmod/neoemf/eclipse/ui/command/MigrateCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
77
*/
88

9-
package fr.inria.atlanmod.neoemf.eclipse.ui.command;
9+
package org.atlanmod.neoemf.eclipse.ui.command;
1010

11-
import fr.inria.atlanmod.neoemf.eclipse.ui.importer.GenModelAdapter;
12-
import fr.inria.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;
11+
import org.atlanmod.neoemf.eclipse.ui.importer.GenModelAdapter;
12+
import org.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;
1313

1414
import org.eclipse.core.commands.ExecutionEvent;
1515
import org.eclipse.core.resources.IFile;

0 commit comments

Comments
 (0)