[UIMA-6341] Try out p2-layout-resolver
- Added some excludes on transitive dependencies which the p2 resolver seems to have trouble with (such using classifiers)
- Added overrides of getAdapter() to make the code compile - to be honest, I have no idea why these are needed because the parent classes already implement the method and all we do inside them is actually call super
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectView.java
index c609c03..c5e04de 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectView.java
@@ -64,4 +64,10 @@
super.init(site, memento);
}
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentView.java
index e463c8a..4c81e7a 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentView.java
@@ -65,4 +65,11 @@
this.memento = memento;
super.init(site, memento);
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ResultView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ResultView.java
index 0fd44e6..76d7bbb 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ResultView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ResultView.java
@@ -21,7 +21,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.part.ViewPart;
public class ResultView extends ViewPart {
@@ -31,7 +30,7 @@
@Override
public void createPartControl(Composite parent) {
this.resultViewComposite = new ResultViewComposite(parent, SWT.FILL);
- getSite().getPage().addSelectionListener((ISelectionListener) resultViewComposite);
+ getSite().getPage().addSelectionListener(resultViewComposite);
}
public ResultViewComposite getResultComposite() {
@@ -41,6 +40,12 @@
@Override
public void setFocus() {
this.resultViewComposite.setFocus();
-
+ }
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
}
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckView.java
index 4283172..76f3c90 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckView.java
@@ -66,5 +66,11 @@
this.memento = memento;
super.init(site, memento);
}
-
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyView.java
index 3480745..1f98ccf 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyView.java
@@ -42,4 +42,10 @@
return result;
}
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByView.java
index f56f198..82d2d85 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByView.java
@@ -41,5 +41,11 @@
}
return result;
}
-
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/element/ElementView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/element/ElementView.java
index 0b104b9..4b1cbef 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/element/ElementView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/element/ElementView.java
@@ -41,4 +41,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/failed/FailedView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/failed/FailedView.java
index eaf3c86..815a1bd 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/failed/FailedView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/failed/FailedView.java
@@ -41,4 +41,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/inlined/InlinedView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/inlined/InlinedView.java
index 9f0102d..01e37a6 100644
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/inlined/InlinedView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/inlined/InlinedView.java
@@ -41,5 +41,11 @@
}
return result;
}
-
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/matched/MatchedView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/matched/MatchedView.java
index 52d387a..fb4f396 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/matched/MatchedView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/matched/MatchedView.java
@@ -41,5 +41,11 @@
}
return result;
}
-
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListView.java
index 32b8463..c55959a 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListView.java
@@ -41,4 +41,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/selection/ExplainSelectionView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/selection/ExplainSelectionView.java
index eb9b587..00e61a1 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/selection/ExplainSelectionView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/selection/ExplainSelectionView.java
@@ -41,4 +41,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryView.java
index 331c1b9..183f91a 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryView.java
@@ -74,4 +74,11 @@
public QueryComposite getComposite() {
return viewContent;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/statistics/StatisticsView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/statistics/StatisticsView.java
index 282ab46..ce98dfc 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/statistics/StatisticsView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/statistics/StatisticsView.java
@@ -43,4 +43,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
index 05a6e63..e10f9fa 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
@@ -98,5 +98,11 @@
protected boolean isImportant(IWorkbenchPart part) {
return part.getSite().getId().equals("org.apache.uima.ruta.ide.ui.editor.RutaEditor");
}
-
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fn/FalseNegativeView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fn/FalseNegativeView.java
index 3121d4f..b725129 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fn/FalseNegativeView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fn/FalseNegativeView.java
@@ -44,4 +44,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fp/FalsePositiveView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fp/FalsePositiveView.java
index 6a05381..d2211df 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fp/FalsePositiveView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fp/FalsePositiveView.java
@@ -44,4 +44,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/tp/TruePositiveView.java b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/tp/TruePositiveView.java
index 0b50006..f61e675 100755
--- a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/tp/TruePositiveView.java
+++ b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/tp/TruePositiveView.java
@@ -44,4 +44,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/browser/AnnotationBrowserView.java b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/browser/AnnotationBrowserView.java
index f7fd114..f248ab5 100644
--- a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/browser/AnnotationBrowserView.java
+++ b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/browser/AnnotationBrowserView.java
@@ -50,4 +50,10 @@
return page;
}
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/html/HtmlView.java b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/html/HtmlView.java
index 000899c..2c38bbf 100644
--- a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/html/HtmlView.java
+++ b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/html/HtmlView.java
@@ -34,7 +34,8 @@
super("The instance view is currently not available.");
}
- protected IPageBookViewPage doCreatePage(ICasEditor editor) {
+ @Override
+ protected IPageBookViewPage doCreatePage(ICasEditor editor) {
IPageBookViewPage result = null;
if (editor.getDocument() != null && editor instanceof AnnotationEditor) {
HtmlViewPage page = new HtmlViewPage((AnnotationEditor) editor);
@@ -42,4 +43,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
diff --git a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/selection/SelectionView.java b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/selection/SelectionView.java
index 29a3468..4d140a9 100644
--- a/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/selection/SelectionView.java
+++ b/ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/selection/SelectionView.java
@@ -44,4 +44,11 @@
}
return result;
}
+
+ // Not sure why we need to add this... but here we go...
+ @Override
+ public Object getAdapter(Class aAdapter)
+ {
+ return super.getAdapter(aAdapter);
+ }
}
\ No newline at end of file
diff --git a/ruta-ep-ide-ui/pom.xml b/ruta-ep-ide-ui/pom.xml
index 482f766..7a635d5 100644
--- a/ruta-ep-ide-ui/pom.xml
+++ b/ruta-ep-ide-ui/pom.xml
@@ -137,6 +137,23 @@
<artifactId>org.eclipse.jdt.debug.ui</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with the "icu-data" classifier
+ -->
+ <groupId>org.eclipse</groupId>
+ <artifactId>com.ibm.icu</artifactId>
+ </exclusion>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with this one and tries to download it with
+ "tools" as the classifier.
+ -->
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
