src/org/simantics/databoard/standardTypes.dbt,\\r
examples/,\\r
testcases/,\\r
- doc-isv/\r
+ src-isv/\r
Bundle-Vendor: VTT Technical Research Centre of Finland\r
Require-Bundle: org.eclipse.core.runtime,\r
org.simantics.db.layer0;bundle-version="0.8.0",\r
- org.apache.lucene4;bundle-version="4.9.0",\r
+ org.apache.lucene4.core;bundle-version="4.9.0",\r
+ org.apache.lucene4.queryparser;bundle-version="4.9.0",\r
+ org.apache.lucene4.analyzers-common;bundle-version="4.9.0",\r
org.simantics.db.services;bundle-version="0.8.0"\r
Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
Export-Package: org.simantics.db.indexing\r
\r
public final class ProCoreUserAgent implements DatabaseUserAgent {\r
private static Shell getShell() {\r
- Shell shell = null;\r
- Display d = getDisplay();\r
- if (d == null)\r
- return null;\r
- shell = d.getActiveShell();\r
- if (null == shell) {\r
- Shell[] shells = d.getShells();\r
- if (null != shells && shells.length > 0)\r
- shell = shells[0];\r
- }\r
- return shell;\r
+ Shell shell = null;\r
+ Display d = getDisplay();\r
+ if (d == null)\r
+ return null;\r
+ shell = d.getActiveShell();\r
+ if (null == shell) {\r
+ Shell[] shells = d.getShells();\r
+ if (null != shells && shells.length > 0)\r
+ shell = shells[0];\r
+ }\r
+ return shell;\r
}\r
private static Display getDisplay() {\r
- Display d = Display.getCurrent();\r
- if (d == null)\r
- d = Display.getDefault();\r
- return d;\r
+ Display d = Display.getCurrent();\r
+ if (d == null)\r
+ d = Display.getDefault();\r
+ return d;\r
}\r
- @Override\r
- public boolean handleStart(InternalException exception) {\r
- Shell shell = getShell();\r
- if (null == shell)\r
- return false; // no can do\r
- try {\r
- return Auxiliary.handleStart(shell, exception);\r
- } catch (InternalException e) {\r
- return false; // no could do\r
- }\r
- }\r
- \r
- @Override\r
- public String getId() {\r
- return ProCoreDriver.ProCoreDriverName;\r
- }\r
-}
\ No newline at end of file
+ @Override\r
+ public boolean handleStart(InternalException exception) {\r
+ Shell shell = getShell();\r
+ if (null == shell)\r
+ return false; // no can do\r
+ try {\r
+ return Auxiliary.handleStart(shell, exception);\r
+ } catch (InternalException e) {\r
+ return false; // no could do\r
+ }\r
+ }\r
+\r
+ @Override\r
+ public String getId() {\r
+ return ProCoreDriver.ProCoreDriverName;\r
+ }\r
+}\r
.,\\r
plugin.xml,\\r
webdefault.xml,\\r
- scl/,\\r
+ scl/\r
src.includes = scl/\r
\r
emit balancing number of DEDENT tokens.\r
*/\r
if(iStack.size() <= 1)\r
- return Token.EOF_TOKEN;\r
+ return getEOFToken();\r
else { \r
while(iStack.size() > 1) {\r
iStack.removeAt(iStack.size()-1);\r
: value '=' value\r
-> ^(ASSIGNMENT value*) \r
;\r
-
\ No newline at end of file
+ \r
emit balancing number of DEDENT tokens.\r
*/\r
if(iStack.size() <= 1)\r
- return Token.EOF_TOKEN;\r
+ return getEOFToken();\r
else { \r
while(iStack.size() > 1) {\r
iStack.removeAt(iStack.size()-1);\r
}\r
\r
\r
-}
\ No newline at end of file
+}\r
src.includes = history.txt,\\r
examples/,\\r
test/,\\r
- doc-isv/\r
+ src-isv/\r
org.simantics.issues;bundle-version="1.1.0",
org.simantics.document;bundle-version="1.0.0",
org.simantics.graph.db;bundle-version="1.1.9",
- org.bouncycastle;bundle-version="1.47.0",
+ org.bouncycastle.bcprov-jdk14;bundle-version="1.38.0",
org.simantics.image2.ontology;bundle-version="1.1.0",
org.simantics.scl.compiler;bundle-version="0.4.0",
org.simantics.scl.compiler.dummy;bundle-version="1.0.0",
bin.includes = META-INF/,\\r
.,\\r
scl/\r
-src.includes = scl/,\\r
- jdom-2.0.6.jar\r
+src.includes = scl/\r
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.simantics.scl.runtime,
org.simantics.scl.runtime.collection,
+ org.simantics.scl.runtime.equations,
org.simantics.scl.runtime.exceptions,
org.simantics.scl.runtime.function,
org.simantics.scl.runtime.io,
bin.includes = META-INF/,\\r
.,\\r
scl/,\\r
- schema/
\ No newline at end of file
+ schema/\r
org.simantics.datatypes.ontology;bundle-version="1.1.0",
org.simantics.document.server.io;bundle-version="0.0.1",
org.simantics.simulator.variable,
- org.apache.poi;bundle-version="3.10.0",
+ org.apache.poi;bundle-version="3.14.0",
+ org.apache.poi.ooxml;bundle-version="3.14.0",
it.unimi.dsi.fastutil,
org.simantics.structural.synchronization.client,
org.simantics.db.indexing,
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
output.. = bin/\r
bin.includes = META-INF/,\\r
.\r
+\r
output.. = bin/\r
bin.includes = META-INF/,\\r
.,\\r
- plugin.xml,\\r
- scl/\r
+ plugin.xml\r
<version>1.0.0-SNAPSHOT</version>\r
</parent>\r
\r
+ <build>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.eclipse.tycho</groupId>\r
+ <artifactId>tycho-compiler-plugin</artifactId>\r
+ <version>${tycho.version}</version>\r
+ <configuration>\r
+ <compilerArgument>-err:-forbidden</compilerArgument>\r
+ </configuration>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.eclipse.tycho</groupId>\r
+ <artifactId>tycho-source-plugin</artifactId>\r
+ <version>${tycho.version}</version>\r
+ <executions>\r
+ <execution>\r
+ <id>plugin-source</id>\r
+ <goals>\r
+ <goal>plugin-source</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
+\r
<modules>\r
<module>com.famfamfam.silk</module>\r
<module>org.simantics</module>\r
<module>org.simantics.workbench.search</module>\r
<module>winterwell.markdown</module>\r
</modules>\r
-</project>
\ No newline at end of file
+</project>\r
.,\
lib/
src.includes = src/,\
- pom.xml,\
plugin.xml,\
icons/,\
lib/,\
-/target/**\r
+/target/**
-/target/**\r
+/target/**
[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
\r
<includes\r
- id="org.simantics.event"\r
+ id="org.simantics.event.feature"\r
version="0.0.0"/>\r
\r
<plugin\r
# VTT Technical Research Centre of Finland - initial API and implementation\r
# Semantum Oy - update to Eclipse Mars.1 (4.5.1)\r
###############################################################################\r
-bin.includes=features.xml\r
+bin.includes=feature.xml\r
root.win32.win32.x86=bin/win32/win32/x86\r
-root.win32.win32.x86_64=bin/win32/win32/x86_64
\ No newline at end of file
+root.win32.win32.x86_64=bin/win32/win32/x86_64\r
<?xml version="1.0" encoding="UTF-8"?>\r
<feature\r
- id="org.simantics.event"\r
+ id="org.simantics.event.feature"\r
label="Event Log Feature"\r
version="0.0.1.qualifier"\r
provider-name="Semantum Oy">\r
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
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
VTT Technical Research Centre of Finland - initial API and implementation
-->\r
<feature\r
- id="org.simantics.issues"\r
+ id="org.simantics.issues.feature"\r
label="Issue Subsystem"\r
version="1.1.0.qualifier"\r
provider-name="VTT Technical Research Centre of Finland">\r
<?xml version="1.0" encoding="UTF-8"?>\r
<feature\r
- id="org.simantics.issues.ui"\r
+ id="org.simantics.issues.ui.feature"\r
label="Issue UI Feature"\r
version="1.1.1.qualifier"\r
provider-name="Semantum Oy">\r
</license>\r
\r
<includes\r
- id="org.simantics.issues"\r
+ id="org.simantics.issues.feature"\r
version="0.0.0"/>\r
\r
<plugin\r
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
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.utils.ui"\r
+ id="org.simantics.utils.ui.feature"\r
version="0.0.0"/>\r
\r
<includes\r
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.wiki.ui"\r
+ id="org.simantics.wiki.ui.feature"\r
version="0.0.0"/>\r
\r
<includes\r
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.utils.ui"\r
+ id="org.simantics.utils.ui.feature"\r
version="0.0.0"/>\r
\r
<includes\r
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.issues"\r
+ id="org.simantics.issues.feature"\r
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.issues.ui"\r
+ 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
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.event"\r
+ id="org.simantics.event.feature"\r
version="0.0.0"/>\r
\r
<includes\r
version="0.0.0"/>\r
\r
<includes\r
- id="org.simantics.wiki.ui"\r
+ id="org.simantics.wiki.ui.feature"\r
version="0.0.0"/>\r
\r
<includes\r
version="0.0.0"\r
unpack="false"/>\r
\r
+ <plugin\r
+ id="org.apache.poi.ooxml"\r
+ download-size="0"\r
+ install-size="0"\r
+ version="0.0.0"\r
+ unpack="false"/>\r
+\r
+ <plugin\r
+ id="org.apache.poi.ooxml-schemas"\r
+ download-size="0"\r
+ install-size="0"\r
+ version="0.0.0"\r
+ unpack="false"/>\r
+\r
</feature>\r
<?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
[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
</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
<?xml version="1.0" encoding="UTF-8"?>\r
<feature\r
- id="org.simantics.utils.ui"\r
+ id="org.simantics.utils.ui.feature"\r
label="UI Utils Feature"\r
version="1.25.0.qualifier"\r
provider-name="VTT Technical Research Centre of Finland">\r
<?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
<?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
[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
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
<?xml version="1.0" encoding="UTF-8"?>\r
<feature\r
- id="org.simantics.wiki.ui"\r
+ id="org.simantics.wiki.ui.feature"\r
label="Wiki Documentation Feature"\r
version="1.25.0.qualifier"\r
provider-name="Semantum Oy">\r
<version>1.0.0-SNAPSHOT</version>\r
</parent>\r
\r
+ <build>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.eclipse.tycho.extras</groupId>\r
+ <artifactId>tycho-source-feature-plugin</artifactId>\r
+ <version>${tycho.extras.version}</version>\r
+ <executions>\r
+ <execution>\r
+ <id>source-feature</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>source-feature</goal>\r
+ </goals>\r
+ <configuration>\r
+ <excludes>\r
+ <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
+ <plugin id="com.famfamfam.silk"/>\r
+ <plugin id="javax.vecmath"/>\r
+ <plugin id="org.apache.poi.ooxml-schemas"/>\r
+\r
+ <plugin id="org.eclipse.core.filesystem.aix.ppc"/>\r
+ <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>\r
+ <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>\r
+ <plugin id="org.eclipse.core.filesystem.linux.x86"/>\r
+ <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>\r
+ <plugin id="org.eclipse.core.filesystem.linux.ppc"/>\r
+ <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>\r
+ <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>\r
+ <plugin id="org.eclipse.core.filesystem.macosx"/>\r
+ <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>\r
+ <plugin id="org.eclipse.core.filesystem.win32.x86"/>\r
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>\r
+ <plugin id="org.eclipse.core.net.linux.x86"/>\r
+ <plugin id="org.eclipse.core.net.linux.x86_64"/>\r
+ <plugin id="org.eclipse.core.net.win32.x86"/>\r
+ <plugin id="org.eclipse.core.net.win32.x86_64"/>\r
+ <plugin id="org.eclipse.core.resources.win32.x86"/>\r
+ <plugin id="org.eclipse.core.resources.win32.x86_64"/>\r
+ <plugin id="javax.xml"/>\r
+ <plugin id="org.sat4j.core"/>\r
+ <plugin id="org.sat4j.pb"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.core"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.core.ant"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>\r
+ <plugin id="org.eclipse.mylyn.wikitext.ui"/>\r
+\r
+ <feature id="org.eclipse.ecf.core.feature"/>\r
+ <feature id="org.eclipse.ecf.core.ssl.feature"/>\r
+ <feature id="org.eclipse.ecf.filetransfer.feature"/>\r
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>\r
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>\r
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>\r
+ <feature id="org.eclipse.emf.common"/>\r
+ <feature id="org.eclipse.emf.ecore"/>\r
+ <feature id="org.eclipse.epp.mpc"/>\r
+ <feature id="org.eclipse.equinox.p2.discovery.feature"/>\r
+ <feature id="org.eclipse.equinox.executable"/>\r
+ </excludes>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.eclipse.tycho</groupId>\r
+ <artifactId>tycho-p2-plugin</artifactId>\r
+ <version>${tycho.version}</version>\r
+ <executions>\r
+ <execution>\r
+ <id>attach-p2-metadata</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>p2-metadata</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
+ \r
<modules>\r
<module>com.lowagie.text.feature</module>\r
<module>org.apache.lucene4.feature</module>\r
<module>org.simantics.wiki.ui.feature</module>\r
<module>org.simantics.workbench.feature</module>\r
</modules>\r
-</project>
\ No newline at end of file
+</project>\r
<groupId>org.simantics</groupId>\r
<artifactId>org.simantics.sdk.build.p2.site</artifactId>\r
<packaging>pom</packaging>\r
- <version>1.24.0</version>\r
+ <version>1.25.0</version>\r
\r
<properties>\r
<lucene.version>4.9.0</lucene.version>\r
<id>org.mozilla:rhino:1.7.7.1</id>\r
<source>true</source>\r
</artifact>\r
+ <artifact>\r
+ <id>net.java.dev.jna:jna:4.2.2</id>\r
+ <source>true</source>\r
+ </artifact>\r
+ <artifact>\r
+ <id>net.java.dev.jna:jna-platform:4.2.2</id>\r
+ <source>true</source>\r
+ </artifact>\r
</artifacts>\r
</configuration>\r
</execution>\r
</webApp>\r
</configuration>\r
</plugin>\r
-\r
</plugins>\r
</build>\r
\r
</pluginRepository>\r
</pluginRepositories>\r
\r
-</project>
\ No newline at end of file
+</project>\r
<repository location="http://www.simantics.org/update/external-components/master"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160520-1109"/>\r
+<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160811-1516"/>\r
<repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
</location>\r
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
<?xml version="1.0" encoding="UTF-8"?>\r
<site>\r
- <feature url="features/org.simantics.sdk_1.24.0.jar" id="org.simantics.sdk" version="1.24.0">\r
+ <feature url="features/org.simantics.sdk_1.25.0.jar" id="org.simantics.sdk" version="1.25.0">\r
<category name="org.simantics.target"/>\r
</feature>\r
<category-def name="org.simantics.target" label="Simantics Target">\r
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>org.simantics.sdk.repository</artifactId>\r
- <version>1.24.0-SNAPSHOT</version>\r
+ <version>1.25.0-SNAPSHOT</version>\r
<packaging>eclipse-repository</packaging>\r
\r
<parent>\r
</plugins>\r
</pluginManagement>\r
</build>\r
-</project>
\ No newline at end of file
+</project>\r
\r
<properties>\r
<tycho.version>0.25.0</tycho.version>\r
+ <tycho.extras.version>0.25.0</tycho.extras.version>\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
</properties>\r
</artifact>\r
</target>\r
<environments>\r
+<!--\r
<environment>\r
<os>linux</os>\r
<ws>gtk</ws>\r
<ws>gtk</ws>\r
<arch>x86_64</arch>\r
</environment>\r
+-->\r
<environment>\r
<os>win32</os>\r
<ws>win32</ws>\r
<ws>win32</ws>\r
<arch>x86_64</arch>\r
</environment>\r
+<!--\r
<environment>\r
<os>macosx</os>\r
<ws>cocoa</ws>\r
<arch>x86_64</arch>\r
</environment>\r
+-->\r
</environments>\r
</configuration>\r
</plugin>\r
</plugins>\r
</build>\r
-</project>
\ No newline at end of file
+</project>\r