Skip to content

Commit

Permalink
Upgrade to Eclipse Oxygen.
Browse files Browse the repository at this point in the history 
close #689

Signed-off-by: Stéphane Galland <galland@arakhne.org>
  • Loading branch information
@gallandarakhneorg
gallandarakhneorg committed Jul 6, 2017
1 parent a5f4775 commit 2c0f8bc
Show file tree
Hide file tree
Showing 24 changed files with 236 additions and 184 deletions.
10 changes: 5 additions & 5 deletions contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml
View file
Expand Up @@ -223,11 +223,11 @@

<requires>
<import plugin="io.sarl.eclipse" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.108.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common.ui" version="2.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.12.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.11.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common.ui" version="2.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.12.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
10 changes: 5 additions & 5 deletions contribs/io.sarl.examples/io.sarl.examples.plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -7,9 +7,9 @@ Bundle-Name: %Bundle-Name
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: io.sarl.eclipse;bundle-version="0.6.0",
org.eclipse.ui;bundle-version="3.108.1",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.emf.common.ui;bundle-version="2.11.0",
org.eclipse.ui.ide;bundle-version="3.12.3",
org.eclipse.core.resources;bundle-version="3.11.1"
org.eclipse.ui;bundle-version="3.109.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.emf.common.ui;bundle-version="2.12.0",
org.eclipse.ui.ide;bundle-version="3.13.0",
org.eclipse.core.resources;bundle-version="3.12.0"
Export-Package: io.sarl.examples.wizard
12 changes: 6 additions & 6 deletions contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml
View file
Expand Up @@ -225,13 +225,13 @@
<import plugin="io.sarl.lang.core" version="0.6.0" match="greaterOrEqual"/>
<import plugin="io.sarl.eclipse" version="0.6.0" match="greaterOrEqual"/>
<import plugin="io.sarl.lang.ui" version="0.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.11.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.commands" version="3.8.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.108.1" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.commands" version="3.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
10 changes: 5 additions & 5 deletions contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF
View file
Expand Up @@ -12,10 +12,10 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0",
io.sarl.eclipse;bundle-version="0.6.0",
io.sarl.lang.ui;bundle-version="0.6.0",
org.eclipse.xtext.ui;bundle-version="2.12.0",
org.eclipse.osgi;bundle-version="3.11.3",
org.eclipse.core.commands;bundle-version="3.8.1",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.jface;bundle-version="3.12.2",
org.eclipse.ui;bundle-version="3.108.1",
org.eclipse.osgi;bundle-version="3.12.0",
org.eclipse.core.commands;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.jface;bundle-version="3.13.0",
org.eclipse.ui;bundle-version="3.109.0",
com.google.inject;bundle-version="4.1.0"
Bundle-Activator: io.sarl.experienceindex.eclipse.SarlExperienceIndexPlugin
2 changes: 1 addition & 1 deletion main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,5 +9,5 @@ Export-Package: io.sarl.eventdispatching,
io.sarl.sarlspecification,
io.sarl.util
Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport,
org.eclipse.osgi;bundle-version="3.11.3"
org.eclipse.osgi;bundle-version="3.12.0"

36 changes: 18 additions & 18 deletions main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
View file
Expand Up @@ -12,24 +12,24 @@ Require-Bundle: io.sarl.lang.ui;bundle-version="0.6.0";visibility:=reexport,
org.eclipse.xtext.ui;bundle-version="2.12.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.12.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.12.0",
org.eclipse.ui.ide;bundle-version="3.12.3",
org.eclipse.core.filesystem;bundle-version="1.6.1",
org.eclipse.equinox.bidi;bundle-version="1.0.0",
org.eclipse.core.variables;bundle-version="3.3.0",
org.eclipse.core.net;bundle-version="1.3.0",
org.eclipse.debug.ui;bundle-version="3.11.202",
org.eclipse.ui.navigator;bundle-version="3.6.101",
org.eclipse.jdt.core;bundle-version="3.12.3",
org.eclipse.jdt.ui;bundle-version="3.12.2",
org.eclipse.jdt.launching;bundle-version="3.8.101",
org.eclipse.jdt.debug.ui;bundle-version="3.7.201",
org.eclipse.core.expressions;bundle-version="3.5.100",
org.eclipse.search;bundle-version="3.11.1",
org.eclipse.ui.console;bundle-version="3.6.201",
org.eclipse.ui;bundle-version="3.108.1",
org.eclipse.ui.intro;bundle-version="3.5.2",
org.eclipse.ui.intro.quicklinks;bundle-version="1.0.0",
org.eclipse.ui.intro.universal;bundle-version="3.3.1",
org.eclipse.ui.ide;bundle-version="3.13.0",
org.eclipse.core.filesystem;bundle-version="1.7.0",
org.eclipse.equinox.bidi;bundle-version="1.1.0",
org.eclipse.core.variables;bundle-version="3.4.0",
org.eclipse.core.net;bundle-version="1.3.100",
org.eclipse.debug.ui;bundle-version="3.12.0",
org.eclipse.ui.navigator;bundle-version="3.7.0",
org.eclipse.jdt.core;bundle-version="3.13.0",
org.eclipse.jdt.ui;bundle-version="3.13.0",
org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.jdt.debug.ui;bundle-version="3.8.0",
org.eclipse.core.expressions;bundle-version="3.6.0",
org.eclipse.search;bundle-version="3.11.100",
org.eclipse.ui.console;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.109.0",
org.eclipse.ui.intro;bundle-version="3.5.100",
org.eclipse.ui.intro.quicklinks;bundle-version="1.0.100",
org.eclipse.ui.intro.universal;bundle-version="3.3.100",
org.arakhne.afc.core.vmutils;bundle-version="14.0.0",
com.google.code.gson;bundle-version="2.8.0"
Bundle-Activator: io.sarl.eclipse.SARLEclipsePlugin
Expand Down
Binary file modified main/coreplugins/io.sarl.eclipse/icons/eclipse-about-banner.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main/coreplugins/io.sarl.eclipse/splash.bmp
View file
Binary file not shown.
8 changes: 5 additions & 3 deletions ...o.sarl.eclipse/src/io/sarl/eclipse/wizards/elements/AbstractSuperTypeSelectionDialog.java
View file
Expand Up @@ -37,12 +37,12 @@
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.dialogs.OpenTypeSelectionDialog;
import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Expand All @@ -60,6 +60,8 @@
*/
public abstract class AbstractSuperTypeSelectionDialog<T extends NewTypeWizardPage> extends OpenTypeSelectionDialog {

private static final String JAVA_ELEMENT_DELIMITERS = TextProcessor.getDefaultDelimiters() + "<>(),?{} "; //$NON-NLS-1$

private static final int ADD_ID = IDialogConstants.CLIENT_ID + 1;

private final T typeWizardPage;
Expand Down Expand Up @@ -200,10 +202,10 @@ private void fillWizardPageWithSelectedTypes() {

if (addTypeToWizardPage(this.typeWizardPage, qualifiedName)) {
message = MessageFormat.format(Messages.AbstractSuperTypeSelectionDialog_2,
BasicElementLabels.getJavaElementName(qualifiedName));
TextProcessor.process(qualifiedName, JAVA_ELEMENT_DELIMITERS));
} else {
message = MessageFormat.format(Messages.AbstractSuperTypeSelectionDialog_3,
BasicElementLabels.getJavaElementName(qualifiedName));
TextProcessor.process(qualifiedName, JAVA_ELEMENT_DELIMITERS));
}
updateStatus(new StatusInfo(IStatus.INFO, message));
}
Expand Down
12 changes: 6 additions & 6 deletions ...plugins/io.sarl.eclipse/src/io/sarl/eclipse/wizards/newproject/MainProjectWizardPage.java
View file
Expand Up @@ -56,7 +56,6 @@
import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
import org.eclipse.jdt.internal.ui.preferences.CompliancePreferencePage;
import org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage;
import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathSupport;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.ComboDialogField;
Expand Down Expand Up @@ -86,6 +85,7 @@
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
Expand Down Expand Up @@ -1258,8 +1258,8 @@ public void handlePossibleJVMChange() {
} else {
this.fHintText.setText(MessageFormat.format(
NewWizardMessages.NewJavaProjectWizardPageOne_DetectGroup_differendWorkspaceCC_message,
BasicElementLabels.getVersionName(defaultCompliance),
BasicElementLabels.getVersionName(selectedCompliance)));
TextProcessor.process(defaultCompliance),
TextProcessor.process(selectedCompliance)));
this.fHintText.setVisible(true);
this.icon.setImage(Dialog.getImage(Dialog.DLG_IMG_MESSAGE_INFO));
this.icon.setVisible(true);
Expand All @@ -1281,8 +1281,8 @@ public void handlePossibleJVMChange() {
|| JavaModelUtil.is50OrHigher(jvmCompliance))) {
this.fHintText.setText(MessageFormat.format(
NewWizardMessages.NewJavaProjectWizardPageOne_DetectGroup_jre_message,
BasicElementLabels.getVersionName(selectedCompliance),
BasicElementLabels.getVersionName(jvmCompliance)));
TextProcessor.process(selectedCompliance),
TextProcessor.process(jvmCompliance)));
this.fHintText.setVisible(true);
this.icon.setImage(Dialog.getImage(Dialog.DLG_IMG_MESSAGE_WARNING));
this.icon.setVisible(true);
Expand Down Expand Up @@ -1447,7 +1447,7 @@ private IProject checkProjectExist(IWorkspace workspace, String name) throws Val
null,
MessageFormat.format(
NewWizardMessages.NewJavaProjectWizardPageOne_Message_invalidProjectNameForWorkspaceRoot,
BasicElementLabels.getResourceName(existingName)));
TextProcessor.process(existingName)));
}
}
return handle;
Expand Down
6 changes: 3 additions & 3 deletions main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
View file
Expand Up @@ -11,10 +11,10 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0",
org.eclipse.xtend.ide;bundle-version="2.12.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.12.0",
org.eclipse.xtend.core;bundle-version="2.12.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.9.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.equinox.common;bundle-version="3.8.0",
org.eclipse.jdt.core;bundle-version="3.12.3",
org.eclipse.equinox.common;bundle-version="3.9.0",
org.eclipse.jdt.core;bundle-version="3.13.0",
org.objectweb.asm;bundle-version="5.0.1",
org.apache.commons.logging;bundle-version="1.1.1",
aopalliance;bundle-version="1.0.0"
Expand Down
12 changes: 6 additions & 6 deletions main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -15,12 +15,12 @@ Require-Bundle: io.sarl.lang;bundle-version="0.6.0";visibility:=reexport,
org.eclipse.xtend.core;bundle-version="2.12.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.12.0",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.jdt.core;bundle-version="3.12.3",
org.eclipse.jdt.ui;bundle-version="3.12.2",
org.eclipse.compare;bundle-version="3.7.1",
org.eclipse.jdt.debug.ui;bundle-version="3.7.201",
org.eclipse.ui;bundle-version="3.108.1",
org.eclipse.ui.editors;bundle-version="3.10.1",
org.eclipse.jdt.core;bundle-version="3.13.0",
org.eclipse.jdt.ui;bundle-version="3.13.0",
org.eclipse.compare;bundle-version="3.7.100",
org.eclipse.jdt.debug.ui;bundle-version="3.8.0",
org.eclipse.ui;bundle-version="3.109.0",
org.eclipse.ui.editors;bundle-version="3.11.0",
org.antlr.runtime;bundle-version="3.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: io.sarl.lang.ui.internal.LangActivator
Expand Down
6 changes: 3 additions & 3 deletions main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
View file
Expand Up @@ -13,11 +13,11 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport,
org.eclipse.xtext.xbase.lib;bundle-version="2.12.0",
org.eclipse.xtext.common.types;bundle-version="2.12.0",
org.eclipse.xtext.util;bundle-version="2.12.0",
org.eclipse.osgi;bundle-version="3.11.3",
org.eclipse.emf.codegen;bundle-version="2.11.0",
org.eclipse.osgi;bundle-version="3.12.0",
org.eclipse.emf.codegen;bundle-version="2.12.0",
org.antlr.runtime;bundle-version="3.2.0",
org.objectweb.asm;bundle-version="5.0.1";resolution:=optional,
org.eclipse.jdt.core;bundle-version="3.12.3"
org.eclipse.jdt.core;bundle-version="3.13.0"
Bundle-Activator: io.sarl.lang.SARLLangActivator
Export-Package: io.sarl.lang,
io.sarl.lang.actionprototype,
Expand Down
14 changes: 7 additions & 7 deletions main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
View file
Expand Up @@ -9,12 +9,12 @@ Bundle-ActivationPolicy: lazy
Bundle-Activator: io.sarl.m2e.SARLMavenEclipsePlugin
Require-Bundle: io.sarl.eclipse;bundle-version="0.6.0",
org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.core.resources;bundle-version="3.11.1",
org.eclipse.ui;bundle-version="3.108.1",
org.eclipse.m2e.maven.runtime;bundle-version="1.7.0",
org.eclipse.m2e.core;bundle-version="1.7.0",
org.eclipse.m2e.jdt;bundle-version="1.7.0",
org.eclipse.jdt.core;bundle-version="3.12.3",
org.eclipse.ui.ide;bundle-version="3.12.3"
org.eclipse.core.resources;bundle-version="3.12.0",
org.eclipse.ui;bundle-version="3.109.0",
org.eclipse.m2e.maven.runtime;bundle-version="1.8.0",
org.eclipse.m2e.core;bundle-version="1.8.0",
org.eclipse.m2e.jdt;bundle-version="1.8.0",
org.eclipse.jdt.core;bundle-version="3.13.0",
org.eclipse.ui.ide;bundle-version="3.13.0"
Export-Package: io.sarl.m2e;x-friends:="io.sarl.m2e.tests"

0 comments on commit 2c0f8bc

Please sign in to comment.