Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbblajer2007-04-04 11:18:16 +0000
committerbblajer2007-04-04 11:18:16 +0000
commit771e1a07b21e51ed85523407a5b91e53e9fc4ef8 (patch)
tree373cad74c0996d4b9a20ec137971e397ae03f629
parentc3aea964005deff3a8b909e472b9f9e6e46e0b81 (diff)
downloadorg.eclipse.gmf-tooling-771e1a07b21e51ed85523407a5b91e53e9fc4ef8.tar.gz
org.eclipse.gmf-tooling-771e1a07b21e51ed85523407a5b91e53e9fc4ef8.tar.xz
org.eclipse.gmf-tooling-771e1a07b21e51ed85523407a5b91e53e9fc4ef8.zip
User should be able to configure whether NON-NLS markers are shown or not
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/ActionBarAdvisor.xpt6
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/Perspective.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/WorkbenchWindowAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Editor.xpt8
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Plugin.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/templates/xpt/providers/MarkerNavigationProvider.xpt2
6 files changed, 12 insertions, 12 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/ActionBarAdvisor.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/ActionBarAdvisor.xpt
index 7f6641c95..af8b7dc20 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/ActionBarAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/ActionBarAdvisor.xpt
@@ -21,8 +21,8 @@
public static class AboutAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
«EXPAND xpt::Common::generatedMemberComment("@see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)")»
public void run(org.eclipse.jface.action.IAction action) {
- org.eclipse.jface.dialogs.MessageDialog.openInformation(getWindow().getShell(), getString("_UI_About_title"), //$NON-NLS-1$
- getString("_UI_About_text")); //$NON-NLS-1$
+ org.eclipse.jface.dialogs.MessageDialog.openInformation(getWindow().getShell(), getString("_UI_About_title"), «EXPAND xpt::Common::nonNLS»
+ getString("_UI_About_text")); «EXPAND xpt::Common::nonNLS»
}
}
«ENDAROUND»
@@ -32,7 +32,7 @@
public static class OpenAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
«EXPAND xpt::Common::generatedMemberComment("Opens the editors for the files selected using the file dialog.")»
public void run(org.eclipse.jface.action.IAction action) {
- String filePath = «editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».openFilePathDialog(getWindow().getShell(), "*.«editorGen.diagramFileExtension»", org.eclipse.swt.SWT.OPEN); //$NON-NLS-1$
+ String filePath = «editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».openFilePathDialog(getWindow().getShell(), "*.«editorGen.diagramFileExtension»", org.eclipse.swt.SWT.OPEN); «EXPAND xpt::Common::nonNLS»
if (filePath != null) {
«IF editorGen.editor.eclipseEditor-»
«editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».openEditor(org.eclipse.emf.common.util.URI.createFileURI(filePath));
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/Perspective.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/Perspective.xpt
index 3aedaf096..160a3ae17 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/Perspective.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/Perspective.xpt
@@ -15,7 +15,7 @@
«AROUND layoutAdditions FOR gmfgen::GenApplication-»
«IF !editorGen.editor.eclipseEditor»
- org.eclipse.ui.IFolderLayout top = layout.createFolder("top", org.eclipse.ui.IPageLayout.TOP, (float)0.5, layout.getEditorArea()); //$NON-NLS-1$
+ org.eclipse.ui.IFolderLayout top = layout.createFolder("top", org.eclipse.ui.IPageLayout.TOP, (float)0.5, layout.getEditorArea()); «EXPAND xpt::Common::nonNLS»
top.addView(«editorGen.editor.getQualifiedClassName()».ID);
«ENDIF»
«ENDAROUND»
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/WorkbenchWindowAdvisor.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/WorkbenchWindowAdvisor.xpt
index a787aa215..66419a280 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/WorkbenchWindowAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/aspects/xpt/application/WorkbenchWindowAdvisor.xpt
@@ -20,6 +20,6 @@
configurer.setInitialSize(new org.eclipse.swt.graphics.Point(600, 450));
configurer.setShowCoolBar(false);
configurer.setShowStatusLine(true);
- configurer.setTitle(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getBundleString("_UI_Application_title")); //$NON-NLS-1$
+ configurer.setTitle(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getBundleString("_UI_Application_title")); «EXPAND xpt::Common::nonNLS»
}
«ENDAROUND»
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Editor.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Editor.xpt
index e72857fe2..0682f8a58 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Editor.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Editor.xpt
@@ -96,7 +96,7 @@ public class «className» extends org.eclipse.gmf.runtime.lite.parts.DiagramViewP
«DEFINE partId FOR gmfgen::GenEditorView-»
«EXPAND xpt::Common::generatedMemberComment»
- public static final String ID = "«iD»"; //$NON-NLS-1$
+ public static final String ID = "«iD»"; «EXPAND xpt::Common::nonNLS»
«ENDDEFINE»
«DEFINE ResourceTracker FOR gmfgen::GenEditorView-»
@@ -434,8 +434,8 @@ public class «className» extends org.eclipse.gmf.runtime.lite.parts.DiagramViewP
}
org.eclipse.emf.common.util.URI uri = getURIFromInput(input);
if (uri != null) {
- if ("platform".equals(uri.scheme()) && (uri.segmentCount() > 2)) { //$NON-NLS-1$
- if ("resource".equals(uri.segment(0))) { //$NON-NLS-1$
+ if ("platform".equals(uri.scheme()) && (uri.segmentCount() > 2)) { «EXPAND xpt::Common::nonNLS»
+ if ("resource".equals(uri.segment(0))) { «EXPAND xpt::Common::nonNLS»
org.eclipse.core.runtime.IPath path = new org.eclipse.core.runtime.Path(org.eclipse.emf.common.util.URI.decode(uri.path())).removeFirstSegments(1);
return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getFile(path);
}
@@ -626,7 +626,7 @@ public class «className» extends org.eclipse.gmf.runtime.lite.parts.DiagramViewP
// configure the context menu
org.eclipse.gef.ContextMenuProvider provider = new «className»ContextMenuProvider(viewer);
viewer.setContextMenu(provider);
- getSite().registerContextMenu(«editorGen.plugin.getActivatorQualifiedClassName()».ID + ".editor.contextmenu", provider, getSite().getSelectionProvider()); //$NON-NLS-1$
+ getSite().registerContextMenu(«editorGen.plugin.getActivatorQualifiedClassName()».ID + ".editor.contextmenu", provider, getSite().getSelectionProvider()); «EXPAND xpt::Common::nonNLS»
org.eclipse.gef.KeyHandler keyHandler = new org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler(viewer);
viewer.setKeyHandler(keyHandler);
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Plugin.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Plugin.xpt
index 5097134fd..6a01d8694 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Plugin.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/editor/Plugin.xpt
@@ -24,7 +24,7 @@ package «editorGen.editor.packageName»;
public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlugin {
«EXPAND xpt::Common::generatedMemberComment»
- public static final String ID = "«iD»"; //$NON-NLS-1$
+ public static final String ID = "«iD»"; «EXPAND xpt::Common::nonNLS»
«EXPAND xpt::Common::generatedMemberComment»
private static «activatorClassName» instance;
@@ -221,7 +221,7 @@ public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlugin
try {
return org.eclipse.core.runtime.Platform.getResourceBundle(getBundle()).getString(key);
} catch (java.util.MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
+ return "!" + key + "!"; «EXPAND xpt::Common::nonNLS» «EXPAND xpt::Common::nonNLS(2)»
}
}
«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/providers/MarkerNavigationProvider.xpt b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/providers/MarkerNavigationProvider.xpt
index 29ed05971..74b9631ee 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/providers/MarkerNavigationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen.lite/templates/xpt/providers/MarkerNavigationProvider.xpt
@@ -33,7 +33,7 @@ public class «markerNavigationProviderClassName» implements org.eclipse.gmf.runt
«DEFINE markerType FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::generatedMemberComment»
- public static final String MARKER_TYPE = «editorGen.plugin.getActivatorQualifiedClassName()».ID + ".diagnostic"; //$NON-NLS-1$
+ public static final String MARKER_TYPE = «editorGen.plugin.getActivatorQualifiedClassName()».ID + ".diagnostic"; «EXPAND xpt::Common::nonNLS»
«ENDDEFINE»
«DEFINE validationStateChanged FOR gmfgen::GenDiagram-»

Back to the top