瀏覽代碼

edit plugin for stext

benjamin.schwertfeger@gmail.com 13 年之前
父節點
當前提交
7e048fe100

+ 7 - 0
features/org.yakindu.sct-feature/feature.xml

@@ -103,6 +103,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.yakindu.sct.model.stext.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.yakindu.sct.model.stext.ui"
          download-size="0"

+ 7 - 7
plugins/org.yakindu.sct.model.sgraph/.classpath

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

+ 3 - 0
plugins/org.yakindu.sct.model.stext.ui/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,3 @@
+#Fri Jan 06 10:04:22 CET 2012
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

+ 2 - 1
plugins/org.yakindu.sct.model.stext.ui/META-INF/MANIFEST.MF

@@ -14,7 +14,8 @@ Require-Bundle: org.yakindu.sct.model.stext;visibility:=reexport,
  org.eclipse.xtext.builder,
  org.antlr.runtime,
  org.eclipse.xtext.common.types.ui,
- org.yakindu.sct.model.sgraph
+ org.yakindu.sct.model.sgraph,
+ org.yakindu.sct.model.stext.edit;bundle-version="1.0.0"
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+ 0 - 2
plugins/org.yakindu.sct.model.stext.ui/plugin.xml

@@ -204,6 +204,4 @@
          </command>
       </menuContribution>
    </extension>
-
-
 </plugin>

+ 3 - 0
plugins/org.yakindu.sct.model.stext/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,3 @@
+#Fri Jan 06 10:03:25 CET 2012
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

+ 3 - 0
plugins/org.yakindu.sct.model.stext/.settings/org.eclipse.core.runtime.prefs

@@ -0,0 +1,3 @@
+#Fri Jan 06 10:03:25 CET 2012
+eclipse.preferences.version=1
+line.separator=\r\n

+ 2 - 1
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/GenerateExpressions.mwe2

@@ -1,4 +1,4 @@
-module org.yakindu.sct.statechart.Expressions
+module org.yakindu.sct.model.stext.Stext
 
 import org.eclipse.emf.mwe.utils.*
 import org.eclipse.xtext.generator.*
@@ -40,6 +40,7 @@ Workflow {
 
 			// generates Java API for the generated EPackages 
 			fragment = ecore.EcoreGeneratorFragment {
+				generateEdit = true
 			}
 
 			// the serialization component

+ 0 - 1
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/validation/StaticTypeAnalyzer.xtend

@@ -36,7 +36,6 @@ import org.yakindu.sct.model.stext.stext.EventRaising
 import org.yakindu.sct.model.stext.stext.Assignment
 import org.yakindu.sct.model.stext.stext.RelationalOperator
 import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.stext.stext.Type
 import com.google.inject.Inject
 import org.eclipse.xtext.validation.ValidationMessageAcceptor
 import org.yakindu.sct.model.stext.stext.EventDefinition

+ 2 - 1
plugins/org.yakindu.sct.ui.navigator/META-INF/MANIFEST.MF

@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="3.5.100",
  de.itemis.xtext.utils.jface;bundle-version="1.0.0",
  org.yakindu.sct.model.stext;bundle-version="1.0.0",
  org.yakindu.sct.model.sgraph.edit;bundle-version="1.0.0",
- org.yakindu.sct.ui.editor;bundle-version="1.0.0"
+ org.yakindu.sct.ui.editor;bundle-version="1.0.0",
+ org.eclipse.platform;bundle-version="3.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

+ 8 - 11
plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/utils/ComposedAdapterFactoryUtil.java

@@ -1,22 +1,19 @@
 package org.yakindu.sct.ui.navigator.utils;
 
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.yakindu.sct.model.sgraph.provider.SGraphItemProviderAdapterFactory;
-import org.yakindu.sct.model.sgraph.util.SGraphAdapterFactory;
-import org.yakindu.sct.model.stext.stext.util.StextAdapterFactory;
 
 public class ComposedAdapterFactoryUtil {
 
 	public static final ComposedAdapterFactory FACTORY;
 	static {
-		FACTORY = new ComposedAdapterFactory();
-		FACTORY.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		FACTORY.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-		FACTORY.addAdapterFactory(new SGraphAdapterFactory());
-		FACTORY.addAdapterFactory(new StextAdapterFactory());
-		FACTORY.addAdapterFactory(new SGraphItemProviderAdapterFactory());
+		FACTORY = new ComposedAdapterFactory(
+				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		// FACTORY.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		// FACTORY.addAdapterFactory(new
+		// ReflectiveItemProviderAdapterFactory());
+
+		// FACTORY.addAdapterFactory(new SGraphItemProviderAdapterFactory());
 
 	}
+
 }

+ 1 - 0
releng/org.yakindu.sct.releng/pom.xml

@@ -183,6 +183,7 @@
 		<module>../org.yakindu.sct.model.sgraph.test</module>
 		<module>../org.yakindu.sct.model.sgraph.ui</module>
 		<module>../org.yakindu.sct.model.stext</module>
+		<module>../org.yakindu.sct.model.stext.edit</module>
 		<module>../org.yakindu.sct.model.stext.resource</module>
 		<module>../org.yakindu.sct.model.stext.ui</module>
 		<module>../org.yakindu.sct.simulation.core</module>

+ 3 - 3
releng/org.yakindu.sct.statechart.target/INDIGO.target

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
-<target name="INDIGO" sequenceNumber="9">
+<target name="INDIGO" sequenceNumber="10">
 <locations>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="2.7.0.v20110606-0949"/>
@@ -16,8 +16,8 @@
 <repository location="http://download.eclipse.org/eclipse/updates/3.7/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.yakindu.base.feature.group" version="1.0.0.201201061454"/>
-<repository location="http://updates.yakindu.com/indigo/milestones"/>
+<unit id="org.yakindu.base.feature.group" version="1.0.0.201201100852"/>
+<repository location="http://updates.yakindu.com/indigo/integration"/>
 </location>
 </locations>
 </target>

+ 33 - 0
test-plugins/org.yakindu.sct.model.stext.edit/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.yakindu.sct</groupId>
+		<artifactId>org.yakindu.sct.releng</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../org.yakindu.sct.releng/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.yakindu.sct.model.stext.edit</artifactId>
+	<groupId>org.yakindu.sct.plugins</groupId>
+	<packaging>eclipse-plugin</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>