From: Tuukka Lehtonen Date: Wed, 23 Nov 2016 22:24:30 +0000 (+0200) Subject: Lots of small fixes for the Simantics SDK build X-Git-Tag: v1.25.0~34 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=229196a1cb46a94d1cc5f75aef7f822157ba7917 Lots of small fixes for the Simantics SDK build * org.apache.batik/1.8.0 is taken from external-components/manual now. Removed it from this repository. * org.simantics.sdk now includes plenty of previously missing plug-ins and features: org.simantics.help.*, org.simantics.spreadsheet.fileimport, org.apache.pdfbox*, org.simantics.tests.modelled*, org.simantics.diagram.svg, org.simantics.browsing.ui.nattable* * many build.properties fixes, e.g. removal of non-existent files and addition of missing binary/source artifacts * added new feature org.simantics.help.addons to bundle together all the recently added org.simantics.help.* plug-ins for modelled help page construction in the Simantics Desktop workbench. * added new feature org.simantics.browsing.ui.nattable.feature to gather together org.simantics.browsing.ui.nattable and its external component dependencies (nattable.core, fastutil) refs #6621 Change-Id: I203c1fac381325d59925e19e26ee338db7ff9852 --- diff --git a/bundles/org.apache.batik/.classpath b/bundles/org.apache.batik/.classpath deleted file mode 100644 index 0f23270ef..000000000 --- a/bundles/org.apache.batik/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.apache.batik/.project b/bundles/org.apache.batik/.project deleted file mode 100644 index 0feb46823..000000000 --- a/bundles/org.apache.batik/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.apache.batik - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs b/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 295926d96..000000000 --- a/bundles/org.apache.batik/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.apache.batik/META-INF/MANIFEST.MF b/bundles/org.apache.batik/META-INF/MANIFEST.MF deleted file mode 100644 index 22d86a06d..000000000 --- a/bundles/org.apache.batik/META-INF/MANIFEST.MF +++ /dev/null @@ -1,288 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Batik -Bundle-SymbolicName: org.apache.batik;singleton:=true -Bundle-Version: 1.8.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: java_cup.runtime, - org.apache.avalon.framework, - org.apache.avalon.framework.activity, - org.apache.avalon.framework.configuration, - org.apache.avalon.framework.container, - org.apache.batik, - org.apache.batik.anim, - org.apache.batik.anim.dom, - org.apache.batik.anim.timing, - org.apache.batik.anim.values, - org.apache.batik.bridge, - org.apache.batik.bridge.svg12, - org.apache.batik.css.dom, - org.apache.batik.css.engine, - org.apache.batik.css.engine.sac, - org.apache.batik.css.engine.value, - org.apache.batik.css.engine.value.css2, - org.apache.batik.css.engine.value.svg, - org.apache.batik.css.engine.value.svg12, - org.apache.batik.css.parser, - org.apache.batik.dom, - org.apache.batik.dom.events, - org.apache.batik.dom.svg, - org.apache.batik.dom.svg12, - org.apache.batik.dom.traversal, - org.apache.batik.dom.util, - org.apache.batik.dom.xbl, - org.apache.batik.ext.awt, - org.apache.batik.ext.awt.color, - org.apache.batik.ext.awt.font, - org.apache.batik.ext.awt.g2d, - org.apache.batik.ext.awt.geom, - org.apache.batik.ext.awt.image, - org.apache.batik.ext.awt.image.codec.png, - org.apache.batik.ext.awt.image.codec.tiff, - org.apache.batik.ext.awt.image.codec.util, - org.apache.batik.ext.awt.image.renderable, - org.apache.batik.ext.awt.image.rendered, - org.apache.batik.ext.awt.image.spi, - org.apache.batik.ext.swing, - org.apache.batik.extension, - org.apache.batik.extension.svg, - org.apache.batik.gvt, - org.apache.batik.gvt.event, - org.apache.batik.gvt.filter, - org.apache.batik.gvt.flow, - org.apache.batik.gvt.font, - org.apache.batik.gvt.renderer, - org.apache.batik.gvt.text, - org.apache.batik.i18n, - org.apache.batik.parser, - org.apache.batik.script, - org.apache.batik.script.rhino, - org.apache.batik.svggen, - org.apache.batik.svggen.font, - org.apache.batik.svggen.font.table, - org.apache.batik.swing, - org.apache.batik.swing.gvt, - org.apache.batik.swing.svg, - org.apache.batik.transcoder, - org.apache.batik.transcoder.image, - org.apache.batik.transcoder.image.resources, - org.apache.batik.transcoder.keys, - org.apache.batik.transcoder.print, - org.apache.batik.transcoder.svg2svg, - org.apache.batik.transcoder.wmf, - org.apache.batik.transcoder.wmf.tosvg, - org.apache.batik.util, - org.apache.batik.util.gui, - org.apache.batik.util.gui.resource, - org.apache.batik.util.gui.xmleditor, - org.apache.batik.util.io, - org.apache.batik.util.resources, - org.apache.batik.xml, - org.apache.bcel, - org.apache.bcel.classfile, - org.apache.bcel.generic, - org.apache.bcel.util, - org.apache.bcel.verifier, - org.apache.bcel.verifier.exc, - org.apache.bcel.verifier.statics, - org.apache.bcel.verifier.structurals, - org.apache.commons.io, - org.apache.commons.io.filefilter, - org.apache.commons.io.output, - org.apache.commons.logging, - org.apache.commons.logging.impl, - org.apache.fop, - org.apache.fop.accessibility, - org.apache.fop.apps, - org.apache.fop.apps.io, - org.apache.fop.complexscripts.bidi, - org.apache.fop.complexscripts.fonts, - org.apache.fop.complexscripts.util, - org.apache.fop.events, - org.apache.fop.fo, - org.apache.fop.fonts, - org.apache.fop.fonts.apps, - org.apache.fop.fonts.autodetect, - org.apache.fop.fonts.base14, - org.apache.fop.fonts.cff, - org.apache.fop.fonts.substitute, - org.apache.fop.fonts.truetype, - org.apache.fop.fonts.type1, - org.apache.fop.image.loader.batik, - org.apache.fop.pdf, - org.apache.fop.pdf.xref, - org.apache.fop.render, - org.apache.fop.render.gradient, - org.apache.fop.render.intermediate, - org.apache.fop.render.pdf, - org.apache.fop.render.pdf.extensions, - org.apache.fop.render.ps, - org.apache.fop.render.ps.extensions, - org.apache.fop.render.ps.fonts, - org.apache.fop.render.ps.svg, - org.apache.fop.svg, - org.apache.fop.svg.font, - org.apache.fop.svg.text, - org.apache.fop.traits, - org.apache.fop.util, - org.apache.html.dom, - org.apache.regexp, - org.apache.wml, - org.apache.wml.dom, - org.apache.xalan, - org.apache.xalan.client, - org.apache.xalan.extensions, - org.apache.xalan.lib, - org.apache.xalan.lib.sql, - org.apache.xalan.processor, - org.apache.xalan.res, - org.apache.xalan.serialize, - org.apache.xalan.templates, - org.apache.xalan.trace, - org.apache.xalan.transformer, - org.apache.xalan.xslt, - org.apache.xalan.xsltc, - org.apache.xalan.xsltc.cmdline, - org.apache.xalan.xsltc.cmdline.getopt, - org.apache.xalan.xsltc.compiler, - org.apache.xalan.xsltc.compiler.util, - org.apache.xalan.xsltc.dom, - org.apache.xalan.xsltc.runtime, - org.apache.xalan.xsltc.runtime.output, - org.apache.xalan.xsltc.trax, - org.apache.xalan.xsltc.util, - org.apache.xerces.dom, - org.apache.xerces.dom.events, - org.apache.xerces.dom3, - org.apache.xerces.dom3.as, - org.apache.xerces.dom3.bootstrap, - org.apache.xerces.impl, - org.apache.xerces.impl.dtd, - org.apache.xerces.impl.dtd.models, - org.apache.xerces.impl.dv, - org.apache.xerces.impl.dv.dtd, - org.apache.xerces.impl.dv.util, - org.apache.xerces.impl.dv.xs, - org.apache.xerces.impl.io, - org.apache.xerces.impl.msg, - org.apache.xerces.impl.validation, - org.apache.xerces.impl.xpath, - org.apache.xerces.impl.xpath.regex, - org.apache.xerces.impl.xs, - org.apache.xerces.impl.xs.identity, - org.apache.xerces.impl.xs.models, - org.apache.xerces.impl.xs.opti, - org.apache.xerces.impl.xs.psvi, - org.apache.xerces.impl.xs.traversers, - org.apache.xerces.impl.xs.util, - org.apache.xerces.jaxp, - org.apache.xerces.parsers, - org.apache.xerces.util, - org.apache.xerces.xinclude, - org.apache.xerces.xni, - org.apache.xerces.xni.grammars, - org.apache.xerces.xni.parser, - org.apache.xerces.xni.psvi, - org.apache.xml.dtm, - org.apache.xml.dtm.ref, - org.apache.xml.dtm.ref.dom2dtm, - org.apache.xml.dtm.ref.sax2dtm, - org.apache.xml.res, - org.apache.xml.serialize, - org.apache.xml.utils, - org.apache.xml.utils.res, - org.apache.xmlgraphics.fonts, - org.apache.xmlgraphics.image, - org.apache.xmlgraphics.image.codec.png, - org.apache.xmlgraphics.image.codec.tiff, - org.apache.xmlgraphics.image.codec.util, - org.apache.xmlgraphics.image.loader, - org.apache.xmlgraphics.image.loader.cache, - org.apache.xmlgraphics.image.loader.impl, - org.apache.xmlgraphics.image.loader.impl.imageio, - org.apache.xmlgraphics.image.loader.pipeline, - org.apache.xmlgraphics.image.loader.spi, - org.apache.xmlgraphics.image.loader.util, - org.apache.xmlgraphics.image.rendered, - org.apache.xmlgraphics.image.writer, - org.apache.xmlgraphics.image.writer.imageio, - org.apache.xmlgraphics.image.writer.internal, - org.apache.xmlgraphics.io, - org.apache.xmlgraphics.java2d, - org.apache.xmlgraphics.java2d.color, - org.apache.xmlgraphics.java2d.color.profile, - org.apache.xmlgraphics.java2d.ps, - org.apache.xmlgraphics.ps, - org.apache.xmlgraphics.ps.dsc, - org.apache.xmlgraphics.ps.dsc.events, - org.apache.xmlgraphics.ps.dsc.tools, - org.apache.xmlgraphics.util, - org.apache.xmlgraphics.util.dijkstra, - org.apache.xmlgraphics.util.i18n, - org.apache.xmlgraphics.util.io, - org.apache.xmlgraphics.util.uri, - org.apache.xmlgraphics.xmp, - org.apache.xmlgraphics.xmp.merge, - org.apache.xmlgraphics.xmp.schemas, - org.apache.xmlgraphics.xmp.schemas.pdf, - org.apache.xpath, - org.apache.xpath.axes, - org.apache.xpath.compiler, - org.apache.xpath.domapi, - org.apache.xpath.functions, - org.apache.xpath.jaxp, - org.apache.xpath.objects, - org.apache.xpath.operations, - org.apache.xpath.patterns, - org.apache.xpath.res, - org.mozilla.classfile, - org.mozilla.javascript, - org.mozilla.javascript.continuations, - org.mozilla.javascript.debug, - org.mozilla.javascript.jdk11, - org.mozilla.javascript.jdk13, - org.mozilla.javascript.optimizer, - org.mozilla.javascript.regexp, - org.mozilla.javascript.serialize, - org.mozilla.javascript.tools, - org.mozilla.javascript.tools.debugger, - org.mozilla.javascript.tools.debugger.downloaded, - org.mozilla.javascript.tools.idswitch, - org.mozilla.javascript.tools.jsc, - org.mozilla.javascript.tools.shell, - org.mozilla.javascript.xml, - org.mozilla.javascript.xmlimpl, - org.w3c.css.sac, - org.w3c.css.sac.helpers, - org.w3c.dom, - org.w3c.dom.events, - org.w3c.dom.html, - org.w3c.dom.ls, - org.w3c.dom.smil, - org.w3c.dom.svg -Bundle-ClassPath: lib/batik-awt-util-1.8.jar, - lib/batik-dom-1.8.jar, - lib/batik-ext-1.8.jar, - lib/batik-svg-dom-1.8.jar, - lib/batik-svggen-1.8.jar, - lib/batik-util-1.8.jar, - lib/batik-xml-1.8.jar, - lib/batik-transcoder-1.8.jar, - lib/batik-bridge-1.8.jar, - lib/batik-css-1.8.jar, - lib/xmlgraphics-commons-2.0.jar, - lib/batik-anim-1.8.jar, - ., - lib/batik-codec-1.8.jar, - lib/batik-extension-1.8.jar, - lib/batik-gui-util-1.8.jar, - lib/batik-gvt-1.8.jar, - lib/batik-parser-1.8.jar, - lib/batik-script-1.8.jar, - lib/batik-swing-1.8.jar, - lib/js.jar, - lib/xalan-2.7.0.jar, - lib/xerces_2_5_0.jar, - lib/fop-transcoder-allinone-svn-trunk.jar, - lib/xml-apis-ext-1.3.04.jar -Require-Bundle: javax.xml;bundle-version="1.3.4" diff --git a/bundles/org.apache.batik/build.properties b/bundles/org.apache.batik/build.properties deleted file mode 100644 index d435895c2..000000000 --- a/bundles/org.apache.batik/build.properties +++ /dev/null @@ -1,29 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - lib/,\ - lib/batik-awt-util-1.8.jar,\ - lib/batik-dom-1.8.jar,\ - lib/batik-ext-1.8.jar,\ - lib/batik-svg-dom-1.8.jar,\ - lib/batik-svggen-1.8.jar,\ - lib/batik-util-1.8.jar,\ - lib/batik-xml-1.8.jar,\ - lib/batik-transcoder-1.8.jar,\ - lib/batik-bridge-1.8.jar,\ - lib/batik-css-1.8.jar,\ - lib/xmlgraphics-commons-2.0.jar,\ - lib/batik-anim-1.8.jar,\ - lib/batik-codec-1.8.jar,\ - lib/batik-extension-1.8.jar,\ - lib/batik-gui-util-1.8.jar,\ - lib/batik-gvt-1.8.jar,\ - lib/batik-parser-1.8.jar,\ - lib/batik-script-1.8.jar,\ - lib/batik-swing-1.8.jar,\ - lib/js.jar,\ - lib/xalan-2.7.0.jar,\ - lib/xerces_2_5_0.jar,\ - lib/fop-transcoder-allinone-svn-trunk.jar,\ - lib/xml-apis-ext-1.3.04.jar diff --git a/bundles/org.apache.batik/lib/batik-anim-1.8.jar b/bundles/org.apache.batik/lib/batik-anim-1.8.jar deleted file mode 100644 index 9470058c7..000000000 Binary files a/bundles/org.apache.batik/lib/batik-anim-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar b/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar deleted file mode 100644 index 740acb744..000000000 Binary files a/bundles/org.apache.batik/lib/batik-awt-util-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-bridge-1.8.jar b/bundles/org.apache.batik/lib/batik-bridge-1.8.jar deleted file mode 100644 index 36e8e036b..000000000 Binary files a/bundles/org.apache.batik/lib/batik-bridge-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-codec-1.8.jar b/bundles/org.apache.batik/lib/batik-codec-1.8.jar deleted file mode 100644 index 07b6e79c0..000000000 Binary files a/bundles/org.apache.batik/lib/batik-codec-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-css-1.8.jar b/bundles/org.apache.batik/lib/batik-css-1.8.jar deleted file mode 100644 index 1c9fb1952..000000000 Binary files a/bundles/org.apache.batik/lib/batik-css-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-dom-1.8.jar b/bundles/org.apache.batik/lib/batik-dom-1.8.jar deleted file mode 100644 index 4899b514d..000000000 Binary files a/bundles/org.apache.batik/lib/batik-dom-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-ext-1.8.jar b/bundles/org.apache.batik/lib/batik-ext-1.8.jar deleted file mode 100644 index d7c850b16..000000000 Binary files a/bundles/org.apache.batik/lib/batik-ext-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-extension-1.8.jar b/bundles/org.apache.batik/lib/batik-extension-1.8.jar deleted file mode 100644 index 5aa9b7a14..000000000 Binary files a/bundles/org.apache.batik/lib/batik-extension-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar b/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar deleted file mode 100644 index 15eb1960e..000000000 Binary files a/bundles/org.apache.batik/lib/batik-gui-util-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-gvt-1.8.jar b/bundles/org.apache.batik/lib/batik-gvt-1.8.jar deleted file mode 100644 index 7bb4e58d0..000000000 Binary files a/bundles/org.apache.batik/lib/batik-gvt-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-parser-1.8.jar b/bundles/org.apache.batik/lib/batik-parser-1.8.jar deleted file mode 100644 index 1c1223d44..000000000 Binary files a/bundles/org.apache.batik/lib/batik-parser-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-script-1.8.jar b/bundles/org.apache.batik/lib/batik-script-1.8.jar deleted file mode 100644 index c3e9a9f70..000000000 Binary files a/bundles/org.apache.batik/lib/batik-script-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar b/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar deleted file mode 100644 index 64295503b..000000000 Binary files a/bundles/org.apache.batik/lib/batik-svg-dom-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-svggen-1.8.jar b/bundles/org.apache.batik/lib/batik-svggen-1.8.jar deleted file mode 100644 index 9aaa826a4..000000000 Binary files a/bundles/org.apache.batik/lib/batik-svggen-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-swing-1.8.jar b/bundles/org.apache.batik/lib/batik-swing-1.8.jar deleted file mode 100644 index 43fa2e081..000000000 Binary files a/bundles/org.apache.batik/lib/batik-swing-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar b/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar deleted file mode 100644 index f3c3c4f8f..000000000 Binary files a/bundles/org.apache.batik/lib/batik-transcoder-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-util-1.8.jar b/bundles/org.apache.batik/lib/batik-util-1.8.jar deleted file mode 100644 index 23e362533..000000000 Binary files a/bundles/org.apache.batik/lib/batik-util-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/batik-xml-1.8.jar b/bundles/org.apache.batik/lib/batik-xml-1.8.jar deleted file mode 100644 index 1101455a0..000000000 Binary files a/bundles/org.apache.batik/lib/batik-xml-1.8.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar b/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar deleted file mode 100644 index e3cfee6ee..000000000 Binary files a/bundles/org.apache.batik/lib/fop-transcoder-allinone-svn-trunk.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/js.jar b/bundles/org.apache.batik/lib/js.jar deleted file mode 100644 index ccad3cc1b..000000000 Binary files a/bundles/org.apache.batik/lib/js.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/xalan-2.7.0.jar b/bundles/org.apache.batik/lib/xalan-2.7.0.jar deleted file mode 100644 index 979ee761c..000000000 Binary files a/bundles/org.apache.batik/lib/xalan-2.7.0.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/xerces_2_5_0.jar b/bundles/org.apache.batik/lib/xerces_2_5_0.jar deleted file mode 100644 index c6455ee34..000000000 Binary files a/bundles/org.apache.batik/lib/xerces_2_5_0.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar b/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar deleted file mode 100644 index d42c0ea6c..000000000 Binary files a/bundles/org.apache.batik/lib/xml-apis-1.3.04.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar b/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar deleted file mode 100644 index a7869d68a..000000000 Binary files a/bundles/org.apache.batik/lib/xml-apis-ext-1.3.04.jar and /dev/null differ diff --git a/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar b/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar deleted file mode 100644 index a168e4ff4..000000000 Binary files a/bundles/org.apache.batik/lib/xmlgraphics-commons-2.0.jar and /dev/null differ diff --git a/bundles/org.apache.batik/src/.keep b/bundles/org.apache.batik/src/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java index 03bceb6e6..6c7c588ee 100644 --- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java +++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/EvaluatorDataImpl.java @@ -202,9 +202,10 @@ public class EvaluatorDataImpl implements EvaluatorData { } } + @SuppressWarnings("unchecked") @Override public T getBrowseContext() { - return (T)browseContext; + return (T)browseContext; } } diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java index ac911a458..600d16ff3 100644 --- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java +++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/internal/GECache.java @@ -83,9 +83,8 @@ public class GECache implements IGECache { * store the key, this is not used. */ NodeContext getNC = new NodeContext() { - @SuppressWarnings("rawtypes") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java index 29ec0d894..db5bd5629 100644 --- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java +++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/modifiers/Enumeration.java @@ -28,6 +28,7 @@ public class Enumeration { return new Enumeration(values); } + @SafeVarargs public static Enumeration make(EnumeratedValue... values) { return new Enumeration(Arrays.asList(values)); } diff --git a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java index a95678bca..621b0107c 100644 --- a/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java +++ b/bundles/org.simantics.browsing.ui.common/src/org/simantics/browsing/ui/common/node/AbstractNode.java @@ -45,17 +45,17 @@ public abstract class AbstractNode implements IAdaptable { return data.equals(other.data); } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public A getAdapter(Class adapter) { if(clazz == adapter) - return data; + return (A) data; if(Imager.class == adapter) - return getImager(); + return (A) getImager(); if(ImageURLs.class == adapter) - return getImageURLs(); + return (A) getImageURLs(); if(Labeler.class == adapter) - return getLabeler(); + return (A) getLabeler(); return null; } diff --git a/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF index 47fd31cae..dfb78e1ed 100644 --- a/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.browsing.ui.nattable/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Nattable +Bundle-Name: Nebula NatTable Browsing Control Bundle-SymbolicName: org.simantics.browsing.ui.nattable Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.browsing.ui.nattable.Activator @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.browsing.ui.nattable +Bundle-Vendor: VTT Technical Research Centre of Finland diff --git a/bundles/org.simantics.browsing.ui.nattable/build.properties b/bundles/org.simantics.browsing.ui.nattable/build.properties index 41eb6ade2..1dd145021 100644 --- a/bundles/org.simantics.browsing.ui.nattable/build.properties +++ b/bundles/org.simantics.browsing.ui.nattable/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + images/ diff --git a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java index 19ada0233..040f8ae0c 100644 --- a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java +++ b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/GEEditBindings.java @@ -6,7 +6,6 @@ import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction; import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction; import org.eclipse.nebula.widgets.nattable.grid.GridRegion; import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter; -import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer; import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry; import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher; import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher; diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java index 4bee0eb55..7e9df0f84 100644 --- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java +++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PageSite.java @@ -201,7 +201,7 @@ public class PageSite implements IPageSite, INestable { * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return Platform.getAdapterManager().getAdapter(this, adapter); } diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java index d42f38315..f56cdfcf5 100644 --- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java +++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/VariablesPageView.java @@ -126,14 +126,14 @@ public class VariablesPageView extends PageBookView implements ISelectionListene * * @see org.eclipse.ui.part.PageBookView#getAdapter(java.lang.Class) */ - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == IContributedContentsView.class) { // This makes it possible to duplicate a PropertyPageView with another // secondary ID and make it show the same property page that was showing // in the original property page view. - return new IContributedContentsView() { + return (T) new IContributedContentsView() { @Override public IWorkbenchPart getContributingPart() { return getContributingEditor(); @@ -141,7 +141,7 @@ public class VariablesPageView extends PageBookView implements ISelectionListene }; } if (adapter == ISessionContextProvider.class) - return contextProvider; + return (T) contextProvider; return super.getAdapter(adapter); } diff --git a/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java b/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java index 6b5fcbf87..9c09bc4dd 100644 --- a/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java +++ b/bundles/org.simantics.browsing.ui/src/org/simantics/browsing/ui/NodeContextPath.java @@ -243,11 +243,11 @@ public final class NodeContextPath implements IAdaptable { return new NodeContextPath(childSegments); } - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (NodeContext.class == adapter) - return getLastSegment(); + return (T) getLastSegment(); NodeContext last = getLastSegment(); if (last instanceof IAdaptable) return ((IAdaptable) last).getAdapter(adapter); diff --git a/bundles/org.simantics.desktop.ui.ontology/build.properties b/bundles/org.simantics.desktop.ui.ontology/build.properties index 022de1735..fb164279d 100644 --- a/bundles/org.simantics.desktop.ui.ontology/build.properties +++ b/bundles/org.simantics.desktop.ui.ontology/build.properties @@ -1,6 +1,6 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ +bin.includes = META-INF/,\ .,\ graph.tg +src.includes = graph/ diff --git a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java index 4f2d79b45..86bdbcd8e 100644 --- a/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java +++ b/bundles/org.simantics.diagram.svg/src/org/simantics/diagram/svg/export/SVGBuilder.java @@ -18,7 +18,6 @@ import org.simantics.g2d.participant.TransformUtil; import org.simantics.scenegraph.g2d.G2DRenderingHints; import org.simantics.scenegraph.utils.QualityHints; import org.simantics.utils.page.MarginUtils; -import org.simantics.utils.page.MarginUtils.Margin; import org.simantics.utils.page.MarginUtils.Margins; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java index ab80abf7f..15b519490 100644 --- a/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java +++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/elementclass/FlagClass.java @@ -47,9 +47,6 @@ import org.simantics.g2d.utils.geom.DirectionSet; import org.simantics.scenegraph.Node; import org.simantics.scenegraph.g2d.G2DParentNode; import org.simantics.scenegraph.g2d.nodes.FlagNode; -import org.simantics.scenegraph.g2d.nodes.TextNode; -import org.simantics.ui.colors.Colors; -import org.simantics.ui.fonts.Fonts; import org.simantics.utils.datastructures.hints.IHintContext.Key; import org.simantics.utils.datastructures.hints.IHintContext.KeyOf; diff --git a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF index dacb90faa..f1fbea12c 100644 --- a/bundles/org.simantics.help.core/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.help.core/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.help.core +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.help.core/build.properties b/bundles/org.simantics.help.core/build.properties index 4e3c13e70..42bacfb62 100644 --- a/bundles/org.simantics.help.core/build.properties +++ b/bundles/org.simantics.help.core/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ scl/,\ - plugin.xml + plugin.xml,\ + css/ diff --git a/bundles/org.simantics.help.feature/build.properties b/bundles/org.simantics.help.feature/build.properties deleted file mode 100644 index 0c85ae77c..000000000 --- a/bundles/org.simantics.help.feature/build.properties +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################### -# 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 -############################################################################### -bin.includes = feature.xml diff --git a/bundles/org.simantics.help.feature/feature.xml b/bundles/org.simantics.help.feature/feature.xml deleted file mode 100644 index 24eaf0902..000000000 --- a/bundles/org.simantics.help.feature/feature.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - This feature gather together the parts of Eclipse SDK that are needed to use the Eclipse help system and cheat sheets. - - - - Licensed under Eclipse Public License (EPL) 1.0. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.simantics.help.files/META-INF/MANIFEST.MF b/bundles/org.simantics.help.files/META-INF/MANIFEST.MF index 61896e169..2acf39fe8 100644 --- a/bundles/org.simantics.help.files/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.help.files/META-INF/MANIFEST.MF @@ -3,3 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: Simantics Help Files Location Bundle-SymbolicName: org.simantics.help.files Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.help.files/build.properties b/bundles/org.simantics.help.files/build.properties index 5e3728557..fcf314f57 100644 --- a/bundles/org.simantics.help.files/build.properties +++ b/bundles/org.simantics.help.files/build.properties @@ -1 +1,2 @@ -bin.includes = META-INF/ +bin.includes = META-INF/,\ + html/ diff --git a/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF index c2a6f1c0b..ca70f3810 100644 --- a/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.help.ontology/META-INF/MANIFEST.MF @@ -9,3 +9,4 @@ Require-Bundle: org.simantics.layer0, org.simantics.silk.ontology;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.help +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.help.ontology/build.properties b/bundles/org.simantics.help.ontology/build.properties index 022de1735..fb164279d 100644 --- a/bundles/org.simantics.help.ontology/build.properties +++ b/bundles/org.simantics.help.ontology/build.properties @@ -1,6 +1,6 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ +bin.includes = META-INF/,\ .,\ graph.tg +src.includes = graph/ diff --git a/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF index 0bc7d909d..8a88398f1 100644 --- a/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.help.ui/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF index b2c4d0f7d..2c2e5c144 100644 --- a/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.spreadsheet.fileimport/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Fileimport +Bundle-Name: Spreadsheet File Import Bundle-SymbolicName: org.simantics.spreadsheet.fileimport Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.spreadsheet.fileimport.Activator @@ -10,3 +10,4 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF index 2320422c5..66d1bc334 100644 --- a/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.tests.modelled.ontology/META-INF/MANIFEST.MF @@ -6,3 +6,4 @@ Bundle-Version: 1.0.0.qualifier Require-Bundle: org.simantics.layer0 Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.tests.modelled.ontology +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.tests.modelled.ontology/build.properties b/bundles/org.simantics.tests.modelled.ontology/build.properties index 022de1735..fb164279d 100644 --- a/bundles/org.simantics.tests.modelled.ontology/build.properties +++ b/bundles/org.simantics.tests.modelled.ontology/build.properties @@ -1,6 +1,6 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ +bin.includes = META-INF/,\ .,\ graph.tg +src.includes = graph/ diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF index 4ad1a0df9..4cf2070eb 100644 --- a/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.tests.modelled.ui.ontology/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Require-Bundle: org.simantics.layer0, org.simantics.silk.ontology;bundle-version="1.1.0", org.simantics.image2.ontology;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.tests.modelled.ui.ontology/build.properties b/bundles/org.simantics.tests.modelled.ui.ontology/build.properties index 815829b35..fb164279d 100644 --- a/bundles/org.simantics.tests.modelled.ui.ontology/build.properties +++ b/bundles/org.simantics.tests.modelled.ui.ontology/build.properties @@ -1,8 +1,6 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ +bin.includes = META-INF/,\ .,\ - graph.tg,\ - graph/scl/ -src.includes = graph/scl/ + graph.tg +src.includes = graph/ diff --git a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF index e9aba00c1..0e787d233 100644 --- a/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.tests.modelled.ui/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui, org.simantics.scl.osgi Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF index c0b1ba43a..042896151 100644 --- a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF @@ -13,3 +13,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.tests.modelled, org.simantics.tests.modelled.junit +Bundle-Vendor: Semantum Oy diff --git a/bundles/pom.xml b/bundles/pom.xml index 0b2a85da4..ff9e3f992 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -42,8 +42,8 @@ com.famfamfam.silk org.simantics - org.simantics.action.ontology org.simantics.acorn + org.simantics.action.ontology org.simantics.annotation.ontology org.simantics.annotation.ui org.simantics.application @@ -56,6 +56,7 @@ org.simantics.browsing.ui.graph org.simantics.browsing.ui.graph.impl org.simantics.browsing.ui.model + org.simantics.browsing.ui.nattable org.simantics.browsing.ui.ontology org.simantics.browsing.ui.platform org.simantics.browsing.ui.swt @@ -82,10 +83,14 @@ org.simantics.debug.browser.ui org.simantics.debug.graphical org.simantics.debug.ui + org.simantics.desktop.product + org.simantics.desktop.ui + org.simantics.desktop.ui.ontology org.simantics.diagram org.simantics.diagram.connection org.simantics.diagram.ontology org.simantics.diagram.profile + org.simantics.diagram.svg org.simantics.document org.simantics.document.base.ontology org.simantics.document.linking.ontology @@ -118,6 +123,11 @@ org.simantics.graphfile.ontology org.simantics.graphviz org.simantics.graphviz.ui + org.simantics.help.base + org.simantics.help.core + org.simantics.help.files + org.simantics.help.ontology + org.simantics.help.ui org.simantics.history org.simantics.image.ontology org.simantics.image.ui @@ -177,6 +187,7 @@ org.simantics.softwareconfiguration.ontology org.simantics.spreadsheet org.simantics.spreadsheet.common + org.simantics.spreadsheet.fileimport org.simantics.spreadsheet.graph org.simantics.spreadsheet.ontology org.simantics.spreadsheet.ui @@ -186,6 +197,10 @@ org.simantics.structural.ui org.simantics.structural2 org.simantics.team.ui + org.simantics.tests.modelled + org.simantics.tests.modelled.ontology + org.simantics.tests.modelled.ui + org.simantics.tests.modelled.ui.ontology org.simantics.threadlog org.simantics.trend org.simantics.ui diff --git a/features/org.simantics.browsing.ui.nattable.feature/.project b/features/org.simantics.browsing.ui.nattable.feature/.project new file mode 100644 index 000000000..66c6e1df3 --- /dev/null +++ b/features/org.simantics.browsing.ui.nattable.feature/.project @@ -0,0 +1,17 @@ + + + org.simantics.browsing.ui.nattable.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.simantics.browsing.ui.nattable.feature/build.properties b/features/org.simantics.browsing.ui.nattable.feature/build.properties new file mode 100644 index 000000000..82ab19c62 --- /dev/null +++ b/features/org.simantics.browsing.ui.nattable.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/org.simantics.browsing.ui.nattable.feature/feature.xml b/features/org.simantics.browsing.ui.nattable.feature/feature.xml new file mode 100644 index 000000000..ac8eb16a7 --- /dev/null +++ b/features/org.simantics.browsing.ui.nattable.feature/feature.xml @@ -0,0 +1,54 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml index e3e9eb0d3..ed8b2a136 100644 --- a/features/org.simantics.g2d.feature/feature.xml +++ b/features/org.simantics.g2d.feature/feature.xml @@ -89,6 +89,13 @@ version="0.0.0" unpack="false"/> + + - org.simantics.help.feature + org.simantics.help.addons.feature diff --git a/features/org.simantics.help.addons.feature/build.properties b/features/org.simantics.help.addons.feature/build.properties new file mode 100644 index 000000000..82ab19c62 --- /dev/null +++ b/features/org.simantics.help.addons.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/org.simantics.help.addons.feature/feature.xml b/features/org.simantics.help.addons.feature/feature.xml new file mode 100644 index 000000000..d9c4dc5d3 --- /dev/null +++ b/features/org.simantics.help.addons.feature/feature.xml @@ -0,0 +1,72 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml index ed48ad311..3f04c136f 100644 --- a/features/org.simantics.sdk.feature/feature.xml +++ b/features/org.simantics.sdk.feature/feature.xml @@ -60,6 +60,10 @@ id="org.simantics.db.client" version="0.0.0"/> + + @@ -92,6 +96,10 @@ id="org.simantics.browsing.ui" version="0.0.0"/> + + @@ -107,7 +115,7 @@ - + @@ -148,10 +156,26 @@ id="org.simantics.help" version="0.0.0"/> + + + + + + + + + + + + + + diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml index 7e922e19e..3f0f8654e 100644 --- a/features/org.simantics.spreadsheet.feature/feature.xml +++ b/features/org.simantics.spreadsheet.feature/feature.xml @@ -118,4 +118,11 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> + + diff --git a/features/org.simantics.tests.modelled.feature/feature.xml b/features/org.simantics.tests.modelled.feature/feature.xml index 780d5dc6c..820439dc2 100644 --- a/features/org.simantics.tests.modelled.feature/feature.xml +++ b/features/org.simantics.tests.modelled.feature/feature.xml @@ -1,7 +1,7 @@ diff --git a/features/org.simantics.tests.modelled.ui.feature/feature.xml b/features/org.simantics.tests.modelled.ui.feature/feature.xml index ae4c6981d..6c2b54608 100644 --- a/features/org.simantics.tests.modelled.ui.feature/feature.xml +++ b/features/org.simantics.tests.modelled.ui.feature/feature.xml @@ -1,8 +1,9 @@ + id="org.simantics.tests.modelled.ui.feature" + label="Simantics Modelled Tests UI Feature" + version="1.0.0.qualifier" + provider-name="Semantum Oy"> [Enter Feature Description here.] diff --git a/features/pom.xml b/features/pom.xml index 6d5450ad8..5534d1832 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -31,6 +31,7 @@ + @@ -60,6 +61,7 @@ + @@ -101,10 +103,12 @@ org.jfree.feature org.simantics.acorn.feature org.simantics.browsing.ui.feature + org.simantics.browsing.ui.nattable.feature org.simantics.charts.feature org.simantics.data.feature org.simantics.db.client.feature org.simantics.db.services.feature + org.simantics.desktop.feature org.simantics.document.base.feature org.simantics.document.linking.feature org.simantics.document.swt.feature @@ -113,6 +117,7 @@ org.simantics.export.feature org.simantics.g2d.feature org.simantics.help.feature + org.simantics.help.addons.feature org.simantics.image.feature org.simantics.issues.feature org.simantics.issues.ui.feature @@ -131,6 +136,8 @@ org.simantics.spreadsheet.ui.feature org.simantics.structural.feature org.simantics.team.feature + org.simantics.tests.modelled.feature + org.simantics.tests.modelled.ui.feature org.simantics.ui.workbench.feature org.simantics.utils.feature org.simantics.utils.ui.feature diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target index ac4aafb61..5e9ecc8e3 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target @@ -1,5 +1,5 @@ - + @@ -183,6 +183,7 @@ + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 445f91ea3..2d9a3d3bb 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,5 +1,5 @@ - + @@ -200,6 +200,7 @@ +