From 21bf073db810402df9dfb6a231a7c38f9572a9dc Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 12 Aug 2016 14:12:07 +0300
Subject: [PATCH] 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.
---
 .../spreadsheet/graph/ExcelImport.java        |  2 +-
 .../org.simantics.charts.feature/feature.xml  |  4 --
 .../org.simantics.g2d.feature/feature.xml     | 13 +------
 .../feature.xml                               |  4 --
 .../org.simantics.sdk.feature/feature.xml     | 14 ++++---
 .../feature.xml                               |  3 +-
 .../org.simantics.utils.feature/feature.xml   | 39 ++++++++++---------
 .../feature.xml                               |  2 +-
 .../feature.xml                               | 18 ++-------
 9 files changed, 39 insertions(+), 60 deletions(-)

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 81aa67eaa..444054c8b 100644
--- 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();
             if (fontColor != null) {
                 
-                byte[] rgb = fontColor.getRgbWithTint();
+                byte[] rgb = fontColor.getRGBWithTint();
                 
                 String ix = fontColor.getARGBHex();
                 RGB.Integer s = hex2Rgb(ix);
diff --git a/features/org.simantics.charts.feature/feature.xml b/features/org.simantics.charts.feature/feature.xml
index a00ee500a..32d412a74 100644
--- a/features/org.simantics.charts.feature/feature.xml
+++ b/features/org.simantics.charts.feature/feature.xml
@@ -17,10 +17,6 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
    <includes
          id="org.simantics.g2d"
          version="0.0.0"/>
diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index 060e326e0..00eab1cb3 100644
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -33,11 +33,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
-   <includes
-         id="org.simantics.views.swt"
+         id="org.simantics.views.swt.feature"
          version="0.0.0"/>
 
    <plugin
@@ -96,13 +92,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="net.sf.cglib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.objectweb.asm"
          download-size="0"
diff --git a/features/org.simantics.modeling.feature/feature.xml b/features/org.simantics.modeling.feature/feature.xml
index e77581d80..fa10579e3 100644
--- 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.
    </license>
 
-   <includes
-         id="org.jfree"
-         version="0.0.0"/>
-
    <includes
          id="com.lowagie.text"
          version="0.0.0"/>
diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index 87764edb9..d7e7e3644 100644
--- 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"
          version="0.0.0"/>
 
+   <includes
+         id="org.simantics.views.swt.client.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.simantics.views.swt.feature"
+         version="0.0.0"/>
+
    <includes
          id="org.simantics.workbench"
          version="0.0.0"/>
@@ -134,11 +142,7 @@
 
    <includes
          id="org.simantics.eclipsec.launcher"
-         version="0.0.0"
-         optional="true"
-         os="win32"
-         ws="win32,wpf"
-         arch="x86,x86_64"/>
+         version="0.0.0"/>
 
    <includes
          id="org.simantics.help"
diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 6352e9715..14be2cf1d 100644
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -31,7 +31,6 @@
    <requires>
       <import feature="org.simantics.layer0" version="1.2.0" match="compatible"/>
       <import feature="org.simantics.rcp" version="1.25.0" match="compatible"/>
-      <import feature="org.simantics.platform.ui" version="1.25.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -159,6 +158,7 @@
          version="0.0.0"
          unpack="false"/>
 
+<!--
    <plugin
          id="org.simantics.editors.win32"
          os="win32"
@@ -166,6 +166,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+-->
 
    <plugin
          id="org.eclipse.ui.editors"
diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index 3892f7d08..b81e2e567 100644
--- 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"?>
-<!--
-    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
+<!--
+    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
  -->
 <feature
       id="org.simantics.utils"
@@ -28,10 +28,6 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.apache.commons"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
@@ -39,28 +35,35 @@
    </requires>
 
    <plugin
-         id="org.simantics.utils"
+         id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.simantics.utils.datastructures"
+         id="org.apache.commons.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.simantics.utils.thread"
+         id="org.simantics.utils"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="xtc.parser.runtime"
+         id="org.simantics.utils.datastructures"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.simantics.utils.thread"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.simantics.views.swt.client.feature/feature.xml b/features/org.simantics.views.swt.client.feature/feature.xml
index ae293d674..d8b3cc81f 100644
--- 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"?>
 <feature
-      id="org.simantics.views.swt.client"
+      id="org.simantics.views.swt.client.feature"
       label="SWT views client"
       version="1.0.1.qualifier"
       provider-name="Semantum Oy">
diff --git a/features/org.simantics.views.swt.feature/feature.xml b/features/org.simantics.views.swt.feature/feature.xml
index f94557de7..e80360cf6 100644
--- 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"?>
 <feature
-      id="org.simantics.views.swt"
+      id="org.simantics.views.swt.feature"
       label="SWT views"
       version="1.0.1.qualifier"
       provider-name="Semantum Oy">
@@ -17,12 +17,9 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.simantics.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.simantics.views.swt.client.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.simantics.views.ontology"
@@ -38,11 +35,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.views.swt.client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
-- 
2.43.2