[cs2as] Fix manifests, builds, abouts, warningsI201610221215

author: Ed Willink 2016-10-22 14:59:33 +0000
committer: Ed Willink 2016-10-22 14:59:33 +0000
commit: c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c (patch)
tree: 3718921a2dc5749bcf77e1da1d5ed42d7638e135 /plugins
parent: b1c82f7f6f928f2e64d2f3c5adc9ea9c11be8cea (diff)
download: org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.tar.gz
org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.tar.xz
org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.zip
8 files changed, 69 insertions, 139 deletions
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/META-INF/MANIFEST.MF
index 03ad0b146..53ef522ac 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/META-INF/MANIFEST.MF
@@ -1,6 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CS2AS Xtext Generator
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.qvtd.cs2as.xtext.generator
 Bundle-Version: 0.14.0.qualifier
 Require-Bundle: org.eclipse.xtext.generator;bundle-version="[2.8.1,3.0.0)",
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/about.html b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/about.html
new file mode 100644
index 000000000..87b2a5068
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/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.generator/build.properties b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/build.properties
index 76ce8550b..33872e925 100644
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/build.properties
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/build.properties
@@ -8,6 +8,10 @@
 # Contributors:
 #     E.D.Willink - initial API and implementation
 ###############################################################################
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties
new file mode 100644
index 000000000..9b628de7f
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2015 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 Generator (Incubation)
+providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/.gitignore b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/.gitignore
new file mode 100644
index 000000000..cf1db2eed
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/.gitignore
@@ -0,0 +1 @@
+/org/
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/.gitignore b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/.gitignore
deleted file mode 100644
index 55bddad2d..000000000
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.CS2ASOutlineTreeProviderFragment.java._trace
-/.CS2ASOutlineTreeProviderFragment.xtendbin
-/CS2ASOutlineTreeProviderFragment.java
diff --git a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.java b/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.java
deleted file mode 100644
index ef8df88d9..000000000
--- a/plugins/org.eclipse.qvtd.cs2as.xtext.generator/xtend-gen/org/eclipse/qvtd/cs2as/xtext/generator/CS2ASOutlineTreeProviderFragment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Copyright (c) 2015 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
- */
-package org.eclipse.qvtd.cs2as.xtext.generator;
-
-import com.google.inject.Inject;
-import org.eclipse.xtend2.lib.StringConcatenationClient;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.xtext.generator.model.FileAccessFactory;
-import org.eclipse.xtext.xtext.generator.model.IXtextGeneratorFileSystemAccess;
-import org.eclipse.xtext.xtext.generator.model.JavaFileAccess;
-import org.eclipse.xtext.xtext.generator.model.TypeReference;
-import org.eclipse.xtext.xtext.generator.model.XtendFileAccess;
-import org.eclipse.xtext.xtext.generator.model.project.IBundleProjectConfig;
-import org.eclipse.xtext.xtext.generator.model.project.IXtextProjectConfig;
-import org.eclipse.xtext.xtext.generator.ui.outline.OutlineTreeProviderFragment2;
-
-@SuppressWarnings("all")
-public class CS2ASOutlineTreeProviderFragment extends OutlineTreeProviderFragment2 {
-  @Inject
-  private FileAccessFactory fileAccessFactory;
-  
-  @Inject
-  private Grammar grammar;
-  
-  @Override
-  public TypeReference getOutlineTreeProviderClass(final Grammar grammar) {
-    String _namespace = GrammarUtil.getNamespace(grammar);
-    String _plus = (_namespace + ".ui.outline.");
-    String _simpleName = GrammarUtil.getSimpleName(grammar);
-    String _plus_1 = (_plus + _simpleName);
-    String _plus_2 = (_plus_1 + "CS2ASOutlineTreeProvider");
-    return new TypeReference(_plus_2);
-  }
-  
-  @Override
-  public void generateJavaOutlineTreeProvider() {
-    TypeReference _outlineTreeProviderClass = this.getOutlineTreeProviderClass(this.grammar);
-    StringConcatenationClient _client = new StringConcatenationClient() {
-      @Override
-      protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
-        _builder.append("/**");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("* Customization of the default outline structure.");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("*");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("* See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#outline");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("*/");
-        _builder.newLine();
-        _builder.append("public class ");
-        TypeReference _outlineTreeProviderClass = CS2ASOutlineTreeProviderFragment.this.getOutlineTreeProviderClass(CS2ASOutlineTreeProviderFragment.this.grammar);
-        String _simpleName = _outlineTreeProviderClass.getSimpleName();
-        _builder.append(_simpleName, "");
-        _builder.append(" extends ");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        String _namespace = GrammarUtil.getNamespace(CS2ASOutlineTreeProviderFragment.this.grammar);
-        String _plus = (_namespace + ".ui.outline.CS2ASOutlineTreeProvider");
-        _builder.append(_plus, "\t");
-        _builder.append(" {");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        _builder.newLine();
-        _builder.append("}");
-        _builder.newLine();
-      }
-    };
-    JavaFileAccess _createJavaFile = this.fileAccessFactory.createJavaFile(_outlineTreeProviderClass, _client);
-    IXtextProjectConfig _projectConfig = this.getProjectConfig();
-    IBundleProjectConfig _eclipsePlugin = _projectConfig.getEclipsePlugin();
-    IXtextGeneratorFileSystemAccess _src = _eclipsePlugin.getSrc();
-    _createJavaFile.writeTo(_src);
-  }
-  
-  @Override
-  public void generateXtendOutlineTreeProvider() {
-    TypeReference _outlineTreeProviderClass = this.getOutlineTreeProviderClass(this.grammar);
-    StringConcatenationClient _client = new StringConcatenationClient() {
-      @Override
-      protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
-        _builder.append("/**");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("* Customization of the default outline structure.");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("*");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("* See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#outline");
-        _builder.newLine();
-        _builder.append(" ");
-        _builder.append("*/");
-        _builder.newLine();
-        _builder.append("public class ");
-        TypeReference _outlineTreeProviderClass = CS2ASOutlineTreeProviderFragment.this.getOutlineTreeProviderClass(CS2ASOutlineTreeProviderFragment.this.grammar);
-        String _simpleName = _outlineTreeProviderClass.getSimpleName();
-        _builder.append(_simpleName, "");
-        _builder.append(" extends ");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        String _namespace = GrammarUtil.getNamespace(CS2ASOutlineTreeProviderFragment.this.grammar);
-        String _plus = (_namespace + ".ui.outline.CS2ASOutlineTreeProvider");
-        _builder.append(_plus, "\t");
-        _builder.append(" {");
-        _builder.newLineIfNotEmpty();
-        _builder.append("\t");
-        _builder.newLine();
-        _builder.append("}");
-        _builder.newLine();
-      }
-    };
-    XtendFileAccess _createXtendFile = this.fileAccessFactory.createXtendFile(_outlineTreeProviderClass, _client);
-    IXtextProjectConfig _projectConfig = this.getProjectConfig();
-    IBundleProjectConfig _eclipsePlugin = _projectConfig.getEclipsePlugin();
-    IXtextGeneratorFileSystemAccess _src = _eclipsePlugin.getSrc();
-    _createXtendFile.writeTo(_src);
-  }
-}
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 cd780db7f..f431ca330 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
@@ -1,5 +1,8 @@
 Manifest-Version: 1.0
 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
author	Ed Willink	2016-10-22 14:59:33 +0000
committer	Ed Willink	2016-10-22 14:59:33 +0000
commit	c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c (patch)
tree	3718921a2dc5749bcf77e1da1d5ed42d7638e135 /plugins
parent	b1c82f7f6f928f2e64d2f3c5adc9ea9c11be8cea (diff)
download	org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.tar.gz org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.tar.xz org.eclipse.qvtd-c46bad6dab2a579d9cb54a5cebfbbe5ba3fea52c.zip