فهرست منبع

incremented version qualifier - set provider name and plugin names

Andreas Mülder 12 سال پیش
والد
کامیت
7572ae1f3b
24فایلهای تغییر یافته به همراه72 افزوده شده و 59 حذف شده
  1. 1 1
      de.itemis.gmf.utils/plugins/de.itemis.gmf.runtime.commons/META-INF/MANIFEST.MF
  2. 1 1
      de.itemis.gmf.utils/plugins/de.itemis.gmf.runtime.commons/pom.xml
  3. 1 1
      de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.gmf/META-INF/MANIFEST.MF
  4. 1 1
      de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.gmf/pom.xml
  5. 1 1
      de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/META-INF/MANIFEST.MF
  6. 1 1
      de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/pom.xml
  7. 14 1
      de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/StyledTextXtextAdapter.java
  8. 1 1
      features/org.yakindu.base-feature/pom.xml
  9. 3 3
      plugins/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF
  10. 1 1
      plugins/org.yakindu.base.expressions.edit/pom.xml
  11. 3 3
      plugins/org.yakindu.base.expressions.ui/META-INF/MANIFEST.MF
  12. 23 23
      plugins/org.yakindu.base.expressions.ui/plugin.xml_gen
  13. 1 1
      plugins/org.yakindu.base.expressions.ui/pom.xml
  14. 3 3
      plugins/org.yakindu.base.expressions/META-INF/MANIFEST.MF
  15. 1 1
      plugins/org.yakindu.base.expressions/pom.xml
  16. 2 2
      plugins/org.yakindu.base.types.edit/META-INF/MANIFEST.MF
  17. 1 1
      plugins/org.yakindu.base.types.edit/pom.xml
  18. 3 3
      plugins/org.yakindu.base.types.scope/META-INF/MANIFEST.MF
  19. 1 1
      plugins/org.yakindu.base.types.scope/pom.xml
  20. 3 3
      plugins/org.yakindu.base.types/META-INF/MANIFEST.MF
  21. 1 1
      plugins/org.yakindu.base.types/pom.xml
  22. 3 3
      releng/org.yakindu.base.releng/pom.xml
  23. 1 1
      releng/org.yakindu.base.repository/pom.xml
  24. 1 1
      releng/org.yakindu.base.target/pom.xml

+ 1 - 1
de.itemis.gmf.utils/plugins/de.itemis.gmf.runtime.commons/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GMF Runtime Commons
 Bundle-SymbolicName: de.itemis.gmf.runtime.commons
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: itemis AG
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",

+ 1 - 1
de.itemis.gmf.utils/plugins/de.itemis.gmf.runtime.commons/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.itemis.gmf.runtime.commons</artifactId>

+ 1 - 1
de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.gmf/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Xtext GMF Integration (XGI)
 Bundle-SymbolicName: de.itemis.xtext.utils.gmf
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: itemis AG
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.0.0,3.0.0)",

+ 1 - 1
de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.gmf/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.itemis.xtext.utils.gmf</artifactId>

+ 1 - 1
de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Xtext JFace Integration (XJI)
 Bundle-SymbolicName: de.itemis.xtext.utils.jface;singleton:=true
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: itemis AG
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",

+ 1 - 1
de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.itemis.xtext.utils.jface</artifactId>

+ 14 - 1
de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/StyledTextXtextAdapter.java

@@ -22,9 +22,12 @@ import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.editors.text.EditorsPlugin;
@@ -170,13 +173,19 @@ public class StyledTextXtextAdapter {
 		// Overrides the editors selection provider to provide the text
 		// selection if opened within an editor context
 		try {
-			IWorkbenchPartSite site = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+			final IWorkbenchPartSite site = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
 					.getActiveEditor().getSite();
 			XtextStyledTextSelectionProvider xtextStyledTextSelectionProvider = new XtextStyledTextSelectionProvider();
 			ChangeSelectionProviderOnFocusGain listener = new ChangeSelectionProviderOnFocusGain(site,
 					xtextStyledTextSelectionProvider);
 			styledText.addFocusListener(listener);
 			styledText.addDisposeListener(listener);
+			styledText.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					ISelectionService service = (ISelectionService) site.getService(ISelectionService.class);
+				}
+			});
 		} catch (NullPointerException ex) {
 			//Do nothing, not opened within editor context
 		}
@@ -324,7 +333,11 @@ public class StyledTextXtextAdapter {
 
 	private class XtextStyledTextSelectionProvider implements ISelectionProvider {
 
+		public XtextStyledTextSelectionProvider() {
+		}
+		
 		public void setSelection(ISelection selection) {
+			
 		}
 
 		public void removeSelectionChangedListener(ISelectionChangedListener listener) {

+ 1 - 1
features/org.yakindu.base-feature/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base</artifactId>

+ 3 - 3
plugins/org.yakindu.base.expressions.edit/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: Yakindu Statechart Tools (SCT) Base Edit
 Bundle-SymbolicName: org.yakindu.base.expressions.edit;singleton:=true
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.base.expressions.expressions.provider.ExpressionsEditPlugin$Implementation
-Bundle-Vendor: %providerName
+Bundle-Vendor: statecharts.org
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.yakindu.base.expressions.expressions.provider

+ 1 - 1
plugins/org.yakindu.base.expressions.edit/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.expressions.edit</artifactId>

+ 3 - 3
plugins/org.yakindu.base.expressions.ui/META-INF/MANIFEST.MF

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.yakindu.base.expressions.ui
-Bundle-Vendor: My Company
-Bundle-Version: 2.1.2.qualifier
+Bundle-Name: Yakindu Statechart Tools (SCT) Expressions UI
+Bundle-Vendor: statecharts.org
+Bundle-Version: 2.2.0.qualifier
 Bundle-SymbolicName: org.yakindu.base.expressions.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.yakindu.base.expressions;visibility:=reexport,

+ 23 - 23
plugins/org.yakindu.base.expressions.ui/plugin.xml_gen

@@ -223,29 +223,29 @@
         </resourceServiceProvider>
     </extension>
 
-
-	<!-- marker definitions for org.yakindu.base.expressions.Expressions -->
-	<extension
-	        id="expressions.check.fast"
-	        name="Expressions Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.fast"/>
-	    <persistent value="true"/>
-	</extension>
-	<extension
-	        id="expressions.check.normal"
-	        name="Expressions Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.normal"/>
-	    <persistent value="true"/>
-	</extension>
-	<extension
-	        id="expressions.check.expensive"
-	        name="Expressions Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.expensive"/>
-	    <persistent value="true"/>
-	</extension>
+
+    <!-- marker definitions for org.yakindu.base.expressions.Expressions -->
+    <extension
+            id="expressions.check.fast"
+            name="Expressions Problem"
+            point="org.eclipse.core.resources.markers">
+        <super type="org.eclipse.xtext.ui.check.fast"/>
+        <persistent value="true"/>
+    </extension>
+    <extension
+            id="expressions.check.normal"
+            name="Expressions Problem"
+            point="org.eclipse.core.resources.markers">
+        <super type="org.eclipse.xtext.ui.check.normal"/>
+        <persistent value="true"/>
+    </extension>
+    <extension
+            id="expressions.check.expensive"
+            name="Expressions Problem"
+            point="org.eclipse.core.resources.markers">
+        <super type="org.eclipse.xtext.ui.check.expensive"/>
+        <persistent value="true"/>
+    </extension>
 
    <extension
          point="org.eclipse.xtext.builder.participant">

+ 1 - 1
plugins/org.yakindu.base.expressions.ui/pom.xml

@@ -6,7 +6,7 @@
 		<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.expressions.ui</artifactId>

+ 3 - 3
plugins/org.yakindu.base.expressions/META-INF/MANIFEST.MF

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.yakindu.base.expressions
-Bundle-Vendor: yakindu.org
-Bundle-Version: 2.1.2.qualifier
+Bundle-Name: Yakindu Statechart Tools (SCT) Expressions
+Bundle-Vendor: statecharts.org
+Bundle-Version: 2.2.0.qualifier
 Bundle-SymbolicName: org.yakindu.base.expressions; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,

+ 1 - 1
plugins/org.yakindu.base.expressions/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.expressions</artifactId>

+ 2 - 2
plugins/org.yakindu.base.types.edit/META-INF/MANIFEST.MF

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: Yakindu Statechart Tools (SCT) Types Edit
 Bundle-SymbolicName: org.yakindu.base.types.edit;singleton:=true
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.yakindu.base.types.provider.TypesEditPlugin$Implementation
 Bundle-Vendor: %providerName

+ 1 - 1
plugins/org.yakindu.base.types.edit/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.types.edit</artifactId>

+ 3 - 3
plugins/org.yakindu.base.types.scope/META-INF/MANIFEST.MF

@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.yakindu.base.types.scope
+Bundle-Name: Yakindu Statechart Tools (SCT) Types Scope
 Bundle-SymbolicName: org.yakindu.base.types.scope;singleton:=true
-Bundle-Version: 2.1.2.qualifier
-Bundle-Vendor: yakindu.org
+Bundle-Version: 2.2.0.qualifier
+Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="2.0.0",
  org.yakindu.base.types;bundle-version="1.0.0"

+ 1 - 1
plugins/org.yakindu.base.types.scope/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.types.scope</artifactId>

+ 3 - 3
plugins/org.yakindu.base.types/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: Yakindu Statechart Tools (SCT) Types
 Bundle-SymbolicName: org.yakindu.base.types;singleton:=true
-Bundle-Version: 2.1.2.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-ClassPath: .
-Bundle-Vendor: yakindu.org
+Bundle-Vendor: statecharts.org
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.yakindu.base.base,

+ 1 - 1
plugins/org.yakindu.base.types/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.types</artifactId>

+ 3 - 3
releng/org.yakindu.base.releng/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yakindu.base</groupId>
 	<artifactId>org.yakindu.base.releng</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- this is the parent POM from which all modules inherit common settings -->
@@ -318,7 +318,7 @@
 								<artifact>
 									<groupId>org.yakindu.base</groupId>
 									<artifactId>org.yakindu.base.target</artifactId>
-									<version>2.1.2-SNAPSHOT</version>
+									<version>2.2.0-SNAPSHOT</version>
 									<classifier>Juno</classifier>
 								</artifact>
 							</target>
@@ -346,7 +346,7 @@
 								<artifact>
 									<groupId>org.yakindu.base</groupId>
 									<artifactId>org.yakindu.base.target</artifactId>
-									<version>2.1.2-SNAPSHOT</version>
+									<version>2.2.0-SNAPSHOT</version>
 									<classifier>Kepler</classifier>
 								</artifact>
 							</target>

+ 1 - 1
releng/org.yakindu.base.repository/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yakindu.base</groupId>
 		<artifactId>org.yakindu.base.releng</artifactId>
-		<version>2.1.2-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 		<relativePath>../org.yakindu.base.releng/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.yakindu.base.repository</artifactId>

+ 1 - 1
releng/org.yakindu.base.target/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yakindu.base</groupId>
 	<artifactId>org.yakindu.base.target</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>