(refs #6022) Fixing Sysdyn P2 site builds.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@32714 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.internal.p2.feature/feature.xml b/org.simantics.sysdyn.internal.p2.feature/feature.xml
index a5526d976d1d8685ddb077e0f17ebc512bb3380e..09eac49d3c0defb6b4606bcfac635da005d1395e 100644 (file)
--- a/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
       id="org.simantics.sysdyn.internal.p2"\r
-      label="Simantics System Dynamics with Internal Solver P2 Site"\r
+      label="Simantics System Dynamics with Internal Solver"\r
       version="1.9.1.qualifier"\r
       provider-name="Semantum Oy">\r
 \r
-   <description url="http://www.example.com/description">\r
-      Simantics System Dynamics feature with custom internal solver only.\r
+   <description>\r
+      Simantics System Dynamics feature with custom internal solver only.
       This feature can be installed into the generic Simantics Desktop product.\r
    </description>\r
 \r
    <copyright>\r
-      Copyright (c) 2016 Association for Decentralized Information\r
-Management in Industry THTH ry.&lt;br/&gt;\r
-All rights reserved. This program and the accompanying materials\r
-are made available under the terms of the Eclipse Public License\r
-v1.0 which accompanies this distribution, and is available at\r
+      Copyright (c) 2016 Association for Decentralized Information
+Management in Industry THTH ry.&lt;br/&gt;
+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
 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
    </copyright>\r
 \r

diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml
index 5bc85f8974b4caed6b8a320e262795293a60b56d..90fa92bd087b61f0973ab36bb7ea2c7e05d84a61 100644 (file)
--- a/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -33,7 +33,7 @@ v1.0 which accompanies this distribution, and is available at
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.sysdyn.internal.p2"\r
+         id="org.simantics.sysdyn.internal.p2.site"\r
          version="0.0.0"/>\r
 \r
 </feature>\r

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 4f39395323592c4a0c9dbc2a992f7e60dc17e8da..f52e9876ba83895a158506b57d5bd098e44f8a04 100644 (file)
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.scenegraph;bundle-version="0.9.0",
- org.junit4;bundle-version="4.5.0";resolution:=optional,
+ org.junit;bundle-version="4.12.0";resolution:=optional,
  org.simantics.ui;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 33cf9bbae6055db5bb906e1fa7c822d57eaab85d..892934998176d513f9a75fd601cd1b41ea250c45 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -816,7 +816,7 @@
             locationURI="popup:#EnumerationTabPopup?after=wbStart">\r
             \r
             <command\r
-               commandId="org.simantics.sysdyn.ui.renameNode1"\r
+               commandId="org.simantics.sysdyn.ui.renameNode"\r
                icon="platform:/plugin/com.famfamfam.silk/icons/textfield_rename.png"\r
                id="org.simantics.sysdyn.ui.browser.rename"\r
                label="Rename"\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/BrowserSelection.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/BrowserSelection.java
index cfd31c81b393f529d4153feb993d3105824b8a11..0b2aaacb58d10cc1628fef060efa801efbe8032b 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/BrowserSelection.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/BrowserSelection.java
@@ -32,15 +32,15 @@ public class BrowserSelection implements IAdaptable, ISelection {
                }\r
        }\r
 \r
-       @SuppressWarnings("rawtypes")\r
-       @Override\r
-       public Object getAdapter(Class adapter) {\r
+       @SuppressWarnings("unchecked")\r
+    @Override\r
+       public <T> T getAdapter(Class<T> adapter) {\r
                if (adapter == Resource.class)\r
-                       return resource;\r
+                       return (T) resource;\r
                if (adapter == Variable.class)\r
-                       return variable;\r
+                       return (T) variable;\r
                if (NodeContext.class.equals(adapter))\r
-            return originalInput;\r
+            return (T) originalInput;\r
                if (originalInput instanceof IAdaptable) {\r
                        IAdaptable input = (IAdaptable)originalInput;\r
                        return input.getAdapter(adapter);\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
index 659f63f24a55010b225504c68caf15c0a9f6b25e..64d2c1484236c3890afb43a664f44b5438c0b6e7 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/contributions/Configuration.java
@@ -21,7 +21,6 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.request.ObjectsWithType;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.layer0.variable.Variables;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.spreadsheet.resource.SpreadsheetResource;\r
 import org.simantics.sysdyn.SysdynResource;\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewSCLModuleHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewSCLModuleHandler.java
index 7dee59c845b8348c9503b2b393b7401367a7040b..459079a91c7497b1ba9a3c0fbe2a777220ab9f92 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewSCLModuleHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/NewSCLModuleHandler.java
@@ -24,7 +24,6 @@ public class NewSCLModuleHandler  extends AbstractHandler {
 \r
         ISelection sel = HandlerUtil.getCurrentSelection(event);\r
         \r
-        @SuppressWarnings("unchecked")\r
                Resource res = AdaptionUtils.adaptToSingle(sel, Resource.class);\r
         if(res == null) {\r
                @SuppressWarnings("unchecked")\r