Skip to content

Commit

Permalink
Update Eclipse plugins to Java 17
Browse files Browse the repository at this point in the history
- rename groups from 'fr.inria.atlanmod' to 'org.atlanmod'
  • Loading branch information
sunye committed Feb 11, 2025
1 parent efd8432 commit 8e6480d
Show file tree
Hide file tree
Showing 97 changed files with 169 additions and 168 deletions.
18 changes: 9 additions & 9 deletions plugins/eclipse/bundles/ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Bundle-Name: NeoEMF Eclipse UI
Automatic-Module-Name: org.atlanmod.neoemf.eclipse.ui,
Bundle-SymbolicName: org.atlanmod.neoemf.eclipse.ui;singleton:=true
Bundle-Version: 2.1.1.qualifier
Bundle-Activator: fr.inria.atlanmod.neoemf.eclipse.ui.NeoUIPlugin
Bundle-Activator: org.atlanmod.neoemf.eclipse.ui.NeoUIPlugin
Bundle-Vendor: Atlanmod
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
Expand Down Expand Up @@ -39,10 +39,10 @@ Import-Package: org.eclipse.emf.common,
org.eclipse.swt,
org.eclipse.jface,
org.osgi.framework
Export-Package: fr.inria.atlanmod.neoemf.eclipse.ui,
fr.inria.atlanmod.neoemf.eclipse.ui.command,
fr.inria.atlanmod.neoemf.eclipse.ui.decorator,
fr.inria.atlanmod.neoemf.eclipse.ui.editor,
fr.inria.atlanmod.neoemf.eclipse.ui.importer,
fr.inria.atlanmod.neoemf.eclipse.ui.tester,
fr.inria.atlanmod.neoemf.eclipse.ui.wizard
Export-Package: org.atlanmod.neoemf.eclipse.ui,
org.atlanmod.neoemf.eclipse.ui.command,
org.atlanmod.neoemf.eclipse.ui.decorator,
org.atlanmod.neoemf.eclipse.ui.editor,
org.atlanmod.neoemf.eclipse.ui.importer,
org.atlanmod.neoemf.eclipse.ui.tester,
org.atlanmod.neoemf.eclipse.ui.wizard
50 changes: 25 additions & 25 deletions plugins/eclipse/bundles/ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<!-- Editors -->

<extension point="org.eclipse.ui.editors">
<editor class="fr.inria.atlanmod.neoemf.eclipse.ui.editor.NeoEditor"
<editor class="org.atlanmod.neoemf.eclipse.ui.editor.NeoEditor"
contributorClass="org.eclipse.emf.ecore.presentation.EcoreActionBarContributor"
default="false"
icon="icons/full/obj16/modelFile.gif"
id="fr.inria.atlanmod.neoemf.ui.editor.NeoEditor"
id="org.atlanmod.neoemf.ui.editor.NeoEditor"
name="NeoEMF Editor">
</editor>
</extension>
Expand All @@ -20,9 +20,9 @@
<modelImporterDescriptor description="Create the Ecore model, based on other Ecore or EMOF models"
extensions="ecore,emof"
icon="icons/full/obj16/model.gif"
id="fr.inria.atlanmod.neoemf.ui.model.importer"
id="org.atlanmod.neoemf.ui.model.importer"
name="Ecore model (NeoEMF Native)"
wizard="fr.inria.atlanmod.neoemf.eclipse.ui.wizard.NeoModelImporterWizard">
wizard="org.atlanmod.neoemf.eclipse.ui.wizard.NeoModelImporterWizard">
</modelImporterDescriptor>
</extension>

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

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

<command commandId="fr.inria.atlanmod.neoemf.ui.metamodel.migrate" style="push">
<command commandId="org.atlanmod.neoemf.ui.metamodel.migrate" style="push">
<visibleWhen>
<with variable="activeMenuSelection">
<iterate ifEmpty="false">
Expand All @@ -58,7 +58,7 @@
</command>

<command
commandId="fr.inria.atlanmod.neoemf.ui.metamodel.register"
commandId="org.atlanmod.neoemf.ui.metamodel.register"
icon="icons/full/obj16/register.png"
style="push">
<visibleWhen>
Expand All @@ -73,7 +73,7 @@
</command>

<command
commandId="fr.inria.atlanmod.neoemf.ui.metamodel.unregister"
commandId="org.atlanmod.neoemf.ui.metamodel.unregister"
icon="icons/full/obj16/unregister.png"
style="push">
<visibleWhen>
Expand All @@ -90,7 +90,7 @@
</menuContribution>

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

<extension point="org.eclipse.ui.commands">
<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.OpenBackendCommand"
id="fr.inria.atlanmod.neoemf.ui.backend.open"
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.OpenBackendCommand"
id="org.atlanmod.neoemf.ui.backend.open"
name="Open Model Database" />

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

<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.RegisterMetamodelCommand"
id="fr.inria.atlanmod.neoemf.ui.metamodel.register"
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.RegisterMetamodelCommand"
id="org.atlanmod.neoemf.ui.metamodel.register"
name="Register EPackages" />

<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.UnregisterMetamodelCommand"
id="fr.inria.atlanmod.neoemf.ui.metamodel.unregister"
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.UnregisterMetamodelCommand"
id="org.atlanmod.neoemf.ui.metamodel.unregister"
name="Unregister EPackages" />

<command defaultHandler="fr.inria.atlanmod.neoemf.eclipse.ui.command.CreateDynamicInstanceCommand"
id="fr.inria.atlanmod.neoemf.ui.model.dynamic.create"
<command defaultHandler="org.atlanmod.neoemf.eclipse.ui.command.CreateDynamicInstanceCommand"
id="org.atlanmod.neoemf.ui.model.dynamic.create"
name="Create NeoEMF Dynamic Instance..." />
</extension>

<!-- Testers -->

<extension point="org.eclipse.core.expressions.propertyTesters">
<propertyTester class="fr.inria.atlanmod.neoemf.eclipse.ui.tester.BackendPropertyTester"
id="fr.inria.atlanmod.neoemf.ui.backend.test"
namespace="fr.inria.atlanmod.neoemf.ui.backend"
<propertyTester class="org.atlanmod.neoemf.eclipse.ui.tester.BackendPropertyTester"
id="org.atlanmod.neoemf.ui.backend.test"
namespace="org.atlanmod.neoemf.ui.backend"
properties="is"
type="org.eclipse.core.resources.IFolder" />
</extension>
Expand All @@ -140,8 +140,8 @@

<extension point="org.eclipse.ui.decorators">
<decorator
class="fr.inria.atlanmod.neoemf.eclipse.ui.decorator.BackendDirectoryDecorator"
id="fr.inria.atlanmod.neoemf.ui.backend.decorator"
class="org.atlanmod.neoemf.eclipse.ui.decorator.BackendDirectoryDecorator"
id="org.atlanmod.neoemf.ui.backend.decorator"
label="NeoEMF Database Decorator"
state="true"
adaptable="true">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui;
package org.atlanmod.neoemf.eclipse.ui;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui;
package org.atlanmod.neoemf.eclipse.ui;

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

/**
* The unique identifier of NeoEMF.
*/
public static final String CORE_ID = "fr.inria.atlanmod.neoemf.core";
public static final String CORE_ID = "org.atlanmod.neoemf.core";

/**
* The shared instance of this plug-in.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.jface.viewers.IStructuredSelection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import fr.inria.atlanmod.neoemf.eclipse.ui.wizard.DynamicModelWizard;
import org.atlanmod.neoemf.eclipse.ui.wizard.DynamicModelWizard;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.resources.IFile;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import fr.inria.atlanmod.neoemf.eclipse.ui.importer.GenModelAdapter;
import fr.inria.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;
import org.atlanmod.neoemf.eclipse.ui.importer.GenModelAdapter;
import org.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.resources.IFile;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import fr.inria.atlanmod.neoemf.config.Config;
import fr.inria.atlanmod.neoemf.data.InvalidBackendException;
import fr.inria.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;
import fr.inria.atlanmod.neoemf.eclipse.ui.editor.NeoEditor;
import org.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;
import org.atlanmod.neoemf.eclipse.ui.editor.NeoEditor;
import fr.inria.atlanmod.neoemf.util.UriFactory;

import org.eclipse.core.commands.ExecutionEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import fr.inria.atlanmod.neoemf.eclipse.ui.MetamodelRegistry;
import org.atlanmod.neoemf.eclipse.ui.MetamodelRegistry;

/**
* A {@link org.eclipse.core.commands.IHandler} that registers metamodels.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.command;
package org.atlanmod.neoemf.eclipse.ui.command;

import fr.inria.atlanmod.neoemf.eclipse.ui.MetamodelRegistry;
import org.atlanmod.neoemf.eclipse.ui.MetamodelRegistry;

/**
* A {@link org.eclipse.core.commands.IHandler} that unregisters metamodels.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.decorator;
package org.atlanmod.neoemf.eclipse.ui.decorator;

import fr.inria.atlanmod.neoemf.config.Config;
import fr.inria.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;
import org.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;

import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.editor;
package org.atlanmod.neoemf.eclipse.ui.editor;

import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.editor;
package org.atlanmod.neoemf.eclipse.ui.editor;

import fr.inria.atlanmod.neoemf.config.Config;
import fr.inria.atlanmod.neoemf.config.ImmutableConfig;
Expand Down Expand Up @@ -37,7 +37,7 @@ public class NeoEditor extends EcoreEditor {
/**
* The unique identifier of this editor.
*/
public static final String EDITOR_ID = "fr.inria.atlanmod.neoemf.ui.editor." + NeoEditor.class.getSimpleName();
public static final String EDITOR_ID = "org.atlanmod.neoemf.ui.editor." + NeoEditor.class.getSimpleName();

@Override
public void createModel() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.importer;
package org.atlanmod.neoemf.eclipse.ui.importer;

import fr.inria.atlanmod.neoemf.core.DefaultPersistentEObject;
import fr.inria.atlanmod.neoemf.core.PersistentEObject;
import fr.inria.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;
import org.atlanmod.neoemf.eclipse.ui.NeoUIPlugin;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.importer;
package org.atlanmod.neoemf.eclipse.ui.importer;

import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
import org.eclipse.emf.common.util.BasicDiagnostic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.tester;
package org.atlanmod.neoemf.eclipse.ui.tester;

import fr.inria.atlanmod.neoemf.config.Config;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.wizard;
package org.atlanmod.neoemf.eclipse.ui.wizard;

import fr.inria.atlanmod.neoemf.core.PersistenceFactory;
import fr.inria.atlanmod.neoemf.eclipse.ui.editor.NeoEditor;
import org.atlanmod.neoemf.eclipse.ui.editor.NeoEditor;
import fr.inria.atlanmod.neoemf.util.UriFactory;

import org.eclipse.core.resources.IFolder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/
*/

package fr.inria.atlanmod.neoemf.eclipse.ui.wizard;
package org.atlanmod.neoemf.eclipse.ui.wizard;

import fr.inria.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;
import org.atlanmod.neoemf.eclipse.ui.importer.NeoModelImporter;

import org.eclipse.emf.converter.ModelConverter;
import org.eclipse.emf.importer.ui.contribution.base.ModelImporterDetailPage;
Expand Down
Loading

0 comments on commit 8e6480d

Please sign in to comment.