Skip to content

Commit

Permalink
Merge pull request hpcc-systems#151 from dineshshetye/EPE-106
Browse files Browse the repository at this point in the history
EPE-106 Rename language IDs

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
  • Loading branch information
richardkchapman committed May 9, 2014
2 parents 775ebc6 + 1db8ea1 commit a17c572
Show file tree
Hide file tree
Showing 43 changed files with 1,002 additions and 1,316 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion org.hpccsystems.eclide/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-Name: %Bundle_Name.0
Bundle-SymbolicName: org.hpccsystems.eclide;singleton:=true
Bundle-Version: 4.3.0.1
Bundle-Activator: org.hpccsystems.eclide.Activator
Expand Down
46 changes: 23 additions & 23 deletions org.hpccsystems.eclide/plugin.xml
Expand Up @@ -13,18 +13,18 @@
class="org.hpccsystems.eclide.perspectives.ECLPerspective"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.perspectives.ECLPerspective"
name="%perspective.name.0">
name="%Ecl_Development">
</perspective>
<perspective
class="org.hpccsystems.eclide.perspectives.ECLWatch"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.perspectives.ECLWatch"
name="%perspective.name.1">
name="%ECL_Watch">
</perspective>
</extension>
<extension
id="eclBuilder"
name="%extension.name.2"
name="%ECL_Project_Builder"
point="org.eclipse.core.resources.builders">
<builder
hasNature="true">
Expand All @@ -35,7 +35,7 @@
</extension>
<extension
id="eclNature"
name="%extension.name.3"
name="%ECL_Project_Nature"
point="org.eclipse.core.resources.natures">
<runtime>
<run
Expand All @@ -48,7 +48,7 @@
</extension>
<extension
id="eclProblem"
name="%extension.name.4"
name="%ECL_Problem"
point="org.eclipse.core.resources.markers">
<super
type="org.eclipse.core.resources.problemmarker">
Expand All @@ -61,28 +61,28 @@
point="org.eclipse.ui.views">
<category
id="org.hpccsystems.eclide"
name="%category.name.1">
name="%Ecl">
</category>
<view
category="org.hpccsystems.eclide"
class="org.hpccsystems.eclide.ui.navigator.ECLNavigator"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.navigator"
name="%view.name.0">
name="%ECL_Explorer">
</view>
<view
category="org.hpccsystems.eclide"
class="org.hpccsystems.eclide.ui.viewer.HtmlViewer"
id="org.hpccsystems.eclide.htmlView"
name="%view.name.1">
name="%ECL_Watch">
</view>
<view
allowMultiple="false"
category="org.hpccsystems.eclide"
class="org.hpccsystems.eclide.ui.viewer.platform.PlatformViewer"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.viewPlatforms"
name="%view.name.3"
name="%Servers"
restorable="true">
</view>
<view
Expand All @@ -91,7 +91,7 @@
class="org.hpccsystems.eclide.ui.viewer.platform.WorkunitsViewer"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.viewWorkunits"
name="%view.name.4"
name="%Workunits"
restorable="true">
</view>
</extension>
Expand All @@ -115,7 +115,7 @@
extensions="ecl"
icon="icons/doc.png"
id="org.hpccsystems.eclide.editors.ECLWindow"
name="%editor.name.0">
name="%ECL_Editor">
</editor>
</extension>
<extension
Expand All @@ -129,7 +129,7 @@
class="org.hpccsystems.eclide.builder.ECLProjectAction"
enablesFor="+"
id="org.hpccsystems.eclide.addRemoveNatureAction"
label="%action.label"
label="%Convert_To_ECL_Project"
menubarPath="additions">
</action>
</objectContribution>
Expand All @@ -138,19 +138,19 @@
point="org.eclipse.ui.newWizards">
<category
id="org.hpccsystems.eclide"
name="%category.name.2">
name="%Ecl">
</category>
<wizard
category="org.hpccsystems.eclide"
class="org.hpccsystems.eclide.wizards.ECLNewProjectWizard"
finalPerspective="org.hpccsystems.eclide.perspectives.ECLPerspective"
icon="icons/releng_gears.gif"
id="org.hpccsystems.eclide.wizards.ECLNewProjectWizard"
name="%wizard.name.1"
name="%ECL_Project"
preferredPerspectives="org.hpccsystems.eclide.perspectives.ECLPerspective"
project="true">
<description>
%wizard.description.1
%Create_ECL_Project
</description>
</wizard>
<wizard
Expand All @@ -159,10 +159,10 @@
finalPerspective="org.hpccsystems.eclide.perspectives.ECLPerspective"
icon="icons/doc.png"
id="org.hpccsystems.eclide.wizards.ECLNewFileWizard"
name="%wizard.name.2"
name="%ECL_Editor_File"
preferredPerspectives="org.hpccsystems.eclide.perspectives.ECLPerspective">
<description>
%wizard.description.2
%New_ECL_File
</description>
</wizard>
</extension>
Expand All @@ -177,27 +177,27 @@
point="org.eclipse.ui.importWizards">
<category
id="org.hpccsystems.eclide.importWizards.sampleCategory"
name="%category.name.3">
name="%ECL_Repository">
</category>
<wizard
category="org.hpccsystems.eclide.importWizards.sampleCategory"
class="org.hpccsystems.eclide.wizards.ImportWizard"
icon="icons/sample.gif"
id="org.hpccsystems.eclide.importWizards.ImportWizard"
name="%wizard.name.3">
name="%Import_Repository">
<description>
%wizard.description.3
%Import_Repository_From_Legacy_Server
</description>
</wizard>
</extension>
<extension
point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
delegate="org.hpccsystems.eclide.launchers.ECLLaunchDelegate"
delegateName="%launchConfigurationType.delegateName"
delegateName="%ECL_Launcher"
id="org.hpccsystems.eclide.launching.ECLConfigurationType"
modes="run"
name="%launchConfigurationType.name"
name="%ECL_Targets"
public="true">
</launchConfigurationType>
</extension>
Expand Down Expand Up @@ -347,7 +347,7 @@
</menuContribution>
<menuContribution locationURI="popup:org.eclipse.ui.popup.any?before=additions">
<command
commandId="org.eclipse.jdt.ui.edit.text.java.open.editor"
commandId="org.eclipse.jdt.ui.edit.text.java.open.editor"
mnemonic="%contributions.view.edit.mnemonic">
<visibleWhen>
<with variable="selection">
Expand Down
Expand Up @@ -84,7 +84,7 @@ public boolean visit(IResource resource) {

@Override
protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
monitor.setTaskName(Messages.ECLBuilder_1);
monitor.setTaskName(Messages.CheckingSyntax);
checkedFiles = new HashSet<IFile>();
if (kind == FULL_BUILD) {
fullBuild(monitor);
Expand Down
Expand Up @@ -40,9 +40,9 @@
import org.hpccsystems.internal.data.ClientTools;

public class ECLCompiler {
final static String noCompiler = Messages.ECLCompiler_0;
final static String noCompiler = Messages.Error_Eclcc_Not_Found;
final static String badConfigurationCode = "1004"; //$NON-NLS-1$
final static String badConfiguration = Messages.ECLCompiler_2;
final static String badConfiguration = Messages.Error_Compiler_Config;

public final static String CL_PATH = "CL_PATH"; //$NON-NLS-1$
public final static String ECLBUNDLE_PATH = "ECLCC_ECLBUNDLE_PATH"; //$NON-NLS-1$
Expand Down Expand Up @@ -200,7 +200,7 @@ public void ProcessOut(BufferedReader reader) {
String stdIn = null;
try {
while ((stdIn = reader.readLine()) != null) {
eclccConsoleWriter.print(Messages.ECLCompiler_13);
eclccConsoleWriter.print(Messages.Eclcc_Console_Output);
eclccConsoleWriter.println(stdIn);
int lastSpace = stdIn.lastIndexOf(' ');
if (lastSpace != -1) {
Expand Down
Expand Up @@ -26,7 +26,7 @@ public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
// Annotation annotation = itr.next();
// int i = annotation.hashCode();
// }
return Messages.ECLAnnotationHover_0;
return Messages.AnnotationHover;
}

}
Expand Up @@ -59,7 +59,7 @@ public ECLEditorToolbar(IFile sourceFile, Composite parent, int style) {
setLayoutData(fData);

submitButton = new SplitButton(this, SWT.NONE);
submitButton.setText(Messages.ECLEditorToolbar_6);
submitButton.setText(Messages.Submit);
GridData gd = new GridData();
submitButton.setLayoutData(gd);
SWTFactory.setButtonDimensionHint(submitButton);
Expand All @@ -76,7 +76,7 @@ public void buttonSelected() {
}
});

SWTFactory.createLabel(this, Messages.ECLEditorToolbar_1, 1);
SWTFactory.createLabel(this, Messages.Server, 1);
comboServer = SWTFactory.createCombo(this, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY, 1, null);
comboServer.addSelectionListener(new SelectionAdapter() {
@Override
Expand All @@ -90,7 +90,7 @@ public void widgetSelected(SelectionEvent e) {
}
}
});
SWTFactory.createLabel(this, Messages.ECLEditorToolbar_4, 1);
SWTFactory.createLabel(this, Messages.Target, 1);
comboTarget = SWTFactory.createCombo(this, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY, 1, null);
comboTarget.addSelectionListener(new SelectionAdapter() {
@Override
Expand Down Expand Up @@ -133,7 +133,7 @@ private void menuCreator(Menu menu) {
}

MenuItem submit = new MenuItem(menu, SWT.PUSH);
submit.setText(Messages.ECLEditorToolbar_6);
submit.setText(Messages.Submit);
submit.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
Expand All @@ -142,7 +142,7 @@ public void widgetSelected(SelectionEvent arg0) {
});

MenuItem compile = new MenuItem(menu, SWT.PUSH);
compile.setText(Messages.ECLEditorToolbar_7);
compile.setText(Messages.Compile);
compile.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
Expand All @@ -151,7 +151,7 @@ public void widgetSelected(SelectionEvent arg0) {
});

MenuItem debug = new MenuItem(menu, SWT.PUSH);
debug.setText(Messages.ECLEditorToolbar_8);
debug.setText(Messages.Debug);
debug.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
Expand Down
Expand Up @@ -72,6 +72,6 @@ public IHelpResource[] getRelatedTopics() {

@Override
public String getText() {
return Messages.ECLSelectionContext_0;
return Messages.ECLEditorTextMessage;
}
}
Expand Up @@ -46,21 +46,21 @@ public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
IFile file = ((ECLDocument)doc).getFile();
source = meta.getSource(file);
if (source == null) {
return Messages.ECLTextHover_0;
return Messages.TextHover_No_Meta;
}
}

final String text = ECLEditor.getHoverWord(doc, hoverRegion.getOffset());
StringBuilder hover = new StringBuilder(Messages.ECLTextHover_1);
hover.append(Messages.ECLTextHover_2 + text);
StringBuilder hover = new StringBuilder(Messages.TextHover_SearchInfo);
hover.append(Messages.TextHover_SearchFor + text);

ECLMetaNode context = source.getContext(hoverRegion.getOffset());
hover.append(Messages.ECLTextHover_3 + context.getName());
hover.append(Messages.TextHover_Context + context.getName());

ECLMetaNode found = context.findDefinition(text, false);
if (found != null) {
hover.append(Messages.ECLTextHover_4);
hover.append(Messages.ECLTextHover_5 + found.getQualifiedName());// + " (" + def.getOffset() + ", " + def.getLength() + ")");
hover.append(Messages.TextHover_Match);
hover.append(Messages.TextHover_Definition + found.getQualifiedName());// + " (" + def.getOffset() + ", " + def.getLength() + ")");
}

return hover.toString();
Expand Down
Expand Up @@ -142,7 +142,7 @@ void createEditorPage() {
} catch (PartInitException e) {
ErrorDialog.openError(
getSite().getShell(),
Messages.ECLWindow_2,
Messages.Error_NestedTextEditor,
null,
e.getStatus());
}
Expand Down Expand Up @@ -308,7 +308,7 @@ public void gotoMarker(IMarker marker) {
public void init(IEditorSite site, IEditorInput editorInput)
throws PartInitException {
if (!(editorInput instanceof IEditorInput)) {
throw new PartInitException(Messages.ECLWindow_3);
throw new PartInitException(Messages.Error_IEditorInput);
}
super.init(site, editorInput);
}
Expand Down
Expand Up @@ -41,21 +41,21 @@ public void perform(ECLWindow.ACTION action) {
}

public void createActions() {
close = new Action(Messages.ECLWindowActions_0) {
close = new Action(Messages.Close) {
@Override
public void run() {
perform(ECLWindow.ACTION.CLOSE);
}
};

closeOthers = new Action(Messages.ECLWindowActions_1) {
closeOthers = new Action(Messages.CloseOtherWorkunits) {
@Override
public void run() {
perform(ECLWindow.ACTION.CLOSEOTHERS);
}
};

closeAll = new Action(Messages.ECLWindowActions_2) {
closeAll = new Action(Messages.CloseAllWorkunits) {
@Override
public void run() {
perform(ECLWindow.ACTION.CLOSEALL);
Expand Down
Expand Up @@ -37,9 +37,9 @@ public boolean performFinish() {
*/
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
setWindowTitle(Messages.ImportWizard_0); //NON-NLS-1
setWindowTitle(Messages.FileImportWizard); //NON-NLS-1
setNeedsProgressMonitor(true);
mainPage = new ImportWizardPage(Messages.ImportWizard_1, selection); //NON-NLS-1
mainPage = new ImportWizardPage(Messages.ImportRepository, selection); //NON-NLS-1
}

/* (non-Javadoc)
Expand Down

0 comments on commit a17c572

Please sign in to comment.