Feature and bundle changes required to build with Tycho

Apache POI ExtendedColor API has changed from 3.10 to 3.14.
ExtendedColor.getRgbWithTint is now inherited from Color which has method getRGBWithTint.

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
index 81aa67eaae38d20a9b7421d713414a874c416872..444054c8b23e088da2a1840a057aa4e2b29bc118 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/ExcelImport.java
@@ -398,7 +398,7 @@ public class ExcelImport {
             XSSFColor fontColor = xssfFont.getXSSFColor();\r
             if (fontColor != null) {\r
                 \r
-                byte[] rgb = fontColor.getRgbWithTint();\r
+                byte[] rgb = fontColor.getRGBWithTint();\r
                 \r
                 String ix = fontColor.getARGBHex();\r
                 RGB.Integer s = hex2Rgb(ix);\r

diff --git a/features/org.simantics.charts.feature/feature.xml b/features/org.simantics.charts.feature/feature.xml
index a00ee500ab0fb8e423831b38c195e9dffb4b3b4a..32d412a74fb649d291c06cf0f5287cb624db1280 100644 (file)
--- a/features/org.simantics.charts.feature/feature.xml
+++ b/features/org.simantics.charts.feature/feature.xml
@@ -17,10 +17,6 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
    <includes\r
          id="org.simantics.g2d"\r
          version="0.0.0"/>\r

diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index 060e326e097b2f46caafed78a6e7634339c0d462..00eab1cb3df85a4b46a0d68ef0f87ea6de63224f 100644 (file)
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -33,11 +33,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="org.simantics.views.swt"\r
+         id="org.simantics.views.swt.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r
@@ -96,13 +92,6 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="net.sf.cglib"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
    <plugin\r
          id="org.objectweb.asm"\r
          download-size="0"\r

diff --git a/features/org.simantics.modeling.feature/feature.xml b/features/org.simantics.modeling.feature/feature.xml
index e77581d801a439f5a6b979d12b241063c702639e..fa10579e32adfb7f03ef54e241b23db22999b888 100644 (file)
--- a/features/org.simantics.modeling.feature/feature.xml
+++ b/features/org.simantics.modeling.feature/feature.xml
@@ -28,10 +28,6 @@
       Licensed under Eclipse Public License (EPL) 1.0.\r
    </license>\r
 \r
-   <includes\r
-         id="org.jfree"\r
-         version="0.0.0"/>\r
-\r
    <includes\r
          id="com.lowagie.text"\r
          version="0.0.0"/>\r

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index 87764edb9bf951f59b542730e660e0e5033607af..d7e7e3644cf336c3373536ba1108a73b2c927ab3 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -104,6 +104,14 @@
          id="org.simantics.issues.ui.feature"\r
          version="0.0.0"/>\r
 \r
+   <includes\r
+         id="org.simantics.views.swt.client.feature"\r
+         version="0.0.0"/>\r
+
+   <includes\r
+         id="org.simantics.views.swt.feature"\r
+         version="0.0.0"/>\r
+\r
    <includes\r
          id="org.simantics.workbench"\r
          version="0.0.0"/>\r
@@ -134,11 +142,7 @@
 \r
    <includes\r
          id="org.simantics.eclipsec.launcher"\r
-         version="0.0.0"\r
-         optional="true"\r
-         os="win32"\r
-         ws="win32,wpf"\r
-         arch="x86,x86_64"/>\r
+         version="0.0.0"/>\r
 \r
    <includes\r
          id="org.simantics.help"\r

diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 6352e97154b3a95d50eb4bde670665abc9d03533..14be2cf1d7decb7659631dfa6218c2bc637204c4 100644 (file)
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -31,7 +31,6 @@
    <requires>\r
       <import feature="org.simantics.layer0" version="1.2.0" match="compatible"/>\r
       <import feature="org.simantics.rcp" version="1.25.0" match="compatible"/>\r
-      <import feature="org.simantics.platform.ui" version="1.25.0" match="compatible"/>\r
    </requires>\r
 \r
    <plugin\r
@@ -159,6 +158,7 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+<!--
    <plugin\r
          id="org.simantics.editors.win32"\r
          os="win32"\r
@@ -166,6 +166,7 @@
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
+-->
 \r
    <plugin\r
          id="org.eclipse.ui.editors"\r

diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index 3892f7d0865aeac36e372f7cbd783d4af8a46aca..b81e2e567e8fd6337f569dc28878becdae467388 100644 (file)
--- a/features/org.simantics.utils.feature/feature.xml
+++ b/features/org.simantics.utils.feature/feature.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--
-    Copyright (c) 2007, 2010 Association for Decentralized Information Management
-    in Industry THTH ry.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
+<!--\r
+    Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
+    in Industry THTH ry.\r
+    All rights reserved. This program and the accompanying materials\r
+    are made available under the terms of the Eclipse Public License v1.0\r
+    which accompanies this distribution, and is available at\r
+    http://www.eclipse.org/legal/epl-v10.html\r
+   \r
+    Contributors:\r
+        VTT Technical Research Centre of Finland - initial API and implementation\r
  -->\r
 <feature\r
       id="org.simantics.utils"\r
@@ -28,10 +28,6 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <includes\r
-         id="org.apache.commons"\r
-         version="0.0.0"/>\r
-\r
    <requires>\r
       <import plugin="org.eclipse.core.runtime"/>\r
       <import plugin="org.eclipse.core.resources"/>\r
@@ -39,28 +35,35 @@
    </requires>\r
 \r
    <plugin\r
-         id="org.simantics.utils"\r
+         id="org.apache.commons.collections"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.utils.datastructures"\r
+         id="org.apache.commons.io"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.utils.thread"\r
+         id="org.simantics.utils"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="xtc.parser.runtime"\r
+         id="org.simantics.utils.datastructures"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.utils.thread"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r

diff --git a/features/org.simantics.views.swt.client.feature/feature.xml b/features/org.simantics.views.swt.client.feature/feature.xml
index ae293d67491c2ad6e8924682c448d94dff8fddb0..d8b3cc81f27c88dddb71da2c5d407ae34509221b 100644 (file)
--- a/features/org.simantics.views.swt.client.feature/feature.xml
+++ b/features/org.simantics.views.swt.client.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.views.swt.client"\r
+      id="org.simantics.views.swt.client.feature"\r
       label="SWT views client"\r
       version="1.0.1.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/org.simantics.views.swt.feature/feature.xml b/features/org.simantics.views.swt.feature/feature.xml
index f94557de7183356f2a04380945f159ab921e84dd..e80360cf625ae6c3846b110a09e4fabe92f32976 100644 (file)
--- a/features/org.simantics.views.swt.feature/feature.xml
+++ b/features/org.simantics.views.swt.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.views.swt"\r
+      id="org.simantics.views.swt.feature"\r
       label="SWT views"\r
       version="1.0.1.qualifier"\r
       provider-name="Semantum Oy">\r
@@ -17,12 +17,9 @@
       [Enter License Description here.]\r
    </license>\r
 \r
-   <plugin\r
-         id="org.simantics.views"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
+   <includes\r
+         id="org.simantics.views.swt.client.feature"\r
+         version="0.0.0"/>\r
 \r
    <plugin\r
          id="org.simantics.views.ontology"\r
@@ -38,11 +35,4 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="org.simantics.views.swt.client"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r