Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-04-26 06:07:56 -0400
committerHenrik Rentz-Reichert2012-04-26 06:07:56 -0400
commit822777387a95d7f13e80868e27dbdd96b8bf9262 (patch)
treeac5d5b42e6a0a575f611f94928db4d58be4bdf3f /plugins/org.eclipse.etrice.core.room.ui
parent21ce8b7a3b5c5996810a8e7b914ee2b97a2f0803 (diff)
downloadorg.eclipse.etrice-822777387a95d7f13e80868e27dbdd96b8bf9262.tar.gz
org.eclipse.etrice-822777387a95d7f13e80868e27dbdd96b8bf9262.tar.xz
org.eclipse.etrice-822777387a95d7f13e80868e27dbdd96b8bf9262.zip
[core.room] bug fix in PlatformRelativeUriResolver and minor re-factorings
Diffstat (limited to 'plugins/org.eclipse.etrice.core.room.ui')
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java13
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java (renamed from plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/GlobalNonPlatformURIEditorOpener.java)2
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java (renamed from plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/contentassist/ImportAwareHyperlinkHelper.java)5
4 files changed, 14 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index f2faa5d91..0b8c3a446 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -22,5 +22,6 @@ Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.core.ui,
org.eclipse.etrice.core.ui.contentassist.antlr,
+ org.eclipse.etrice.core.ui.linking,
org.eclipse.etrice.core.ui.newwizard
Bundle-Activator: org.eclipse.etrice.core.ui.internal.RoomActivator
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
index 2dfd25990..b05a628b8 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
@@ -12,8 +12,9 @@
package org.eclipse.etrice.core.ui;
-import org.eclipse.etrice.core.ui.contentassist.ImportAwareHyperlinkHelper;
import org.eclipse.etrice.core.ui.internal.RoomActivator;
+import org.eclipse.etrice.core.ui.linking.GlobalNonPlatformURIEditorOpener;
+import org.eclipse.etrice.core.ui.linking.ImportAwareHyperlinkHelper;
import org.eclipse.etrice.core.ui.outline.RoomOutlinePage;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
@@ -39,14 +40,16 @@ public class RoomUiModule extends org.eclipse.etrice.core.ui.AbstractRoomUiModul
return RoomOutlinePage.class;
}
- public Class<? extends org.eclipse.xtext.ui.editor.IURIEditorOpener> bindIURIEditorOpener() {
- return GlobalNonPlatformURIEditorOpener.class;
- }
-
public static Injector getInjector() {
return RoomActivator.getInstance().getInjector("org.eclipse.etrice.core.Room");
}
+ // HOWTO: use URI imports - need special editor opener
+ public Class<? extends org.eclipse.xtext.ui.editor.IURIEditorOpener> bindIURIEditorOpener() {
+ return GlobalNonPlatformURIEditorOpener.class;
+ }
+
+ // HOWTO: use URI imports - need special class for creating hyper links for imports
public Class<? extends IHyperlinkHelper> bindIHyperlinkHelper() {
return ImportAwareHyperlinkHelper.class;
}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/GlobalNonPlatformURIEditorOpener.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java
index 029f5ce2f..86092cb8f 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/GlobalNonPlatformURIEditorOpener.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.core.ui;
+package org.eclipse.etrice.core.ui.linking;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRoot;
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/contentassist/ImportAwareHyperlinkHelper.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java
index f8ebf963c..956c27571 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/contentassist/ImportAwareHyperlinkHelper.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java
@@ -10,7 +10,7 @@
*
*******************************************************************************/
-package org.eclipse.etrice.core.ui.contentassist;
+package org.eclipse.etrice.core.ui.linking;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -41,6 +41,9 @@ public class ImportAwareHyperlinkHelper extends HyperlinkHelper {
@Inject
private PlatformRelativeUriResolver uriResolver;
+ public ImportAwareHyperlinkHelper() {
+ super();
+ }
/* (non-Javadoc)
* @see org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper#createHyperlinksByOffset(org.eclipse.xtext.resource.XtextResource, int, org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor)
*/

Back to the top