Fixing tooling.ui project #359

viatra · Nov 29, 2012 · a248d77 · a248d77
1 parent a99bd8c
commit a248d77
Show file tree

Hide file tree

Showing 98 changed files with 288 additions and 288 deletions.
diff --git a/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF
@@ -42,14 +42,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.codegen.ecore,
  org.eclipse.incquery.tooling.generator.model;bundle-version="0.6.0",
  org.eclipse.incquery.tooling.core;bundle-version="0.6.0"
-Bundle-Activator: org.eclipse.incquery.ui.IncQueryGUIPlugin
+Bundle-Activator: org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.incquery.ui.dialog,
- org.eclipse.incquery.ui.queryexplorer,
- org.eclipse.incquery.ui.queryexplorer.adapters,
- org.eclipse.incquery.ui.queryexplorer.content.matcher,
- org.eclipse.incquery.ui.queryexplorer.content.patternsviewer,
- org.eclipse.incquery.ui.queryexplorer.handlers,
- org.eclipse.incquery.ui.queryexplorer.handlers.util,
- org.eclipse.incquery.ui.queryexplorer.util
+Export-Package: org.eclipse.incquery.tooling.ui.dialog,
+ org.eclipse.incquery.tooling.ui.queryexplorer,
+ org.eclipse.incquery.tooling.ui.queryexplorer.adapters,
+ org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher,
+ org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer,
+ org.eclipse.incquery.tooling.ui.queryexplorer.handlers,
+ org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util,
+ org.eclipse.incquery.tooling.ui.queryexplorer.util
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml
@@ -29,7 +29,7 @@ To create the example EMF metamodel, you may either import the domain project (<
       <subitem label="Issue: File | New | Project | EMF-IncQuery | EMF-IncQuery Project">
          <command
                required="false"
-               serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.newproject)"/>
+               serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.newproject)"/>
       </subitem>
       <subitem label="Give a name to the project (e.g. school.incquery), then press Finish."></subitem>
       <!-- <subitem skip="true" label="(Optionally, only if you aren't using a new Eclipse Application:) On the second wizard page, add a reference to the school.genmodel Generator Model by pushing Add and browsing to the school.genmodel file in the school project. Click on Finish to proceed."></subitem> -->

diff --git a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml
@@ -14,7 +14,7 @@
    			Note: if you wish to specify queries for a domain defined in a project that is already installed as a plug-in (in EMF terms, registered in the Global EPackage Registry), the .eiqgen file is not necessary.
    		</description>
    		<subitem label="Issue: File | New | Other | EMF-IncQuery | EMF-IncQuery Generator Model">
-         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.neweiqgenmodel)"/>
+         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.neweiqgenmodel)"/>
       	</subitem>
       	<subitem skip="false" label="Select the target EMF-IncQuery project to which a new Generator Model will be added."></subitem>
       	<subitem skip="false" label="Specify EMF .genmodels from your workspace using the Add button."></subitem>
@@ -28,7 +28,7 @@
       	Query definition patterns can have <b>header parameters</b> that specify the input/output variables of a query. Each header parameter should have a type assigned, and it can serves both as input and output depending on the <b>parameter binding</b>. Parameter bindings may be later provided using the Details/Filters panel (right side) in the Query Explorer, or using the Java API. A binding may specify that a header parameter should correspond to a pre-determined value, e.g. a model object or a scalar value.<br/>
       </description>
       <subitem label="Issue: File | New | Other | EMF-IncQuery | EMF-IncQuery Query Definition">
-         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.neweiqfile)"/>
+         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.neweiqfile)"/>
       </subitem>
       <subitem skip="true" label="On the second wizard page, give your pattern a unique name."></subitem>
       <subitem skip="true" label="Specify packages to import."></subitem>
@@ -60,7 +60,7 @@ This pattern includes a simple <b>edge type constraint</b> of type School.teache
 Make sure that you are experimenting with the Query Explorer in the same Eclipse instance where the school.incquery project is located (and which already contains school, school.edit and school.editor as plug-ins).
    	</description>
    	<subitem skip="true" label="Open the Query Explorer view, if not already open.">
-   		<command required="true" serialization="org.eclipse.ui.views.showView(org.eclipse.viatra2.emf.incquery.queryexplorer.QueryExplorer)"></command>
+   		<command required="true" serialization="org.eclipse.ui.views.showView(org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer)"></command>
    	</subitem>
    	<subitem skip="false" label="Import your query definition patterns by putting the Query Definition Editor in focus, and then pushing the green button in the top right corner of the Query Explorer."></subitem>
    	<subitem skip="false" label="Apply the query patterns on an instance model, by opening an instance model in the School Editor, and then pushing the green button again."></subitem>

diff --git a/plugins/org.eclipse.incquery.tooling.ui/plugin.xml b/plugins/org.eclipse.incquery.tooling.ui/plugin.xml
@@ -4,33 +4,33 @@
    <extension
          point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.incquery.ui.category"
+            id="org.eclipse.incquery.tooling.ui.category"
             name="EMF-IncQuery">
       </category>
       <wizard
-            category="org.eclipse.incquery.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse..incquery.ui.wizards.NewProjectWizard"
+            category="org.eclipse.incquery.tooling.ui.category"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.wizards.NewProjectWizard"
             finalPerspective="org.eclipse.pde.ui.PDEPerspective"
             icon="icons/logo2.png"
-            id="org.eclipse..incquery.ui.newproject"
+            id="org.eclipse.incquery.tooling.ui.newproject"
             name="EMF-IncQuery Project"
             preferredPerspectives="org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective"
             project="true">
       </wizard>
       <wizard
             category="org.eclipse.incquery.tooling.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse..incquery.ui.wizards.NewEiqFileWizard"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.uiwizards.NewEiqFileWizard"
             finalPerspective="org.eclipse.pde.ui.PDEPerspective"
             icon="icons/logo2.png"
-            id="org.eclipse.incquery.ui.neweiqfile"
+            id="org.eclipse.incquery.tooling.ui.neweiqfile"
             name="EMF-IncQuery Query Definition "
             preferredPerspectives="org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective">
       </wizard>
       <wizard
             category="org.eclipse.incquery.tooling.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.wizards.NewGenmodelWizard"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.wizards.NewGenmodelWizard"
             icon="icons/logo2.png"
-            id="org.eclipse.incquery.ui.neweiqgenmodel"
+            id="org.eclipse.incquery.tooling.ui.neweiqgenmodel"
             name="EMF-IncQuery Generator Model"
             project="false">
       </wizard>
@@ -45,7 +45,7 @@
             category="org.eclipse.incquery"
             composite="true"
             contentFile="cheatsheets/gettingstarted.xml"
-            id="org.eclipse.incquery.ui.cheatsheet"
+            id="org.eclipse.incquery.tooling.ui.cheatsheet"
             name="Getting Started with EMF-IncQuery">
       </cheatsheet>
    </extension>
@@ -57,7 +57,7 @@
       </category>
       <view
             category="org.eclipse.incquery.tooling.ui"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
             icon="icons/logo2.png"
             id="org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
             name="Query Explorer">
@@ -166,7 +166,7 @@
             <iterate
                   ifEmpty="false">
                <instanceof
-                     value="org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComponent">
+                     value="org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComponent">
                </instanceof>
             </iterate>
             <count
@@ -196,11 +196,11 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.RuntimeMatcherRegistrationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.RuntimeMatcherRegistrationHandler"
             commandId="org.eclipse.incquery.tooling.ui.runtimematcherreg">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadmodel">
          <activeWhen>
             <reference
@@ -209,7 +209,7 @@
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqPatternHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqPatternHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadmodel">
          <activeWhen>
             <reference
@@ -218,47 +218,47 @@
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.ShowLocationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.ShowLocationHandler"
             commandId="org.eclipse.incquery.tooling.ui.showlocation">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.UnloadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.UnloadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.unmodel">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PatternUnregistrationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PatternUnregistrationHandler"
             commandId="org.eclipse.incquery.tooling.ui.unregisterpattern">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PackagePresentationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PackagePresentationHandler"
             commandId="org.eclipse.incquery.tooling.ui.pattern.flat">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PackagePresentationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PackagePresentationHandler"
             commandId="org.eclipse.incquery.tooling.ui.pattern.hierarchical">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadresourceset">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadResourceHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadResourceHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadresource">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadeiqmodel">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqPatternHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqPatternHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadeiqpattern">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.PatternRegitryShowLocationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PatternRegitryShowLocationHandler"
             commandId="org.eclipse.incquery.tooling.ui.showlocation_patternreg">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.ResetUIHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.ResetUIHandler"
             commandId="org.eclipse.incquery.tooling.ui.resetui">
       </handler>
    </extension>
@@ -288,7 +288,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="toolbar:org.eclipse.incquery.ui.queryexplorer.QueryExplorer">
+            locationURI="toolbar:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer">
          <command
                commandId="org.eclipse.incquery.tooling.ui.loadmodel"
                icon="icons/load.gif"
@@ -303,7 +303,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.incquery.ui.queryexplorer.QueryExplorer.treeViewerMenu">
+            locationURI="popup:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer.treeViewerMenu">
          <command
                commandId="org.eclipse.incquery.tooling.ui.showlocation"
                icon="icons/forward_nav.gif"
@@ -357,7 +357,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.incquery.ui.queryexplorer.QueryExplorer.patternsViewerMenu">
+            locationURI="popup:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer.patternsViewerMenu">
          <command
                commandId="org.eclipse.incquery.tooling.ui.unregisterpattern"
                icon="icons/unload.gif"
@@ -373,7 +373,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="menu:org.eclipse.incquery.ui.queryexplorer.QueryExplorer">
+            locationURI="menu:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer">
          <menu
                label="Patterns viewer presentation">
             <command
@@ -514,7 +514,7 @@
          point="org.eclipse.ui.navigator.navigatorContent">
       <commonFilter
             activeByDefault="true"
-            class="org.eclipse.incquery.ui.content.QueryFolderFilter"
+            class="org.eclipse.incquery.tooling.ui.content.QueryFolderFilter"
             description="Hides EMF-IncQuery queries folder"
             id="org.eclipse.incquery.tooling.ui.queriesFolderFilter"
             name="EMF-IncQuery output folder"
@@ -535,7 +535,7 @@
    <extension
          point="org.eclipse.jdt.ui.javaElementFilters">
       <filter
-            class="org.eclipse.incquery.ui.content.QueryFolderFilter"
+            class="org.eclipse.incquery.tooling.ui.content.QueryFolderFilter"
             description="Hides EMF-IncQuery queries folder"
             enabled="true"
             id="org.eclipse.incquery.tooling.ui.queriesFolderFilter"
@@ -545,7 +545,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.incquery.patternlanguage.emf.EMFPatternLanguage"
-            class="org.eclipse.incquery.ui.queryexplorer.preference.PatternInitializationPreferencePage"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage"
             id="org.eclipse.incquery.tooling.ui.page1"
             name="Query Explorer">
          <keywordReference
@@ -596,7 +596,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="org.eclipse.emf.edit.domain.IEditingDomainProvider"
-            class="org.eclipse.incquery.ui.queryexplorer.adapters.AdapterFactoryForEcoreEditors">
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.adapters.AdapterFactoryForEcoreEditors">
          <adapter
                type="org.eclipse.emf.ecore.resource.ResourceSet">
          </adapter>

diff --git a/...clipse/incquery/ui/IncQueryGUIPlugin.java → ...ncquery/tooling/ui/IncQueryGUIPlugin.java b/...clipse/incquery/ui/IncQueryGUIPlugin.java → ...ncquery/tooling/ui/IncQueryGUIPlugin.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui;
+package org.eclipse.incquery.tooling.ui;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;

diff --git a/...ryLanguageExecutableExtensionFactory.java → ...ryLanguageExecutableExtensionFactory.java b/...ryLanguageExecutableExtensionFactory.java → ...ryLanguageExecutableExtensionFactory.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui;
+package org.eclipse.incquery.tooling.ui;
 
 import org.eclipse.incquery.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory;
 import org.osgi.framework.Bundle;

diff --git a/...ncquery/ui/content/QueryFolderFilter.java → ...tooling/ui/content/QueryFolderFilter.java b/...ncquery/ui/content/QueryFolderFilter.java → ...tooling/ui/content/QueryFolderFilter.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.content;
+package org.eclipse.incquery.tooling.ui.content;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;

diff --git a/...og/PatternMatchDialogContentProvider.java → ...og/PatternMatchDialogContentProvider.java b/...og/PatternMatchDialogContentProvider.java → ...og/PatternMatchDialogContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Mark Czotter - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.dialog;
+package org.eclipse.incquery.tooling.ui.dialog;
 
 import java.util.Collection;