From 55cdc6ac2d6332eb77be3549cdc2bfc2cc6510aa Mon Sep 17 00:00:00 2001 From: lehtonen Date: Tue, 26 Apr 2016 12:52:50 +0000 Subject: [PATCH] (refs #6022) Fixing Sysdyn P2 site builds. git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@32714 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../feature.xml | 16 ++++++++-------- .../feature.xml | 2 +- org.simantics.sysdyn.ui/META-INF/MANIFEST.MF | 2 +- org.simantics.sysdyn.ui/plugin.xml | 2 +- .../sysdyn/ui/browser/BrowserSelection.java | 12 ++++++------ .../ui/browser/contributions/Configuration.java | 1 - .../sysdyn/ui/handlers/NewSCLModuleHandler.java | 1 - 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/org.simantics.sysdyn.internal.p2.feature/feature.xml b/org.simantics.sysdyn.internal.p2.feature/feature.xml index a5526d97..09eac49d 100644 --- a/org.simantics.sysdyn.internal.p2.feature/feature.xml +++ b/org.simantics.sysdyn.internal.p2.feature/feature.xml @@ -1,21 +1,21 @@ - - Simantics System Dynamics feature with custom internal solver only. + + Simantics System Dynamics feature with custom internal solver only. This feature can be installed into the generic Simantics Desktop product. - Copyright (c) 2016 Association for Decentralized Information -Management in Industry THTH ry.<br/> -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 + Copyright (c) 2016 Association for Decentralized Information +Management in Industry THTH ry.<br/> +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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> diff --git a/org.simantics.sysdyn.product.site.feature/feature.xml b/org.simantics.sysdyn.product.site.feature/feature.xml index 5bc85f89..90fa92bd 100644 --- 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"/> diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF index 4f393953..f52e9876 100644 --- 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 33cf9bba..89293499 100644 --- a/org.simantics.sysdyn.ui/plugin.xml +++ b/org.simantics.sysdyn.ui/plugin.xml @@ -816,7 +816,7 @@ locationURI="popup:#EnumerationTabPopup?after=wbStart"> T getAdapter(Class adapter) { if (adapter == Resource.class) - return resource; + return (T) resource; if (adapter == Variable.class) - return variable; + return (T) variable; if (NodeContext.class.equals(adapter)) - return originalInput; + return (T) originalInput; if (originalInput instanceof IAdaptable) { IAdaptable input = (IAdaptable)originalInput; return input.getAdapter(adapter); 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 659f63f2..64d2c148 100644 --- 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; import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.variable.Variable; -import org.simantics.db.layer0.variable.Variables; import org.simantics.layer0.Layer0; import org.simantics.spreadsheet.resource.SpreadsheetResource; import org.simantics.sysdyn.SysdynResource; 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 7dee59c8..459079a9 100644 --- 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 { ISelection sel = HandlerUtil.getCurrentSelection(event); - @SuppressWarnings("unchecked") Resource res = AdaptionUtils.adaptToSingle(sel, Resource.class); if(res == null) { @SuppressWarnings("unchecked") -- 2.47.1