From e5bcb25d243df6aab645b7cc4e9226cb5d94517e Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 9 May 2020 14:20:29 +0200 Subject: [PATCH] update RCP to 2019-12 --- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../scviewer/e4/application/E4LifeCycle.java | 1 - .../application/parts/TransactionDetails.java | 1 - .../scviewer.product | 8 ++-- com.minres.scviewer.parent/pom.xml | 20 +++++----- .../com.minres.scviewer.target.target | 38 +++++++++---------- .../minres/scviewer/ui/TxEditorPlugin.java | 3 +- 9 files changed, 36 insertions(+), 40 deletions(-) diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index d073c7a..80af2a0 100644 --- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -7,8 +7,7 @@ Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: com.minres.scviewer.database, - org.codehaus.groovy;bundle-version="2.5.8", - org.eclipse.equinox.ds;bundle-version="1.4.200", + org.codehaus.groovy;bundle-version="2.5.0", org.eclipse.osgi.services;bundle-version="3.4.0", com.google.guava;bundle-version="15.0.0" Service-Component: OSGI-INF/component.xml diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF index f83fd29..15323ef 100644 --- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 2.0.2.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", - org.eclipse.equinox.ds;bundle-version="1.4.200", org.eclipse.osgi.services;bundle-version="3.4.0", com.google.guava;bundle-version="15.0.0" Service-Component: OSGI-INF/component.xml diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 7fcaa46..c96729f 100644 --- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", com.minres.scviewer.database.ui.swt;bundle-version="1.0.0", com.minres.scviewer.database.ui, com.minres.scviewer.database;bundle-version="1.0.0", - org.eclipse.equinox.ds;bundle-version="1.4.300", org.eclipse.osgi.services;bundle-version="3.5.0", org.eclipse.e4.core.services;bundle-version="2.0.0", org.eclipse.osgi.services;bundle-version="3.5.0", diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java index 7532fb8..310323a 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java @@ -46,7 +46,6 @@ import com.minres.scviewer.e4.application.options.Options.Separator; * org.eclipse.core.runtime.products' extension point) that references * this class. **/ -@SuppressWarnings("restriction") public class E4LifeCycle { /** diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java index db80d80..48118da 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java @@ -12,7 +12,6 @@ package com.minres.scviewer.e4.application.parts; import java.util.AbstractMap; import java.util.ArrayList; -import java.util.HashMap; import java.util.Map; import java.util.TreeMap; import java.util.Vector; diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product index 0e3f141..ec29a85 100644 --- a/com.minres.scviewer.e4.product/scviewer.product +++ b/com.minres.scviewer.e4.product/scviewer.product @@ -3,6 +3,7 @@ + @@ -19,6 +20,7 @@ + @@ -35,6 +37,7 @@ + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 @@ -78,7 +81,6 @@ - @@ -97,6 +99,7 @@ + @@ -104,7 +107,6 @@ - @@ -117,7 +119,6 @@ - @@ -147,6 +148,7 @@ + diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml index 42dec6e..e016903 100644 --- a/com.minres.scviewer.parent/pom.xml +++ b/com.minres.scviewer.parent/pom.xml @@ -86,21 +86,21 @@ - - linux - gtk - x86 - + + + + + linux gtk x86_64 - - win32 - win32 - x86 - + + + + + win32 win32 diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target index 4571d61..6b8700f 100644 --- a/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -2,32 +2,30 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + -x86_64 -de_DE + x86_64 + de_DE --Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G + -Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G \ No newline at end of file diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java index bd14536..8550cd2 100644 --- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java +++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java @@ -15,6 +15,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; @@ -93,7 +94,7 @@ public class TxEditorPlugin extends AbstractUIPlugin { */ public static ImageDescriptor getImageDescriptor(String path) { String fullpath = File.separator+"res"+File.separator+"images"+File.separator+path; - return imageDescriptorFromPlugin(PLUGIN_ID, fullpath); + return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, fullpath).orElse(null); } public static Image createImage(String name) {