Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-10-31 16:55:35 +0000
committerEd Willink2016-10-31 17:39:42 +0000
commit6c9c7d3a1a64e7fb099f9ea93da722a192e2ee94 (patch)
treea51cdc5b8864d682f95d533b7a749ed41642b551
parent1af1c426de18a4ed62a67b3061179c59b257e0e0 (diff)
downloadorg.eclipse.qvtd-6c9c7d3a1a64e7fb099f9ea93da722a192e2ee94.tar.gz
org.eclipse.qvtd-6c9c7d3a1a64e7fb099f9ea93da722a192e2ee94.tar.xz
org.eclipse.qvtd-6c9c7d3a1a64e7fb099f9ea93da722a192e2ee94.zip
[cs2as] Remove interim integration issues for generator/runtime
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java6
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.generator/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt.txt (renamed from plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt)0
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend.txt (renamed from plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend)0
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/ReadMe.txt1
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.runtime.prefs2
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/about.html43
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/build.properties4
-rw-r--r--plugins/org.eclipse.qvtd.cs2as.xtext.runtime/plugin.properties13
13 files changed, 71 insertions, 8 deletions
diff --git a/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
index 1d9020187..f2d27745c 100644
--- a/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.cs2as.build/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.emf.mwe.core;bundle-version="[1.3.10,2.0.0)",
org.eclipse.qvtd.cs2as.compiler;bundle-version="[0.14.0,1.0.0)",
org.eclipse.emf.codegen.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.ocl.pivot;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.qvtd.runtime
+ org.eclipse.qvtd.runtime,
+ org.eclipse.qvtd.compiler
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java b/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java
index 126033079..9a7343944 100644
--- a/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java
+++ b/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java
@@ -28,7 +28,7 @@ import org.eclipse.qvtd.cs2as.compiler.internal.CS2ASJavaCompilerParametersImpl;
public class GenerateCGedQVTiTransformation extends AbstractWorkflowComponent
{
private final static @NonNull String BACKSLASH = "/";
- private final static @NonNull String EMPTY_STRING = "";
+ // private final static @NonNull String EMPTY_STRING = "";
protected static boolean isDefined(final String string) {
return (!Objects.equals(string, null));
@@ -66,7 +66,7 @@ public class GenerateCGedQVTiTransformation extends AbstractWorkflowComponent
@Override
protected void invokeInternal(WorkflowContext ctx, ProgressMonitor monitor, Issues issues) {
-
+ // QVTp2QVTs.CONNECTION_CREATION.setState(true);
try {
URI oclDocURI = URI.createURI(oclFileURI);
CS2ASJavaCompilerParameters cgParams = createParameters();
@@ -81,7 +81,7 @@ public class GenerateCGedQVTiTransformation extends AbstractWorkflowComponent
protected OCL2QVTiCGTxCompiler createCompiler() {
return new OCL2QVTiCGTxCompiler();
}
- protected CS2ASJavaCompilerParameters createParameters() {
+ protected @NonNull CS2ASJavaCompilerParameters createParameters() {
return new CS2ASJavaCompilerParametersImpl(lookupResolverClassName, lookupResultItfName, javaFolder, javaPackage);
}
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/.settings/org.eclipse.core.resources.prefs
index 4f2474d64..9577bce1f 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
eclipse.preferences.version=1
-encoding//src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt=ISO-8859-1
+encoding//src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt.txt=ISO-8859-1
encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties
index 9b628de7f..7e1879e8d 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2015 Willink Transformations and others.
+# Copyright (c) 2016 Willink Transformations and others.
# 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
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt.txt
index 26a08385e..26a08385e 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xpt.txt
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend.txt
index 7e97c8744..7e97c8744 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.xtend.txt
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/ReadMe.txt b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/ReadMe.txt
new file mode 100644
index 000000000..747b5b4a1
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/src/org/eclipse/qvtd/cs2as/xtext/generator/ReadMe.txt
@@ -0,0 +1 @@
+This plugin provides support for auto-generated CS2AS editors. It is not yet in use and so problematic files have a *.txt additional extesion.
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..99f26c020
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 000000000..5a0ad22d2
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/META-INF/MANIFEST.MF
index f431ca330..d98c6e113 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Name: Runtime
Bundle-SymbolicName: org.eclipse.qvtd.cs2as.xtext.runtime
Bundle-Version: 0.14.0.qualifier
Export-Package: org.eclipse.qvtd.cs2as.xtext.runtime
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/about.html b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/about.html
new file mode 100644
index 000000000..87b2a5068
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/about.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head><body lang="EN-US">
+<h2>About This Content</h2>
+
+<pem>September 21, 2008</em></p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+
+ <h3>Third Party Content</h3>
+ <p>The Content includes items that have been sourced from third parties as set out below. If you
+ did not receive this Content directly from the Eclipse Foundation, the following is provided
+ for informational purposes only, and you should look to the Redistributor's license for
+ terms and conditions of use.</p>
+ <p><em>
+ <br><br>
+ <strong>OMG QVT 1.0 specification (08-04-03)</strong> <br>
+ <ul>
+ <li><a href="http://www.omg.org/spec/QVT/1.0/">QVT 1.0 main page</a></li>
+ <li><a href="http://www.omg.org/docs/formal/08-04-03.pdf">QVT 1.0 specification</a></li>
+ <li><a href="http://www.omg.org/">OMG site</a></li>
+ </ul>
+ <br>
+ </em></p>
+ <p>A detailed list of fixes and clarifications with respect to those specifications may be found in <a href="QVTBaseCompliance.html">QVTBaseCompliance.html</a>.</p>
+</body></html> \ No newline at end of file
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/build.properties b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/build.properties
index 76ce8550b..65aba35f9 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/build.properties
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/build.properties
@@ -10,4 +10,6 @@
###############################################################################
source.. = src/
bin.includes = META-INF/,\
- .
+ .,\
+ about.html,\
+ plugin.properties
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/plugin.properties b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/plugin.properties
new file mode 100644
index 000000000..0d6522dd8
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.runtime/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2016 Willink Transformations and others.
+# 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:
+# E.D.Willink - initial API and implementation
+###############################################################################
+
+pluginName = QVTd CS2AS Xtext Runtime (Incubation)
+providerName = Eclipse Modeling Project

Back to the top