You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/07/14 15:26:55 UTC
svn commit: r1752677 - in /uima/uimaj/trunk:
uimaj-eclipse-feature-tools/src/main/resources/ uimaj-ep-configurator/
uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/
uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator...
Author: schor
Date: Thu Jul 14 15:26:55 2016
New Revision: 1752677
URL: http://svn.apache.org/viewvc?rev=1752677&view=rev
Log:
[UIMA-4988] upgrade UIMA core sdk plugins to drop dependencies on old (version 2) no-longer-available Eclipse compatibility packages.
Modified:
uima/uimaj/trunk/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java
uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java
uima/uimaj/trunk/uimaj-ep-debug/pom.xml
uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java
uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java
uima/uimaj/trunk/uimaj-ep-launcher/pom.xml
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/src/main/resources/feature.xml?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-tools/src/main/resources/feature.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/src/main/resources/feature.xml Thu Jul 14 15:26:55 2016
@@ -42,7 +42,6 @@
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jdt.debug.ui"/>
<import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
Modified: uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/pom.xml?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/pom.xml Thu Jul 14 15:26:55 2016
@@ -117,12 +117,6 @@
<scope>provided</scope>
</dependency-->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
- <version>3.1.100</version>
- <scope>provided</scope>
- </dependency>
<!--dependency>
<groupId>org.eclipse.core</groupId>
@@ -250,12 +244,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.2.1</version>
@@ -324,7 +312,7 @@
org.apache.uima.taeconfigurator.model,
org.apache.uima.taeconfigurator.wizards
</Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <Bundle-Activator>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Bundle-Activator>
<Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
@@ -383,7 +371,7 @@ org.eclipse.core.runtime
</Import-Package>
- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
+ <!-- these determined to be needed empirically, due to a flaw in the bundle resolver -
it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
are not visible - this is a static final constant that gets compiled into a number
Modified: uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/TAEConfiguratorPlugin.java Thu Jul 14 15:26:55 2016
@@ -19,14 +19,12 @@
package org.apache.uima.taeconfigurator;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
@@ -40,9 +38,6 @@ import org.osgi.framework.BundleContext;
*/
/*
- * Plugin not yet converted to OSGi Bundle (3.0 design) - therefore will require the compatibility
- * interface.
- *
* The descriptor editor is a Multi-page editor, and implements the Model View Controller pattern
* (MVC). Model: Maintain data, basic logic plus one or more data sources View: Display all or a
* portion of the data. Implements the GUI that displays information about the model to the user
@@ -61,29 +56,13 @@ import org.osgi.framework.BundleContext;
public class TAEConfiguratorPlugin extends AbstractUIPlugin {
- // no longer include support for < 3.1
- public static final boolean is30version = false;
-
- /*
- public static final int eclipseVersionMajor;
-
- public static final int eclipseVersionMinor;
- static {
- Bundle bundle = Platform.getBundle("org.eclipse.platform");
- String versionString = (String) bundle.getHeaders().get(
- org.osgi.framework.Constants.BUNDLE_VERSION);
- PluginVersionIdentifier version = new PluginVersionIdentifier(versionString);
- eclipseVersionMajor = version.getMajorComponent();
- eclipseVersionMinor = version.getMinorComponent();
- is30version = eclipseVersionMajor == 3 && eclipseVersionMinor == 0;
- }
- */
-
// The shared instance.
private static TAEConfiguratorPlugin plugin;
// Resource bundle.
private ResourceBundle resourceBundle;
+
+
private static FormColors formColors;
@@ -119,17 +98,15 @@ public class TAEConfiguratorPlugin exten
public final static String IMAGE_NOMREF = "one_arrow.gif";
- private static URL installURL = null;
-
- public static String pluginId;
+ public static String pluginId ;
/**
- * The constructor.
+ * The constructor, version 3
*/
- public TAEConfiguratorPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public TAEConfiguratorPlugin() {
+ super();
plugin = this;
- pluginId = descriptor.getUniqueIdentifier();
+ pluginId = getBundle().getSymbolicName();
try {
resourceBundle = ResourceBundle.getBundle("org.apache.uima.taeconfigurator.taeconfigurator");
} catch (MissingResourceException x) {
@@ -151,14 +128,14 @@ public class TAEConfiguratorPlugin exten
imageRegistry.put(IMAGE_MREFOK, getImageDescriptor("arrows.gif"));
imageRegistry.put(IMAGE_NOMREF, getImageDescriptor("one_arrow.gif"));
}
-
+
/**
* Returns the shared instance.
*/
public static TAEConfiguratorPlugin getDefault() {
return plugin;
}
-
+
/**
* Returns the workspace instance.
*/
@@ -177,10 +154,14 @@ public class TAEConfiguratorPlugin exten
return key;
}
}
-
+
/**
- * called when the Eclipse environment is shut down
+ * This method is called when the plug-in is stopped.
+ *
+ * @param context
+ * @throws Exception -
*/
+ @Override
public void stop(BundleContext context) throws Exception {
try {
if (null != formColors)
@@ -218,16 +199,9 @@ public class TAEConfiguratorPlugin exten
return imageRegistry.get(imageFile);
}
- public static ImageDescriptor getImageDescriptor(String imageFile) {
- String iconPath = "icons/";
- try {
- if (null == installURL)
- installURL = getDefault().getDescriptor().getInstallURL();
- URL url = new URL(installURL, iconPath + imageFile);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException exc) {
- return ImageDescriptor.getMissingImageDescriptor();
- }
+ public ImageDescriptor getImageDescriptor(String imageFile) {
+ URL url = getBundle().getEntry("icons/" + imageFile);
+ return ImageDescriptor.createFromURL(url);
}
}
Modified: uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPage.java Thu Jul 14 15:26:55 2016
@@ -80,8 +80,8 @@ public abstract class HeaderPage extends
}
protected void maybeInitialize(IManagedForm managedForm) {
- if (TAEConfiguratorPlugin.is30version)
- ((ManagedForm) managedForm).initialize();
+// if (TAEConfiguratorPlugin.is30version)
+// ((ManagedForm) managedForm).initialize();
}
/*
Modified: uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/HeaderPageWithSash.java Thu Jul 14 15:26:55 2016
@@ -62,9 +62,10 @@ public class HeaderPageWithSash extends
};
haction.setChecked(true);
haction.setToolTipText("Horizontal Orientation");
- haction.setImageDescriptor(TAEConfiguratorPlugin
+ TAEConfiguratorPlugin instance = TAEConfiguratorPlugin.getDefault();
+ haction.setImageDescriptor(instance
.getImageDescriptor(TAEConfiguratorPlugin.IMAGE_TH_HORIZONTAL));
- haction.setDisabledImageDescriptor(TAEConfiguratorPlugin
+ haction.setDisabledImageDescriptor(instance
.getImageDescriptor(TAEConfiguratorPlugin.IMAGE_TH_HORIZONTAL));
vaction = new Action("ver", Action.AS_RADIO_BUTTON) { //$NON-NLS-1$
@@ -75,9 +76,9 @@ public class HeaderPageWithSash extends
};
vaction.setChecked(false);
vaction.setToolTipText("Vertical Orientation");
- vaction.setImageDescriptor(TAEConfiguratorPlugin
+ vaction.setImageDescriptor(instance
.getImageDescriptor(TAEConfiguratorPlugin.IMAGE_TH_VERTICAL));
- vaction.setDisabledImageDescriptor(TAEConfiguratorPlugin
+ vaction.setDisabledImageDescriptor(instance
.getImageDescriptor(TAEConfiguratorPlugin.IMAGE_TH_VERTICAL));
form.getToolBarManager().add(haction);
form.getToolBarManager().add(vaction);
Modified: uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/wizards/AbstractNewWizardPage.java Thu Jul 14 15:26:55 2016
@@ -57,7 +57,7 @@ public abstract class AbstractNewWizardP
super("wizardPage");
setTitle(title);
setDescription(description);
- setImageDescriptor(TAEConfiguratorPlugin.getImageDescriptor("big_t_s.gif"));
+ setImageDescriptor(TAEConfiguratorPlugin.getDefault().getImageDescriptor("big_t_s.gif"));
selection = pSelection;
this.defaultNewName = defaultNewName;
Modified: uima/uimaj/trunk/uimaj-ep-debug/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-debug/pom.xml?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-debug/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-debug/pom.xml Thu Jul 14 15:26:55 2016
@@ -170,12 +170,6 @@ UIMA data structures to the Eclipse Debu
<version>3.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml Thu Jul 14 15:26:55 2016
@@ -91,12 +91,6 @@
<version>3.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
- <version>3.1.100</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
@@ -146,12 +140,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.2.1</version>
@@ -214,7 +202,7 @@
<Export-Package>
org.apache.uima.jcas.jcasgenp
</Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <Bundle-Activator>org.apache.uima.jcas.jcasgenp.JgPlugin</Bundle-Activator>
<!-- handle split packages in Eclipse.
We do this by using Require-Bundle, and excluding from the Import-Package those
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java Thu Jul 14 15:26:55 2016
@@ -35,7 +35,7 @@ public class EP_LogThrowErrorImpl implem
* @see org.apache.uima.jcas.jcasgen_gen.IError#newError(int, java.lang.String)
*/
public void newError(int severity, String message, Exception exception) {
- String pluginId = JgPlugin.getDefault().getDescriptor().getUniqueIdentifier();
+ String pluginId = JgPlugin.getUniqueIdentifier();
ILog log = JgPlugin.getDefault().getLog();
log.log(new Status(logLevels[severity], pluginId, IStatus.OK, message, exception));
if (IError.WARN < severity)
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java Thu Jul 14 15:26:55 2016
@@ -21,7 +21,6 @@ package org.apache.uima.jcas.jcasgenp;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.Plugin;
/**
@@ -37,8 +36,8 @@ public class JgPlugin extends Plugin {
* The constructor.
*/
// @edu.umd.cs.findbugs.annotations.SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
- public JgPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public JgPlugin() {
+ super();
plugin = this;
}
Modified: uima/uimaj/trunk/uimaj-ep-launcher/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/pom.xml?rev=1752677&r1=1752676&r2=1752677&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/pom.xml Thu Jul 14 15:26:55 2016
@@ -216,7 +216,6 @@
<Import-Package>
!org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.eclipse.core.runtime.model,
org.eclipse.core.variables,
org.eclipse.core.commands.common,
org.eclipse.debug.core,