Merge branch 'jay/model' of https://github.com/eclipse/eavp into jay/…

…model
eclipse · Jul 1, 2016 · ac7ddfc · ac7ddfc
2 parents 74fa76a + 7fb49a1
commit ac7ddfc
Show file tree

Hide file tree

Showing 86 changed files with 5,614 additions and 1,053 deletions.
diff --git a/org.eclipse.eavp.geometry.view.model.tests/bin/.gitignore b/org.eclipse.eavp.geometry.view.model.tests/bin/.gitignore
diff --git a/org.eclipse.eavp.viz/IGESTest.launch b/org.eclipse.eavp.viz/IGESTest.launch
diff --git a/....edit/src/org/eclipse/january/geometry/provider/ASCIISTLGeometryImporterItemProvider.java b/....edit/src/org/eclipse/january/geometry/provider/ASCIISTLGeometryImporterItemProvider.java
@@ -22,11 +22,11 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.january.geometry.ASCIISTLGeometryImporter;
+import org.eclipse.january.geometry.STLGeometryImporter;
 import org.eclipse.january.geometry.GeometryPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.january.geometry.ASCIISTLGeometryImporter} object.
+ * This is the item provider adapter for a {@link org.eclipse.january.geometry.STLGeometryImporter} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -129,7 +129,7 @@ public Object getImage(Object object) {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ASCIISTLGeometryImporter)object).getDescription();
+		String label = ((STLGeometryImporter)object).getDescription();
 		return label == null || label.length() == 0 ?
 			getString("_UI_ASCIISTLGeometryImporter_type") :
 			getString("_UI_ASCIISTLGeometryImporter_type") + " " + label;
@@ -147,7 +147,7 @@ public String getText(Object object) {
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(ASCIISTLGeometryImporter.class)) {
+		switch (notification.getFeatureID(STLGeometryImporter.class)) {
 			case GeometryPackage.ASCIISTL_GEOMETRY_IMPORTER__FILE_TYPES:
 			case GeometryPackage.ASCIISTL_GEOMETRY_IMPORTER__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

diff --git a/...el.edit/src/org/eclipse/january/geometry/provider/GeometryItemProviderAdapterFactory.java b/...el.edit/src/org/eclipse/january/geometry/provider/GeometryItemProviderAdapterFactory.java
@@ -371,15 +371,15 @@ public Adapter createMaterialAdapter() {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.january.geometry.ASCIISTLGeometryImporter} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.january.geometry.STLGeometryImporter} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected ASCIISTLGeometryImporterItemProvider asciistlGeometryImporterItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.january.geometry.ASCIISTLGeometryImporter}.
+	 * This creates an adapter for a {@link org.eclipse.january.geometry.STLGeometryImporter}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated

diff --git a/org.eclipse.january.geometry.model.editor/META-INF/MANIFEST.MF b/org.eclipse.january.geometry.model.editor/META-INF/MANIFEST.MF
@@ -4,11 +4,12 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.january.geometry.model.editor;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Activator: geometry.presentation.GeometryEditorPlugin$Implementation
+Bundle-Activator: org.eclipse.january.geometry.presentation.GeometryEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: geometry.presentation
+Export-Package: geometry.presentation,
+ org.eclipse.january.geometry.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.january.geometry.model.edit;visibility:=reexport,

diff --git a/org.eclipse.january.geometry.model.editor/plugin.xml b/org.eclipse.january.geometry.model.editor/plugin.xml
@@ -12,9 +12,9 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="geometry.presentation.GeometryModelWizardID"
+            id="org.eclipse.january.geometry.presentation.GeometryModelWizardID"
             name="%_UI_GeometryModelWizard_label"
-            class="geometry.presentation.GeometryModelWizard"
+            class="org.eclipse.january.geometry.presentation.GeometryModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
             icon="icons/full/obj16/GeometryModelFile.gif">
          <description>%_UI_GeometryModelWizard_description</description>
@@ -25,13 +25,12 @@
    <extension point="org.eclipse.ui.editors">
       <!-- @generated geometry -->
       <editor
-            id="geometry.presentation.GeometryEditorID"
+            id="org.eclipse.january.geometry.presentation.GeometryEditorID"
             name="%_UI_GeometryEditor_label"
             icon="icons/full/obj16/GeometryModelFile.gif"
             extensions="geometry"
-            class="geometry.presentation.GeometryEditor"
-            contributorClass="geometry.presentation.GeometryActionBarContributor">
+            class="org.eclipse.january.geometry.presentation.GeometryEditor"
+            contributorClass="org.eclipse.january.geometry.presentation.GeometryActionBarContributor">
       </editor>
    </extension>
-
 </plugin>
diff --git a/org.eclipse.january.geometry.model.editor/src/geometry/presentation/GeometryEditor.java b/org.eclipse.january.geometry.model.editor/src/geometry/presentation/GeometryEditor.java
@@ -154,7 +154,7 @@
 
 import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
-import geometry.provider.GeometryItemProviderAdapterFactory;
+import org.eclipse.january.geometry.provider.GeometryItemProviderAdapterFactory;
 
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 

diff --git a/org.eclipse.january.geometry.model.editor/src/geometry/presentation/GeometryModelWizard.java b/org.eclipse.january.geometry.model.editor/src/geometry/presentation/GeometryModelWizard.java
@@ -70,7 +70,7 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 
-import geometry.provider.GeometryEditPlugin;
+import org.eclipse.january.geometry.provider.GeometryEditPlugin;
 
 
 import org.eclipse.core.runtime.Path;