Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/ConverterSection.java1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java1
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/StandaloneGalleryConverter.java (renamed from plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/StandaloneGalleryConverter.java)2
-rw-r--r--tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/StandalonePluginConverterTest.java2
7 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
index 4868c839f..e5f86d6f7 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
@@ -15,4 +15,3 @@ Require-Bundle: org.eclipse.pde.ui,
org.eclipse.gmf.common,
org.eclipse.ui,
org.eclipse.jdt.core
-Export-Package: org.eclipse.gmf.internal.graphdef.codegen.ui;x-friends:="org.eclipse.gmf.tests"
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/ConverterSection.java b/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/ConverterSection.java
index b65790dce..384bf37c5 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/ConverterSection.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/ConverterSection.java
@@ -40,6 +40,7 @@ import org.eclipse.gmf.gmfgraph.DiagramElement;
import org.eclipse.gmf.gmfgraph.FigureGallery;
import org.eclipse.gmf.gmfgraph.util.RuntimeFQNSwitch;
import org.eclipse.gmf.graphdef.codegen.StandaloneGenerator;
+import org.eclipse.gmf.internal.graphdef.codegen.StandaloneGalleryConverter;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.ManifestElement;
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java b/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java
index 61f8433b2..3f5267e99 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.gmf.gmfgraph.FigureGallery;
import org.eclipse.gmf.gmfgraph.util.RuntimeFQNSwitch;
import org.eclipse.gmf.graphdef.codegen.StandaloneGenerator;
+import org.eclipse.gmf.internal.graphdef.codegen.StandaloneGalleryConverter;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.IInputValidator;
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
index a43fa7431..95397c5a8 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmf.graphdef;visibility:=reexport,
org.eclipse.emf.codegen,
org.eclipse.draw2d
-Export-Package: org.eclipse.gmf.graphdef.codegen
+Export-Package: org.eclipse.gmf.graphdef.codegen,
+ org.eclipse.gmf.internal.graphdef.codegen;x-friends:="org.eclipse.gmf.graphdef.codegen.ui,org.eclipse.gmf.tests"
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/StandaloneGalleryConverter.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/StandaloneGalleryConverter.java
index 416d97421..29a4d259f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen.ui/src/org/eclipse/gmf/internal/graphdef/codegen/ui/StandaloneGalleryConverter.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/StandaloneGalleryConverter.java
@@ -10,7 +10,7 @@
* Michael Golubev (Borland) - initial API and implementation
*/
-package org.eclipse.gmf.internal.graphdef.codegen.ui;
+package org.eclipse.gmf.internal.graphdef.codegen;
import java.util.Collection;
import java.util.Enumeration;
diff --git a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
index e3e1fffdd..a7e0dc7c9 100644
--- a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmf.graphdef.codegen,
org.eclipse.gmf.tooldef,
org.eclipse.emf.validation,
- org.eclipse.gmf.codegen.ui,
- org.eclipse.gmf.graphdef.codegen.ui
+ org.eclipse.gmf.codegen.ui
Bundle-Activator: org.eclipse.gmf.tests.Plugin
Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/StandalonePluginConverterTest.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/StandalonePluginConverterTest.java
index c5f67f8b8..af9b25084 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/StandalonePluginConverterTest.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/StandalonePluginConverterTest.java
@@ -24,7 +24,7 @@ import org.eclipse.gmf.gmfgraph.FigureGallery;
import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
import org.eclipse.gmf.gmfgraph.util.RuntimeFQNSwitch;
import org.eclipse.gmf.graphdef.codegen.StandaloneGenerator;
-import org.eclipse.gmf.internal.graphdef.codegen.ui.StandaloneGalleryConverter;
+import org.eclipse.gmf.internal.graphdef.codegen.StandaloneGalleryConverter;
public class StandalonePluginConverterTest extends FigureCodegenTestBase {

Back to the top